Preventive file: add missing fields

3 files changed, 24 insertions, 5 deletions

diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index d6ce59b28..1623e901f 100644
--- a/archaeological_files/forms.py
+++ b/archaeological_files/forms.py
@@ -96,7 +96,7 @@ class FileSelect(DocumentItemSelect):
     end_date = forms.NullBooleanField(label=_("Is active?"))
     saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[])
     permit_type = forms.ChoiceField(label=_("Permit type"), choices=[])
-    permit_reference = forms.CharField(max_length=200, label=_("Permit reference"))
+    permit_reference = forms.CharField(max_length=200, label=_("Permit/order reference"))
     comment = forms.CharField(label=_("Comment"), max_length=500)
     in_charge = forms.IntegerField(
         label=_("In charge"),
@@ -391,7 +391,7 @@ class FileFormPreventive(ManageOldType, forms.Form):
     )
     permit_type = forms.ChoiceField(label=_("Permit type"), required=False, choices=[])
     permit_reference = forms.CharField(
-        label=_("Permit reference"),
+        label=_("Permit/order reference"),
         required=False,
         validators=[validators.MaxLengthValidator(60)],
     )
@@ -528,8 +528,10 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
             "end_date",
             "ground_start_date",
             "ground_end_date",
+            "intervention_period",
             "study_period",
             "execution_report_date",
+            "report_due_date",
             "type_of_agreement",
             "operation_type_for_royalties",
             "total_developed_surface",
@@ -558,6 +560,11 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
         required=False,
         widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
     )
+    intervention_period = forms.CharField(
+        label=_("Intervention period"),
+        max_length=200,
+        required=False,
+    )
     study_period = forms.CharField(
         label=_("Study period"),
         max_length=200,
@@ -568,6 +575,11 @@ class FileFormPreventiveDetail(forms.ModelForm, CustomForm, ManageOldType):
         required=False,
         widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
     )
+    report_due_date = forms.DateField(
+        label=_("Report due date"),
+        required=False,
+        widget=DatePicker(attrs={"bs_col_width": "col-6 col-lg-3"}),
+    )
     total_developed_surface = forms.FloatField(
         widget=widgets.AreaWidget(attrs={"bs_col_width": "col-6 col-lg-3"}),
         label=_("Total developed surface (m2)"),
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 92cadf2c1..cc1ca7c2a 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -586,7 +586,8 @@ class File(
         null=True,
         on_delete=models.SET_NULL,
     )
-    permit_reference = models.TextField(_("Permit reference"), blank=True, default="")
+    permit_reference = models.TextField(_("Permit/order reference"),
+                                        blank=True, default="")
     end_date = models.DateField(_("Closing date"), null=True, blank=True)
     main_town = models.ForeignKey(
         Town,
@@ -684,6 +685,9 @@ class File(
         PriceAgreement, verbose_name=_("Price agreement"), blank=True, null=True,
         on_delete=models.SET_NULL
     )
+    intervention_period = models.CharField(
+        _("Intervention period"), max_length=200, default="", blank=True
+    )
     study_period = models.CharField(
         _("Study period"), max_length=200, default="", blank=True
     )
@@ -694,6 +698,9 @@ class File(
     execution_report_date = models.DateField(
         _("Execution report date"), blank=True, null=True
     )
+    report_due_date = models.DateField(
+        _("Report due by"), blank=True, null=True
+    )
     linear_meter = models.IntegerField(_("Linear meter"), blank=True, null=True)
     type_of_agreement = models.ForeignKey(
         AgreementType, blank=True, null=True,
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 4c14466c5..ad857f037 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1730,8 +1730,8 @@ msgstr "Type de permis"
 
 #: archaeological_files/forms.py:99 archaeological_files/forms.py:394
 #: archaeological_files/models.py:582
-msgid "Permit reference"
-msgstr "Référence du permis"
+msgid "Permit/order reference"
+msgstr "Référence du permis / de l'arrêté"
 
 #: archaeological_files/forms.py:100 archaeological_files/forms.py:294
 #: archaeological_files/forms.py:479 archaeological_files/models.py:629