✨ finds - workshop, movement, style fields: model, admin, forms, views, sheet (refs #6725)

1 files changed, 21 insertions, 3 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 6ea406b9e..6659da821 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -253,6 +253,7 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         "museum_inventory_marking_presence",
         "museum_marking_type",
         "museum_collection",
+        "workshop_movement_style",
     ]
     associated_models = {
         "actor": QualifiedBiographicalNote,
@@ -269,6 +270,7 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         "object_type_quality": models.ObjectTypeQualityType,
         "checked_type": models.CheckedType,
         "iconographic_pattern": models.IconographicPatternType,
+        "workshop_movement_style": models.WorkshopMovementStyleType,
         "listed_building_protection_nature": models.ListedBuildingProtectionNature,
         "museum_collection_entry_mode": models.CollectionEntryModeType,
         "museum_inventory_marking_presence": models.InventoryMarkingPresence,
@@ -318,6 +320,7 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         "museum_purchase_price",
         "iconographic_pattern",
         "iconography_notes",
+        "workshop_movement_style",
         "description",
         "public_description",
         "get_first_base_find__discovery_method",
@@ -450,7 +453,8 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
     museum_collection = widgets.Select2MultipleField(
         model=models.MuseumCollection, label=_("Collections"), required=False)
     museum_former_collection = widgets.Select2MultipleField(
-        model=BiographicalNote, label=_("Former collections"), required=False, remote=True, new=True)
+        model=BiographicalNote, label=_("Former collections"), required=False,
+        remote=True, new=True)
     museum_inventory_entry_year = forms.IntegerField(
         label=_("Inventory entry year"), required=False, min_value=0, max_value=2100
     )
@@ -463,7 +467,8 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
     museum_original_repro = forms.ChoiceField(
         label=_("Original/reproduction"), required=False, choices=[]
     )
-    museum_allocation_date = DateField(label=_("Date of museum allocation"), required=False)
+    museum_allocation_date = DateField(label=_("Date of museum allocation"),
+                                       required=False)
     museum_purchase_price = forms.CharField(label=_("Purchase price"), required=False)
     iconographic_pattern = widgets.Select2MultipleField(
         label=_("Iconographic patterns"), required=False,
@@ -471,6 +476,9 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
     iconography_notes = forms.CharField(
         label=_("Iconography notes"), widget=forms.Textarea, required=False
     )
+    workshop_movement_style = widgets.Select2MultipleField(
+        label=_("Workshop, movement, style"), required=False,
+    )
 
     HEADERS["museum_inventory_transcript"] = FormHeader(_("Description"))
     museum_inventory_transcript = forms.CharField(
@@ -642,6 +650,8 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType):
         FieldType("checked_type", models.CheckedType, is_multiple=True),
         FieldType("iconographic_pattern", models.IconographicPatternType,
                   is_multiple=True),
+        FieldType("workshop_movement_style", models.WorkshopMovementStyleType,
+                  is_multiple=True),
         FieldType("listed_building_protection_nature",
                   models.ListedBuildingProtectionNature),
         FieldType("museum_collection_entry_mode", models.CollectionEntryModeType),
@@ -737,6 +747,7 @@ class FindForm(BasicFindForm):
         "museum_purchase_price",
         "iconographic_pattern",
         "iconography_notes",
+        "workshop_movement_style",
         "museum_allocation_date",
         "museum_inventory_transcript",
         "description",
@@ -2093,6 +2104,13 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect):
         ),
     )
     iconography_notes = forms.CharField(label=_("Iconography notes"))
+    workshop_movement_styles = forms.IntegerField(
+        label=_("Workshop, movement, style"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy("autocomplete-workshopmovementstyle"),
+            associated_model=models.WorkshopMovementStyleType,
+        ),
+    )
     museum_inventory_marking_presence = forms.ChoiceField(
         label=_("Museum - Presence of inventory marking"), choices=[]
     )
@@ -2110,7 +2128,7 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect):
             reverse_lazy('autocomplete-biographicalnote'),
             associated_model=BiographicalNote),
         validators=[valid_id(BiographicalNote)])
-    museum_inventory_entry_year= forms.IntegerField(
+    museum_inventory_entry_year = forms.IntegerField(
         label=_("Museum - Inventory entry year")
     )
     museum_inventory_conformity = forms.ChoiceField(