✨ finds - conservation recommendations, details regards alterations fields: model, admin, forms, views, sheet

4 files changed, 52 insertions, 1 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index e2b09af90..659ccd779 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -1649,6 +1649,10 @@ class PreservationForm(CustomForm, ManageOldType):
         label=_("Conservatory state details"), required=False,
         widget=forms.Textarea
     )
+    conservation_recommendations = forms.CharField(
+        label=_("Conservation recommendations"), required=False,
+        widget=forms.Textarea
+    )
     alteration = forms.MultipleChoiceField(
         label=_("Alteration"),
         choices=[],
@@ -1661,6 +1665,10 @@ class PreservationForm(CustomForm, ManageOldType):
         widget=widgets.Select2Multiple,
         required=False,
     )
+    alteration_comment = forms.CharField(
+        label=_("Details regards alterations"), required=False,
+        widget=forms.Textarea
+    )
     recommended_treatment = forms.MultipleChoiceField(
         label=_("Recommended treatments"),
         choices=[],
@@ -1783,8 +1791,10 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect):
                 "remarkabilities",
                 "conservatory_states",
                 "conservatory_comment",
+                "conservation_recommendations",
                 "alterations",
                 "alteration_causes",
+                "alteration_comment",
                 "recommended_treatments",
                 "treatment_emergency",
             ),
@@ -2067,8 +2077,12 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect):
     conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[])
     conservatory_states_details = forms.CharField(label=_("Conservatory state details"))
     conservatory_comment = forms.CharField(label=_("Conservatory comment"))
+    conservation_recommendations = forms.CharField(
+        label=_("Conservation recommendations")
+    )
     alterations = forms.ChoiceField(label=_("Alteration"), choices=[])
     alteration_causes = forms.ChoiceField(label=_("Alteration cause"), choices=[])
+    alteration_comment = forms.CharField(label=_("Details regards alterations"))
     recommended_treatments = forms.ChoiceField(
         choices=[], label=_("Recommended treatments")
     )
diff --git a/archaeological_finds/migrations/0156_basefind_context_record_comment_find_comparanda.py b/archaeological_finds/migrations/0156_context_record_com_comparanda_alteration_com_conservation_recomm.py
index d4a10080d..22b4e2fc7 100644
--- a/archaeological_finds/migrations/0156_basefind_context_record_comment_find_comparanda.py
+++ b/archaeological_finds/migrations/0156_context_record_com_comparanda_alteration_com_conservation_recomm.py
@@ -40,4 +40,24 @@ class Migration(migrations.Migration):
             name='mark_text',
             field=models.TextField(blank=True, default='', verbose_name='Transcription of the marking'),
         ),
+        migrations.AddField(
+            model_name='find',
+            name='alteration_comment',
+            field=models.TextField(blank=True, default='', verbose_name='Details regards alterations'),
+        ),
+        migrations.AddField(
+            model_name='find',
+            name='conservation_recommendations',
+            field=models.TextField(blank=True, default='', verbose_name='Conservation recommendations'),
+        ),
+        migrations.AddField(
+            model_name='historicalfind',
+            name='alteration_comment',
+            field=models.TextField(blank=True, default='', verbose_name='Details regards alterations'),
+        ),
+        migrations.AddField(
+            model_name='historicalfind',
+            name='conservation_recommendations',
+            field=models.TextField(blank=True, default='', verbose_name='Conservation recommendations'),
+        ),
     ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index ae9903af5..eed270ef9 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1785,6 +1785,14 @@ class Find(
             pgettext_lazy("key for text search", "conservatory-comment"),
             "conservatory_comment__iexact",
         ),
+        "conservation_recommendations": SearchAltName(
+            pgettext_lazy("key for text search", "conservation-recommendations"),
+            "conservation_recommendations__iexact",
+        ),
+        "alteration_comment": SearchAltName(
+            pgettext_lazy("key for text search", "alteration-comment"),
+            "alteration_comment__iexact",
+        ),
         "conservatory_states_details": SearchAltName(
             pgettext_lazy("key for text search", "conservatory-states-details"),
             "conservatory_states_details__iexact",
@@ -2592,6 +2600,9 @@ class Find(
     conservatory_comment = models.TextField(
         _("Conservatory comment"), blank=True, default=""
     )
+    conservation_recommendations = models.TextField(
+        _("Conservation recommendations"), blank=True, default=""
+    )
     preservation_to_considers = models.ManyToManyField(
         TreatmentType,
         verbose_name=_("Recommended treatments"),
@@ -2614,6 +2625,9 @@ class Find(
         blank=True,
         related_name="finds",
     )
+    alteration_comment = models.TextField(
+        _("Details regards alterations"), blank=True, default=""
+    )
     treatment_emergency = models.ForeignKey(
         TreatmentEmergencyType,
         verbose_name=_("Treatment emergency"),
@@ -2751,7 +2765,8 @@ class Find(
             "integrities_count", "remarkabilities_count", "conservatory_states_count",
             "conservatory_comment", "alterations_count", "alteration_causes_count",
             "recommended_treatments_count", "appraisal_date", "treatment_emergency",
-            "insurance_value", "estimated_value", "conservatory_states_details"
+            "insurance_value", "estimated_value", "conservatory_states_details",
+            "conservation_recommendations", "alteration_comment"
         ]
         return self._has_section("has_preservation_fields", attrs)
 
diff --git a/archaeological_finds/templates/ishtar/sheet_find_treatments.html b/archaeological_finds/templates/ishtar/sheet_find_treatments.html
index 3873b1770..560b8307c 100644
--- a/archaeological_finds/templates/ishtar/sheet_find_treatments.html
+++ b/archaeological_finds/templates/ishtar/sheet_find_treatments.html
@@ -16,8 +16,10 @@
           {% field_flex_multiple_obj _("Remarkability") item 'remarkabilities' %}
           {% field_flex_multiple_obj _("Conservatory states") item 'conservatory_states' %}
           {% field_flex_full _("Conservatory state details") item.conservatory_states_details "<pre>" "</pre>" %}
+          {% field_flex_full _("Conservation recommendations") item.conservation_recommendations "<pre>" "</pre>" %}
           {% field_flex_multiple_obj _("Alteration") item 'alterations' %}
           {% field_flex_multiple_obj _("Alteration cause") item 'alteration_causes' %}
+          {% field_flex_full _("Details regards alterations") item.alteration_comment "<pre>" "</pre>" %}
           {% field_flex_multiple_obj _("Recommended treatments") item 'recommended_treatments' %}
           {% field_flex _("Treatment emergency") item.treatment_emergency %}
           {% field_flex _("Estimated value") item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %}