summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-22 00:34:21 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-24 17:39:03 +0100
commit7fd3c6819819c95ce0847807495e525f0970f374 (patch)
tree9cede13a2ad26f41d81fb06a6d2125297250f1dd
parent8a75c4c7db9c91886ef44459d049543aa25c3916 (diff)
downloadIshtar-7fd3c6819819c95ce0847807495e525f0970f374.tar.bz2
Ishtar-7fd3c6819819c95ce0847807495e525f0970f374.zip
Introduce new types (closes #36, closes #37)
-rw-r--r--ishtar/furnitures/models.py15
1 files changed, 15 insertions, 0 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py
index 278a516bd..5d7743b3f 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -126,6 +126,13 @@ class FileType(GeneralType):
verbose_name = _(u"Archaeological file type")
verbose_name_plural = _(u"Archaeological file types")
+if settings.COUNTRY == 'fr':
+ class SaisineType(GeneralType):
+ delay = models.IntegerField(_(u"Delay (in days)"))
+ class Meta:
+ verbose_name = u"Saisine"
+ verbose_name_plural = u"Saisines")
+
class File(models.Model) :
year = models.IntegerField(_(u"Year"))
number = models.IntegerField(_(u"Number"))
@@ -138,6 +145,8 @@ class File(models.Model) :
verbose_name=(u"Last modifier"))
towns = models.ManyToManyField("Town")
if settings.COUNTRY == 'fr':
+ saisine_type = models.ForeignKey(SaisineType,
+ verbose_name= u"Type de saisine")
ar_date = models.DateField(u"Date d'envoi du courrier \
avec accusé réception")
ar_signed_by = models.ForeignKey(Person, related_name='+',
@@ -157,6 +166,11 @@ class OperationType(GeneralType):
verbose_name = _(u"Operation type")
verbose_name_plural = _(u"Operation types")
+class VestigeType(GeneralType):
+ class Meta:
+ verbose_name = _(u"Vestige type")
+ verbose_name_plural = _(u"Vestige types")
+
class Operation(models.Model):
name = models.CharField(_(u"Name"), max_length=120)
start_date = models.DateField(_(u"Start date"))
@@ -168,6 +182,7 @@ class Operation(models.Model):
verbose_name=_(u"File"))
operation_type = models.ForeignKey(OperationType, related_name='+',
verbose_name=_(u"Operation type"))
+ vestiges = models.ManyToManyField("Vestige")
towns = models.ManyToManyField("Town")
history = HistoricalRecords()
if settings.COUNTRY == 'fr':