diff options
| -rw-r--r-- | archaeological_finds/forms.py | 26 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0118_auto_20240222_1745.py | 42 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 10 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 2 |
6 files changed, 82 insertions, 2 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 185820b9b..d8b087c3c 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -285,6 +285,8 @@ class BasicFindForm(CustomForm, ManageOldType): "technical_area", "find_number", "min_number_of_individuals", + "museum_inventory_quantity", + "museum_observed_quantity", "quantity_comment", "decoration", "inscription", @@ -339,7 +341,9 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_original_repro", "museum_allocation_date", "museum_purchase_price", - ], + "museum_inventory_quantity", + "museum_observed_quantity", + ], } HEADERS = {} HEADERS["museum_id_prefix"] = FormHeader(_("Museum identification")) @@ -460,6 +464,8 @@ class BasicFindForm(CustomForm, ManageOldType): min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)"), required=False ) + museum_inventory_quantity = forms.IntegerField(label=_("Inventory quantity"), required=False, max_value=32000) + museum_observed_quantity = forms.IntegerField(label=_("Observed quantity"), required=False, max_value=32000) quantity_comment = forms.CharField( label=_("Comment on quantity"), required=False, widget=forms.Textarea ) @@ -656,6 +662,8 @@ class FindForm(BasicFindForm): "technical_area", "find_number", "min_number_of_individuals", + "museum_inventory_quantity", + "museum_observed_quantity", "quantity_comment", "inscription", "decoration", @@ -757,6 +765,8 @@ class ResultingFindForm(CustomForm, ManageOldType): resulting_min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)"), required=False ) + resulting_museum_inventory_quantity = forms.IntegerField(label=_("Inventory quantity"), required=False, max_value=32000) + resulting_museum_observed_quantity = forms.IntegerField(label=_("Observed quantity"), required=False, max_value=32000) resulting_quantity_comment = forms.CharField( label=_("Comment on quantity"), required=False, widget=forms.Textarea ) @@ -911,10 +921,15 @@ class QAFindFormMulti(QAForm): "qa_insurance_value", # 'qa_collection', "qa_museum_collection_entry_mode", "qa_find_number", + "qa_min_number_of_individuals", + "qa_museum_inventory_quantity", + "qa_museum_observed_quantity", ] PROFILE_FILTER = { "museum": [ "qa_museum_collection_entry_mode", + "qa_museum_inventory_quantity", + "qa_museum_observed_quantity", ], } @@ -977,6 +992,11 @@ class QAFindFormMulti(QAForm): label=_("Material types"), required=False ) qa_find_number = forms.IntegerField(label=_("Number of remains"), required=False) + qa_min_number_of_individuals = forms.IntegerField( + label=_("Minimum number of individuals (MNI)"), required=False + ) + qa_museum_inventory_quantity = forms.IntegerField(label=_("Inventory quantity"), required=False, max_value=32000) + qa_museum_observed_quantity = forms.IntegerField(label=_("Observed quantity"), required=False, max_value=32000) qa_technical_processes = widgets.Select2MultipleField( label=_("Technical processes"), required=False, @@ -1547,6 +1567,8 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum_allocation_date_before", "museum_allocation_date_after", "museum_purchase_price", + "museum_inventory_quantity", + "museum_observed_quantity", ], } @@ -1711,6 +1733,8 @@ class FindSelect(GeoItemSelect, PeriodSelect): min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)") ) + museum_inventory_quantity = forms.IntegerField(label=_("Inventory quantity")) + museum_observed_quantity = forms.IntegerField(label=_("Observed quantity")) manufacturing_place = forms.CharField(label=_("Manufacturing place")) decoration = forms.CharField(label=_("Decoration")) diff --git a/archaeological_finds/migrations/0118_auto_20240222_1745.py b/archaeological_finds/migrations/0118_auto_20240222_1745.py new file mode 100644 index 000000000..e9c5f5ac5 --- /dev/null +++ b/archaeological_finds/migrations/0118_auto_20240222_1745.py @@ -0,0 +1,42 @@ +# Generated by Django 2.2.24 on 2024-02-22 17:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0117_auto_20240219_1220'), + ] + + operations = [ + migrations.AlterModelOptions( + name='integritytype', + options={'ordering': ('label',), 'verbose_name': 'Integrity type', 'verbose_name_plural': 'Integrity types'}, + ), + migrations.AddField( + model_name='find', + name='museum_inventory_quantity', + field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='Inventory quantity'), + ), + migrations.AddField( + model_name='find', + name='museum_observed_quantity', + field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='Observed quantity'), + ), + migrations.AddField( + model_name='historicalfind', + name='museum_inventory_quantity', + field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='Inventory quantity'), + ), + migrations.AddField( + model_name='historicalfind', + name='museum_observed_quantity', + field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='Observed quantity'), + ), + migrations.AlterField( + model_name='find', + name='integrities', + field=models.ManyToManyField(blank=True, related_name='find', to='archaeological_finds.IntegrityType', verbose_name='Integrity'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 8ef32c8de..dfb208d7d 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1760,6 +1760,14 @@ class Find( pgettext_lazy("key for text search", "museum-purchase-price"), "museum_purchase_price__iexact" ), + "museum_inventory_quantity": SearchAltName( + pgettext_lazy("key for text search", "museum-inventory-quantity"), + "museum_inventory_quantity__iexact" + ), + "museum_observed_quantity": SearchAltName( + pgettext_lazy("key for text search", "museum-observed-quantity"), + "museum_observed_quantity__iexact" + ), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) ALT_NAMES.update(DocumentItem.ALT_NAMES) @@ -2175,6 +2183,8 @@ class Find( ) museum_allocation_date = models.DateField(_("Date of museum allocation"), blank=True, null=True) museum_purchase_price = models.TextField(_("Purchase price"), blank=True, default="") + museum_inventory_quantity = models.PositiveSmallIntegerField(_("Inventory quantity"), blank=True, null=True) + museum_observed_quantity = models.PositiveSmallIntegerField(_("Observed quantity"), blank=True, null=True) # preservation module conservatory_state = models.ForeignKey( diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 09ffe6efa..8c65ff80b 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -184,6 +184,8 @@ {% field_flex_multiple_obj "Technical areas" item 'technical_areas' %} {% field_flex "Number of remains" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} + {% field_flex "Inventory quantity" item.museum_inventory_quantity %} + {% field_flex "Observed quantity" item.museum_observed_quantity %} {% field_flex_full "Comment on quantity" item.quantity_comment "<pre>" "</pre>" %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index 131902d8e..f69aef75b 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -133,6 +133,8 @@ {% field_flex_multiple_obj "Technical areas" item 'technical_areas' %} {% field_flex "Number of remains" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} + {% field_flex "Inventory quantity" item.museum_inventory_quantity %} + {% field_flex "Observed quantity" item.museum_observed_quantity %} {% field_flex_full "Comment on quantity" item.quantity_comment "<pre>" "</pre>" %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f1d0939c1..febdc322e 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3457,7 +3457,7 @@ msgstr "Nombre minimum d'individus (NMI)" #: archaeological_finds/forms.py:464 archaeological_finds/forms.py:761 #: archaeological_finds/models_finds.py:1996 msgid "Comment on quantity" -msgstr "Précisions sur le nombre de reste" +msgstr "Précisions sur la quantité" #: archaeological_finds/forms.py:468 archaeological_finds/forms.py:765 #: archaeological_finds/forms.py:1703 archaeological_finds/models_finds.py:1961 |