diff options
Diffstat (limited to 'ishtar/furnitures/models.py')
| -rw-r--r-- | ishtar/furnitures/models.py | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index fec52bfe5..0ce4ef057 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -250,9 +250,10 @@ class FileType(GeneralType): verbose_name_plural = _(u"Archaeological file types") @classmethod - def is_preventive(cls, file_type_id): + def is_preventive(cls, file_type_id, key=''): + key = key or 'preventive' try: - preventive = FileType.objects.get(txt_idx="preventive").pk + preventive = FileType.objects.get(txt_idx=key).pk return file_type_id == preventive except ObjectDoesNotExist: return False @@ -342,6 +343,15 @@ class OperationType(GeneralType): verbose_name = _(u"Operation type") verbose_name_plural = _(u"Operation types") + @classmethod + def is_preventive(cls, ope_type_id, key=''): + key = key or 'prev_excavation' + try: + preventive = OperationType.objects.get(txt_idx=key).pk + return ope_type_id == preventive + except ObjectDoesNotExist: + return False + class RemainType(GeneralType): class Meta: verbose_name = _(u"Remain type") @@ -362,12 +372,21 @@ class Operation(BaseHistorizedItem, OwnPerms): verbose_name=_(u"Operation type")) remains = models.ManyToManyField("RemainType", verbose_name=_(u'Remains')) towns = models.ManyToManyField("Town", verbose_name=_(u"Towns")) + cost = models.IntegerField(_(u"Cost"), blank=True, null=True) if settings.COUNTRY == 'fr': code_patriarche = models.IntegerField(u"Code PATRIARCHE", null=True, blank=True) code_dracar = models.CharField(u"Code DRACAR", max_length=10, null=True, blank=True) + fnap_financing = models.FloatField(u"Financement FNAP", + blank=True, null=True) TABLE_COLS += ["code_patriarche", "code_dracar"] + zoning_prescription = models.NullBooleanField(_(u"Prescription on zoning"), + blank=True, null=True) + large_area_prescription = models.NullBooleanField( + _(u"Prescription on large area"), blank=True, null=True) + geoarchaeological_context_prescription = models.NullBooleanField( + _(u"Prescription on geoarchaeological context"), blank=True, null=True) comment = models.TextField(_(u"Comment"), null=True, blank=True) history = HistoricalRecords() |