diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 21edb2eba..44f38af87 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -876,6 +876,7 @@ class QAFindFormMulti(QAForm): "qa_communicabilities", "qa_alterations", "qa_alteration_causes", + "qa_museum_collection_entry_mode", ] associated_models = { "qa_material_types": models.MaterialType, @@ -890,6 +891,7 @@ class QAFindFormMulti(QAForm): "qa_period": Period, "qa_conservatory_state": models.ConservatoryState, "qa_treatment_emergency": models.TreatmentEmergencyType, + "qa_museum_collection_entry_mode": models.CollectionEntryModeType, } MULTI = True @@ -903,7 +905,13 @@ class QAFindFormMulti(QAForm): "qa_treatment_emergency", "qa_appraisal_date", "qa_insurance_value", # 'qa_collection', + "qa_museum_collection_entry_mode", ] + PROFILE_FILTER = { + "museum": [ + "qa_museum_collection_entry_mode", + ], + } HEADERS = { "qa_ue": FormHeader(_("Context record")), @@ -912,6 +920,7 @@ class QAFindFormMulti(QAForm): "qa_checked_type": FormHeader(_("Sheet")), "qa_period": FormHeader(_("Datation")), "qa_conservatory_comment": FormHeader(_("Preservation")), + "qa_museum_collection_entry_mode": FormHeader(_("Museum")), } SINGLE_FIELDS = [ @@ -949,7 +958,7 @@ class QAFindFormMulti(QAForm): qa_museum_id_suffix = forms.CharField(label=_("Museum ID suffix"), required=False) qa_laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False) qa_seal_number = forms.CharField(label=_("Seal number"), required=False) - qa_mark = forms.CharField(label=_("Mark"), required=False) + qa_mark = forms.CharField(label=_("Marking details"), required=False) # qa_collection = forms.IntegerField( # label=_("Collection"), # widget=widgets.JQueryAutoComplete( @@ -1021,6 +1030,7 @@ class QAFindFormMulti(QAForm): qa_conservatory_comment = forms.CharField( label=_("Comment on conservatory"), required=False, widget=forms.Textarea ) + qa_museum_collection_entry_mode = forms.ChoiceField(label=_("Collections entry mode"), required=False, choices=[]) TYPES = [ FieldType("qa_material_types", models.MaterialType, is_multiple=True), @@ -1036,6 +1046,7 @@ class QAFindFormMulti(QAForm): FieldType("qa_conservatory_state", models.ConservatoryState), FieldType("qa_treatment_emergency", models.TreatmentEmergencyType), FieldType("qa_period", Period, is_multiple=True), + FieldType("qa_museum_collection_entry_mode", models.CollectionEntryModeType), ] def __init__(self, *args, **kwargs): @@ -1467,6 +1478,8 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum": [ "museum_id", "cache_complete_museum_id", + "museum_former_collections", + "museum_collection_entry_mode" ], } @@ -1482,7 +1495,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): base_finds__excavation_id = forms.CharField(label=_("Excavation ID")) seal_number = forms.CharField(label=_("Seal number")) laboratory_id = forms.CharField(label=_("Laboratory ID")) - mark = forms.CharField(label=_("Mark")) + mark = forms.CharField(label=_("Marking details")) base_finds__cache_short_id = forms.CharField(label=_("Base find - Short ID")) base_finds__cache_complete_id = forms.CharField(label=_("Base find - Complete ID")) @@ -1753,6 +1766,9 @@ class FindSelect(GeoItemSelect, PeriodSelect): treatments_end_date = forms.DateField( label=_("Treatment end date before"), widget=DatePicker ) + # museum + museum_former_collections = forms.CharField(label=_("Museum - Former collection")) + museum_collection_entry_mode = forms.ChoiceField(label=_("Museum - Collections entry mode"), choices=[]) TYPES = PeriodSelect.TYPES + [ FieldType("conservatory_state", models.ConservatoryState), @@ -1780,6 +1796,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): "base_finds__context_record__operation__remains", RemainType ), + FieldType("museum_collection_entry_mode", models.CollectionEntryModeType), ] + GeoItemSelect.TYPES SITE_KEYS = { "archaeological_sites": "attached-to-operation", |