diff options
-rw-r--r-- | archaeological_finds/forms.py | 16 | ||||
-rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
-rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 8483e5277..185820b9b 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -874,6 +874,8 @@ class QAFindFormMulti(QAForm): "qa_functional_areas", "qa_material_types", "qa_communicabilities", + "qa_integrities", + "qa_cultural_attributions", "qa_alterations", "qa_alteration_causes", "qa_museum_collection_entry_mode", @@ -885,6 +887,8 @@ class QAFindFormMulti(QAForm): "qa_functional_areas": models.FunctionalArea, "qa_technical_areas": models.TechnicalAreaType, "qa_communicabilities": models.CommunicabilityType, + "qa_integrities": models.IntegrityType, + "qa_cultural_attributions": CulturalAttributionType, "qa_alterations": models.AlterationType, "qa_alteration_causes": models.AlterationCauseType, "qa_checked_type": models.CheckedType, @@ -906,6 +910,7 @@ class QAFindFormMulti(QAForm): "qa_appraisal_date", "qa_insurance_value", # 'qa_collection', "qa_museum_collection_entry_mode", + "qa_find_number", ] PROFILE_FILTER = { "museum": [ @@ -932,7 +937,6 @@ class QAFindFormMulti(QAForm): "qa_museum_id_suffix", "qa_laboratory_id", "qa_seal_number", - "qa_mark", ] qa_ue = forms.IntegerField( label=_("Context record"), @@ -972,6 +976,7 @@ class QAFindFormMulti(QAForm): qa_material_types = widgets.Select2MultipleField( label=_("Material types"), required=False ) + qa_find_number = forms.IntegerField(label=_("Number of remains"), required=False) qa_technical_processes = widgets.Select2MultipleField( label=_("Technical processes"), required=False, @@ -1004,6 +1009,9 @@ class QAFindFormMulti(QAForm): qa_treatment_emergency = forms.ChoiceField( label=_("Treatment emergency"), choices=[], required=False ) + qa_integrities = widgets.Select2MultipleField( + label=_("Integrity"), required=False + ) qa_remarkabilities = widgets.Select2MultipleField( label=_("Remarkability"), required=False ) @@ -1023,6 +1031,10 @@ class QAFindFormMulti(QAForm): qa_period = widgets.Select2MultipleField( label=_("Chronological period"), choices=[], required=False ) + qa_cultural_attributions = widgets.Select2MultipleField( + label=_("Cultural attribution"), + required=False + ) qa_dating_comment = forms.CharField( label=_("Comment on dating"), required=False, widget=forms.Textarea ) @@ -1039,6 +1051,8 @@ class QAFindFormMulti(QAForm): FieldType("qa_technical_areas", models.TechnicalAreaType, is_multiple=True), FieldType("qa_technical_processes", models.TechnicalProcessType, is_multiple=True), FieldType("qa_communicabilities", models.CommunicabilityType, is_multiple=True), + FieldType("qa_integrities", models.IntegrityType, is_multiple=True), + FieldType("qa_cultural_attributions", CulturalAttributionType, is_multiple=True), FieldType("qa_alterations", models.AlterationType, is_multiple=True), FieldType("qa_alteration_causes", models.AlterationCauseType, is_multiple=True), FieldType("qa_remarkabilities", models.RemarkabilityType, is_multiple=True), diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 18cb03374..09ffe6efa 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -249,6 +249,7 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} </div> {% endif %} + {% if dating_list %} <table id='{{window_id}}-datings' class="table table-striped"> <tr> <th>{% trans "Chronological period" %}</th> @@ -281,6 +282,7 @@ </tr> {% endfor %} </table> + {% endif %} <div class='row'> {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} </div> diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index f903ec89c..131902d8e 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -197,6 +197,7 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} </div> {% endif %} + {% if dating_list %} <table id='{{window_id}}-datings' class="table table-striped"> <tr> <th>{% trans "Chronological period" %}</th> @@ -229,6 +230,7 @@ </tr> {% endfor %} </table> + {% endif %} <div class='row'> {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} </div> |