diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 166 |
1 files changed, 41 insertions, 125 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 967168c66..4e3dfef14 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -1613,37 +1613,24 @@ class FindSelect(GeoItemSelect, PeriodSelect): _("Discovery"), [ "base_finds__comment", - "base_finds__discovery_date__before", - "base_finds__discovery_date__after", - "base_finds__discovery_date_taq__before", - "base_finds__discovery_date_taq__after", + "base_finds__discovery_date", + "base_finds__discovery_date_taq", ], ), ( _("Dimensions"), [ - "length__higher", - "width__higher", - "height__higher", - "thickness__higher", - "diameter__higher", - "circumference__higher", - "volume__higher", - "weight__higher", - "clutter_long_side__higher", - "clutter_short_side__higher", - "clutter_height__higher", - "length__lower", - "width__lower", - "height__lower", - "thickness__lower", - "diameter__lower", - "circumference__lower", - "volume__lower", - "weight__lower", - "clutter_long_side__lower", - "clutter_short_side__lower", - "clutter_height__lower", + "length", + "width", + "height", + "thickness", + "diameter", + "circumference", + "volume", + "weight", + "clutter_long_side", + "clutter_short_side", + "clutter_height", "dimensions_comment", ], ), @@ -1832,17 +1819,11 @@ class FindSelect(GeoItemSelect, PeriodSelect): description = forms.CharField(label=_("Description")) base_finds__comment = forms.CharField(label=_("Base find - Comment on the circumstances of discovery")) - base_finds__discovery_date__after = forms.DateField( - label=_("Discovery date (exact or beginning) after"), widget=DatePicker + base_finds__discovery_date = forms.DateField( + label=_("Discovery date (exact or beginning)"), widget=DatePicker ) - base_finds__discovery_date__before = forms.DateField( - label=_("Discovery date (exact or beginning) before"), widget=DatePicker - ) - base_finds__discovery_date_taq__after = forms.DateField( - label=_("Discovery date (end) after"), widget=DatePicker - ) - base_finds__discovery_date_taq__before = forms.DateField( - label=_("Discovery date (end) before"), widget=DatePicker + base_finds__discovery_date_taq = forms.DateField( + label=_("Discovery date (end)"), widget=DatePicker ) base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[]) is_complete = forms.NullBooleanField(label=_("Is complete?")) @@ -1904,73 +1885,24 @@ class FindSelect(GeoItemSelect, PeriodSelect): ) dating_comment = forms.CharField(label=_("Comment on dating")) - length__higher = FloatField( - label=_("Length - higher than (cm)"), widget=widgets.CentimeterMeterWidget - ) - length__lower = FloatField( - label=_("Length - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - width__lower = FloatField( - label=_("Width - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - width__higher = FloatField( - label=_("Width - higher than (cm)"), widget=widgets.CentimeterMeterWidget - ) - height__lower = FloatField( - label=_("Height - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - height__higher = FloatField( - label=_("Height - higher than (cm)"), widget=widgets.CentimeterMeterWidget - ) - thickness__lower = FloatField( - label=_("Thickness - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - thickness__higher = FloatField( - label=_("Thickness - higher than (cm)"), widget=widgets.CentimeterMeterWidget - ) - diameter__lower = FloatField( - label=_("Diameter - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - diameter__higher = FloatField( - label=_("Diameter - higher than (cm)"), widget=widgets.CentimeterMeterWidget - ) - circumference__lower = FloatField( - label=_("Circumference - lower than (cm)"), widget=widgets.CentimeterMeterWidget - ) - circumference__higher = FloatField( - label=_("Circumference - higher than (cm)"), - widget=widgets.CentimeterMeterWidget, - ) - volume__lower = FloatField(label=_("Volume - lower than (l)")) - volume__higher = FloatField(label=_("Volume - higher than (l)")) - weight__lower = FloatField( - label=_("Weight - lower than (g)"), widget=widgets.GramKilogramWidget - ) - weight__higher = FloatField( - label=_("Weight - higher than (g)"), widget=widgets.GramKilogramWidget - ) - clutter_long_side__lower = FloatField( - label=_("Clutter long side - lower than (cm)"), - widget=widgets.CentimeterMeterWidget, - ) - clutter_long_side__higher = FloatField( - label=_("Clutter long side - higher than (cm)"), - widget=widgets.CentimeterMeterWidget, - ) - clutter_short_side__lower = FloatField( - label=_("Clutter short side - lower than (cm)"), - widget=widgets.CentimeterMeterWidget, - ) - clutter_short_side__higher = FloatField( - label=_("Clutter short side - higher than (cm)"), + length = FloatField(label=_("Length (cm)"), widget=widgets.CentimeterMeterWidget) + width = FloatField(label=_("Width (cm)"), widget=widgets.CentimeterMeterWidget) + height = FloatField(label=_("Height (cm)"), widget=widgets.CentimeterMeterWidget) + thickness = FloatField(label=_("Thickness (cm)"), widget=widgets.CentimeterMeterWidget) + diameter = FloatField(label=_("Diameter (cm)"), widget=widgets.CentimeterMeterWidget) + circumference = FloatField(label=_("Circumference (cm)"), widget=widgets.CentimeterMeterWidget) + volume = FloatField(label=_("Volume (l)")) + weight = FloatField(label=_("Weight - lower than (g)"), widget=widgets.GramKilogramWidget) + clutter_long_side = FloatField( + label=_("Clutter long side (cm)"), widget=widgets.CentimeterMeterWidget, ) - clutter_height__lower = FloatField( - label=_("Clutter height - lower than (cm)"), + clutter_short_side = FloatField( + label=_("Clutter short side (cm)"), widget=widgets.CentimeterMeterWidget, ) - clutter_height__higher = FloatField( - label=_("Clutter height - higher than (cm)"), + clutter_height = FloatField( + label=_("Clutter height (cm)"), widget=widgets.CentimeterMeterWidget, ) dimensions_comment = forms.CharField(label=_("Dimensions comment")) @@ -1979,10 +1911,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): label=_("Point of topographic reference"), ) checked_type = forms.ChoiceField(label=_("Check")) - check_date__after = forms.DateField(label=_("Check date after"), widget=DatePicker) - check_date__before = forms.DateField( - label=_("Check date before"), widget=DatePicker - ) + check_date = forms.DateField(label=_("Check date"), widget=DatePicker) integrities = forms.ChoiceField(label=_("Integrity"), choices=[]) remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[]) conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[]) @@ -1994,23 +1923,16 @@ class FindSelect(GeoItemSelect, PeriodSelect): ) treatment_emergency = forms.ChoiceField(choices=[], label=_("Treatment emergency")) - estimated_value__higher = FloatField(label=_("Estimated value - higher than")) - estimated_value__lower = FloatField(label=_("Estimated value - lower than")) - insurance_value__higher = FloatField(label=_("Insurance value - higher than")) - insurance_value__lower = FloatField(label=_("Insurance value - lower than")) - appraisal_date__after = forms.DateField( - label=_("Appraisal date after"), widget=DatePicker - ) - appraisal_date__before = forms.DateField( - label=_("Appraisal date before"), widget=DatePicker - ) + estimated_value = FloatField(label=_("Estimated value")) + insurance_value = FloatField(label=_("Insurance value")) + appraisal_date = forms.DateField(label=_("Appraisal date"), widget=DatePicker) loan = forms.NullBooleanField(label=_("Loan?")) treatments_file_end_date = forms.DateField( - label=_("Treatment file end date before"), widget=DatePicker + label=_("Treatment file end date"), widget=DatePicker ) treatments_end_date = forms.DateField( - label=_("Treatment end date before"), widget=DatePicker + label=_("Treatment end date"), widget=DatePicker ) # museum museum_id_comment = forms.CharField(label=_("Museum - Comment on museum ID")) @@ -2035,17 +1957,11 @@ class FindSelect(GeoItemSelect, PeriodSelect): museum_depositor_inventory_number = forms.CharField(label=_("Museum - Depositor inventory number")) museum_collection_entry_mode = forms.ChoiceField(label=_("Museum - Collections entry mode"), choices=[]) museum_entry_mode_comment = forms.CharField(label=_("Museum - Comment on museum entry mode")) - museum_entry_date_before = forms.DateField( - label=_("Museum - Entry date (exact or start) - before"), widget=DatePicker - ) - museum_entry_date_after = forms.DateField( - label=_("Museum - Entry date (exact or start) - after"), widget=DatePicker - ) - museum_entry_date_end_before = forms.DateField( - label=_("Museum - Entry date end - before"), widget=DatePicker + museum_entry_date = forms.DateField( + label=_("Museum - Entry date (exact or start)"), widget=DatePicker ) - museum_entry_date_end_after = forms.DateField( - label=_("Museum - Entry date end - after"), widget=DatePicker + museum_entry_date_end = forms.DateField( + label=_("Museum - Entry date end"), widget=DatePicker ) museum_entry_date_comment = forms.CharField(label=_("Museum - Comment on entry date")) museum_donor = forms.IntegerField( |