diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-04-20 16:03:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-04-21 12:19:03 +0200 |
| commit | e7257529560713e1b5bd36fd94279da91ec34979 (patch) | |
| tree | b097f71e0064500e8d370f8d9b45695e2b58d61a /archaeological_finds/forms.py | |
| parent | a0f393c0369130620cc99d6222a57503c15fd5d9 (diff) | |
| download | Ishtar-e7257529560713e1b5bd36fd94279da91ec34979.tar.bz2 Ishtar-e7257529560713e1b5bd36fd94279da91ec34979.zip | |
✨ generic search: add editors - find search: add many fields
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 0e27b0303..6ea406b9e 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -401,7 +401,8 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType): museum_id_prefix = forms.CharField(label=_("Museum ID prefix"), required=False) museum_id = forms.CharField(label=_("Museum inventory number"), required=False) museum_id_suffix = forms.CharField(label=_("Museum ID suffix"), required=False) - museum_id_comment = forms.CharField(label=_("Comment on museum ID"), widget=forms.Textarea, required=False) + museum_id_comment = forms.CharField(label=_("Comment on museum ID"), + widget=forms.Textarea, required=False) HEADERS["label"] = FormHeader(_("Identification")) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination"), required=False) @@ -639,10 +640,13 @@ class BasicFindForm(MuseumForm, CustomForm, ManageOldType): FieldType("technical_processe", models.TechnicalProcessType, is_multiple=True), FieldType("communicabilitie", models.CommunicabilityType, is_multiple=True), FieldType("checked_type", models.CheckedType, is_multiple=True), - FieldType("iconographic_pattern", models.IconographicPatternType, is_multiple=True), - FieldType("listed_building_protection_nature", models.ListedBuildingProtectionNature), + FieldType("iconographic_pattern", models.IconographicPatternType, + is_multiple=True), + FieldType("listed_building_protection_nature", + models.ListedBuildingProtectionNature), FieldType("museum_collection_entry_mode", models.CollectionEntryModeType), - FieldType("museum_inventory_marking_presence", models.InventoryMarkingPresence, is_multiple=True), + FieldType("museum_inventory_marking_presence", + models.InventoryMarkingPresence, is_multiple=True), FieldType("museum_marking_type", models.MarkingType, is_multiple=True), FieldType("museum_collection", models.MuseumCollection), FieldType("museum_inventory_conformity", models.InventoryConformity), @@ -1830,6 +1834,7 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): ) label = forms.CharField(label=_("Free ID")) denomination = forms.CharField(label=_("Denomination")) + title = forms.CharField(label=_("Title")) museum_id_prefix = forms.CharField(label=_("Museum ID prefix")) museum_id = forms.CharField(label=_("Museum inventory number")) museum_id_suffix = forms.CharField(label=_("Museum ID suffix")) @@ -1997,6 +2002,10 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): label=_("Periods"), choices=[], required=False ) dating_comment = forms.CharField(label=_("Comment on datings")) + actors = forms.IntegerField( + label=_("Actors"), required=False, + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-qualifiedbiographicalnote'))) length = FloatField(label=_("Length (cm)"), widget=widgets.CentimeterMeterWidget) width = FloatField(label=_("Width (cm)"), widget=widgets.CentimeterMeterWidget) @@ -2028,6 +2037,7 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): integrities = forms.ChoiceField(label=_("Integrity"), choices=[]) remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[]) conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[]) + conservatory_states_details = forms.CharField(label=_("Conservatory state details")) conservatory_comment = forms.CharField(label=_("Conservatory comment")) alterations = forms.ChoiceField(label=_("Alteration"), choices=[]) alteration_causes = forms.ChoiceField(label=_("Alteration cause"), choices=[]) @@ -2075,12 +2085,21 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): reverse_lazy('autocomplete-biographicalnote'), associated_model=BiographicalNote), validators=[valid_id(BiographicalNote)]) + iconographic_patterns = forms.IntegerField( + label=_("Iconographic patterns"), + widget=widgets.JQueryAutoComplete( + reverse_lazy("autocomplete-iconographicpattern"), + associated_model=models.IconographicPatternType, + ), + ) + iconography_notes = forms.CharField(label=_("Iconography notes")) museum_inventory_marking_presence = forms.ChoiceField( label=_("Museum - Presence of inventory marking"), choices=[] ) museum_marking_type = forms.ChoiceField( label=_("Museum - Type of marking"), choices=[] ) + mark_text = forms.CharField(label=_("Transcription of the marking"), required=False) mark = forms.CharField(label=_("Marking details")) museum_collections = forms.ChoiceField( label=_("Museum - Collection"), choices=[] @@ -2091,17 +2110,27 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): reverse_lazy('autocomplete-biographicalnote'), associated_model=BiographicalNote), validators=[valid_id(BiographicalNote)]) - museum_inventory_entry_year= forms.IntegerField(label=_("Museum - Inventory entry year")) + museum_inventory_entry_year= forms.IntegerField( + label=_("Museum - Inventory entry year") + ) museum_inventory_conformity = forms.ChoiceField( label=_("Museum - Conformity with inventory"), choices=[] ) museum_conformity_comment = forms.CharField(label=_("Museum - Comment on conformity")) - museum_inventory_transcript = forms.CharField(label=_("Museum - Inventory transcript")) + museum_inventory_transcript = forms.CharField( + label=_("Museum - Inventory transcript") + ) museum_original_repro = forms.ChoiceField( label=_("Museum - Original/reproduction"), choices=[] ) museum_allocation_date = DateField(label=_("Museum - Date of allocation")) museum_purchase_price = forms.CharField(label=_("Museum - Purchase price")) + listed_building_id = forms.CharField(label=_("Listed building ID")) + listed_building_protection_nature = forms.ChoiceField( + label=_("Nature of listed buildings protection"), choices=[], + ) + listed_building_date = DateField(label=_("Date of listing as a listed building")) + listed_building_notes = forms.CharField(label=_("Notes on listed building")) TYPES = DatingSelect.TYPES + [ FieldType("periods", Period), @@ -2138,6 +2167,8 @@ class FindSelect(MuseumForm, GeoItemSelect, DatingSelect): FieldType("museum_collections", models.MuseumCollection), FieldType("museum_inventory_conformity", models.InventoryConformity), FieldType("museum_original_repro", models.OriginalReproduction), + FieldType("listed_building_protection_nature", + models.ListedBuildingProtectionNature), ] + GeoItemSelect.TYPES SITE_KEYS = { "archaeological_sites": "attached-to-operation", |
