[svn] new person expedition

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM

1 files changed, 15 insertions, 1 deletions

diff --git a/expo/models_survex.py b/expo/models_survex.py
index da8ec88..80e5f5b 100644
--- a/expo/models_survex.py
+++ b/expo/models_survex.py
@@ -1,5 +1,6 @@
 from django.db import models

-

+import troggle.settings as settings

+import os

 

 class SurvexBlock(models.Model):

     name = models.CharField(max_length=100, blank=True, null=True)

@@ -11,15 +12,28 @@ class SurvexBlock(models.Model):
     end_year = models.IntegerField(blank=True, null=True)

     end_month = models.IntegerField(blank=True, null=True)

     end_day = models.IntegerField(blank=True, null=True)

+    

     person = models.ManyToManyField('Person', through='PersonRole', blank=True, null=True)

+   

     begin_file = models.CharField(max_length=200)

     begin_char = models.IntegerField()

     end_file = models.CharField(max_length=200, blank=True, null=True)

     end_char = models.IntegerField(blank=True, null=True)

+    

     def __unicode__(self):

         return unicode(self.name)

+    

+    def filecontents(self):

+        f = os.path.join(settings.SURVEX_DATA, self.begin_file)

+        fin = open(f)

+        res = fin.read()

+        fin.close()

+        return res

+        

+

 

 class PersonRole(models.Model):

+    personexpedition = models.ForeignKey('PersonExpedition')

     person = models.ForeignKey('Person')

     survex_block = models.ForeignKey('SurvexBlock')

     role = models.ForeignKey('Role')