Preventive file: add some fields - better sheet - Administrativ act: add comment

4 files changed, 34 insertions, 0 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index bdc351c35..b092e91f7 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -1634,6 +1634,7 @@ class AdministrativeActOpeSelect(TableSelect):
             label=_("Department"), choices=[])
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
+    comment = forms.CharField(label=_("Comment"), max_length=500)
     history_creator = forms.IntegerField(
         label=_("Created by"),
         widget=widgets.JQueryAutoComplete(
@@ -1695,6 +1696,7 @@ class AdministrativeActForm(CustomForm, ManageOldType):
     act_object = forms.CharField(label=_("Object"), max_length=300,
                                  widget=forms.Textarea, required=False)
     signature_date = DateField(label=_("Signature date"), required=False)
+    comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False)
     if settings.COUNTRY == 'fr':
         ref_sra = forms.CharField(label="Autre référence", max_length=15,
                                   required=False)
diff --git a/archaeological_operations/migrations/0108_auto_20220711_0112.py b/archaeological_operations/migrations/0108_auto_20220711_0112.py
new file mode 100644
index 000000000..db1359d7b
--- /dev/null
+++ b/archaeological_operations/migrations/0108_auto_20220711_0112.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.28 on 2022-07-11 01:12
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_operations', '0107_auto_20210326_1434'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='administrativeact',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='Comment'),
+        ),
+        migrations.AddField(
+            model_name='historicaladministrativeact',
+            name='comment',
+            field=models.TextField(blank=True, default='', verbose_name='Comment'),
+        ),
+    ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index a716bff8d..731d6cb34 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -2447,6 +2447,9 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter)
             pgettext_lazy("key for text search", "treatment-file-type"),
             "treatment_file__type__label__iexact",
         ),
+        "comment": SearchAltName(
+            pgettext_lazy("key for text search", "comment"), "comment__iexact"
+        ),
     }
     ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES)
     ALT_NAMES.update(DocumentItem.ALT_NAMES)
@@ -2540,6 +2543,7 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter)
         default="",
         help_text=_("Cached values get from associated towns"),
     )
+    comment = models.TextField(_("Comment"), blank=True, default="")
     documents = models.ManyToManyField(
         Document,
         related_name="administrativeacts",
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 843d5fc8d..a524ad04d 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -68,6 +68,7 @@
         <span class='value'>{{ item.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->
         {% if item.general_contractor %}<p><label>{%trans "General contractor"%}</label> <span class='value'>{{ item.general_contractor.full_label }}</span></p>{% endif %}
         {% endcomment %}
+        {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
     </div>
 </div>
     {% if item.documents.count %}