diff options
| -rw-r--r-- | archaeological_files/models.py | 48 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 1 | ||||
| -rw-r--r-- | archaeological_files_pdl/forms.py | 7 |
3 files changed, 31 insertions, 25 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 3e56fd6ba..4b0501e96 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -78,11 +78,11 @@ post_delete.connect(post_save_cache, sender=PermitType) if settings.COUNTRY == 'fr': class SaisineType(GeneralType, ValueGetter): - delay = models.IntegerField(_(u"Delay (in days)"), default=30) + delay = models.IntegerField(_("Delay (in days)"), default=30) class Meta: - verbose_name = u"Type de saisine" - verbose_name_plural = u"Types de saisine" + verbose_name = "Type de saisine" + verbose_name_plural = "Types de saisine" ordering = ('label',) post_save.connect(post_save_cache, sender=SaisineType) post_delete.connect(post_save_cache, sender=SaisineType) @@ -112,10 +112,10 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem, STATISTIC_SUM_VARIABLE = OrderedDict( ( ("pk", (_("Number"), 1)), - ("total_surface", (_(u"Total surface (km2)"), 0.000001)), + ("total_surface", (_("Total surface (km2)"), 0.000001)), ("total_developed_surface", ( - _(u"Total developed surface (km2)"), 0.000001)), - ) + _("Total developed surface (km2)"), 0.000001)), + ) ) # search parameters @@ -251,36 +251,36 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem, HISTORICAL_M2M = ['towns', 'departments'] # fields - year = models.IntegerField(_(u"Year"), default=get_current_year) + year = models.IntegerField(_("Year"), default=get_current_year) numeric_reference = models.IntegerField( - _(u"Numeric reference"), blank=True, null=True) - internal_reference = models.CharField(_(u"Internal reference"), blank=True, + _("Numeric reference"), blank=True, null=True) + internal_reference = models.CharField(_("Internal reference"), blank=True, null=True, max_length=60) - external_id = models.CharField(_(u"External ID"), blank=True, null=True, + external_id = models.CharField(_("External ID"), blank=True, null=True, max_length=120) auto_external_id = models.BooleanField( _("External ID is set automatically"), default=False) name = models.TextField(_("Name"), blank=True, default="") file_type = models.ForeignKey(FileType, verbose_name=_("File type")) in_charge = models.ForeignKey(Person, related_name='file_responsability', - verbose_name=_(u"Person in charge"), + verbose_name=_("Person in charge"), on_delete=models.SET_NULL, blank=True, null=True) general_contractor = models.ForeignKey( Person, related_name='general_contractor_files', - verbose_name=_(u"General contractor"), blank=True, null=True, + verbose_name=_("General contractor"), blank=True, null=True, on_delete=models.SET_NULL,) # aménageur - personne - raw_general_contractor = models.CharField(_( - u"General contractor (raw)"), max_length=200, blank=True, null=True) + raw_general_contractor = models.CharField(_("General contractor (raw)"), + max_length=200, blank=True, null=True) corporation_general_contractor = models.ForeignKey( Organization, related_name='general_contractor_files', - verbose_name=_(u"General contractor organization"), blank=True, + verbose_name=_("General contractor organization"), blank=True, null=True, on_delete=models.SET_NULL,) # aménageur responsible_town_planning_service = models.ForeignKey( Person, related_name='responsible_town_planning_service_files', blank=True, null=True, - verbose_name=_(u"Responsible for planning service"), + verbose_name=_("Responsible for planning service"), on_delete=models.SET_NULL,) # service instructeur - personne raw_town_planning_service = models.CharField( _(u"Planning service (raw)"), max_length=200, @@ -289,29 +289,31 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem, Organization, related_name='planning_service_files', blank=True, null=True, - verbose_name=_(u"Planning service organization"), + verbose_name=_("Planning service organization"), on_delete=models.SET_NULL,) # service instructeur permit_type = models.ForeignKey( - PermitType, verbose_name=_(u"Permit type"), blank=True, null=True, + PermitType, verbose_name=_("Permit type"), blank=True, null=True, on_delete=models.SET_NULL ) permit_reference = models.TextField( _("Permit reference"), blank=True, default="") end_date = models.DateField(_("Closing date"), null=True, blank=True) main_town = models.ForeignKey( - Town, verbose_name=_(u"Main town"), null=True, blank=True, + Town, verbose_name=_("Main town"), null=True, blank=True, related_name='file_main', on_delete=models.SET_NULL ) - towns = models.ManyToManyField(Town, verbose_name=_(u"Towns"), + towns = models.ManyToManyField(Town, verbose_name=_("Towns"), related_name='file', blank=True) creation_date = models.DateField( - _(u"Creation date"), default=datetime.date.today, blank=True, + _("Creation date"), default=datetime.date.today, blank=True, null=True) - reception_date = models.DateField(_(u'Reception date'), blank=True, + reception_date = models.DateField(_('Reception date'), blank=True, null=True) + planning_service_date = models.DateField( + _("Date of planning service file"), null=True, blank=True) related_file = models.ForeignKey( - "File", verbose_name=_(u"Related file"), blank=True, null=True, + "File", verbose_name=_("Related file"), blank=True, null=True, on_delete=models.SET_NULL ) if settings.COUNTRY == 'fr': diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index f5a3ac6d3..7d3279988 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -109,6 +109,7 @@ {% field_flex "Permit type" item.permit_type %} {% field_flex "Permit reference" item.permit_reference %} + {% field_flex "Date of planning service file" item.planning_service_date|date:"DATE_FORMAT" %} {% field_flex "General contractor" item.general_contractor.full_address %} {% if item.corporation_general_contractor %} diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index c69886de4..d4cc749a4 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -51,10 +51,10 @@ class FileFormGeneral(CustomForm, ManageOldType): initial=lambda: datetime.datetime.now().year, validators=[validators.MinValueValidator(1000), validators.MaxValueValidator(2100)]) - creation_date = forms.DateField(label=_(u"Creation date"), + creation_date = forms.DateField(label=_("Creation date"), initial=get_now, widget=DatePicker) reception_date = forms.DateField( - label=_(u"Reception date"), initial=get_now, widget=DatePicker) + label=_("Reception date"), initial=get_now, widget=DatePicker) TYPES = [ FieldType('file_type', models.FileType), @@ -359,6 +359,9 @@ class FileFormPlanningService(CustomForm, IshtarForm): ) permit_reference = forms.CharField(label=_("File reference"), required=False, max_length=200) + planning_service_date = forms.DateField( + label=_("Date of planning service file"), widget=DatePicker, + required=False) def clean(self): responsible = self.cleaned_data["responsible_town_planning_service"] |