diff options
| -rw-r--r-- | CHANGES.md | 4 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 13 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index 82aaa3d2a..14ebfc6bb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,9 @@ Ishtar changelog v3.0.4 - 2020-XX-XX ------------------- ### Features ### -- Sheet actions: add duplicate for site, operation, document and context record +- Quick actions - sheets: add duplicate for site, operation, document and context record +- Quick actions - tables: + - finds: edit - add appraisal date and treatment emergency fields v3.0.3 - 2020-02-24 ------------------- diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index bf5854cc6..316253a7a 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -569,12 +569,14 @@ class QAFindFormMulti(QAForm): 'qa_checked_type': models.CheckedType, 'qa_period': Period, "qa_conservatory_state": models.ConservatoryState, + "qa_treatment_emergency": models.TreatmentEmergencyType, } MULTI = True REPLACE_FIELDS = [ 'qa_denomination', 'qa_ue', 'qa_manufacturing_place', 'qa_checked_type', - 'qa_check_date', 'qa_conservatory_state' + 'qa_check_date', 'qa_conservatory_state', 'qa_treatment_emergency', + 'qa_appraisal_date', ] HEADERS = { @@ -629,8 +631,10 @@ class QAFindFormMulti(QAForm): qa_alteration_causes = widgets.Select2MultipleField( label=_(u"Alteration cause"), required=False ) - qa_conservatory_state= forms.ChoiceField(label=_("Conservatory state"), - required=False, choices=[]) + qa_conservatory_state = forms.ChoiceField(label=_("Conservatory state"), + required=False, choices=[]) + qa_treatment_emergency = forms.ChoiceField(label=_("Treatment emergency"), + choices=[], required=False) qa_comment = forms.CharField( label=_(u"Comment"), required=False, widget=forms.Textarea) @@ -638,6 +642,8 @@ class QAFindFormMulti(QAForm): qa_checked_type = forms.ChoiceField(label=_(u"Check"), required=False) qa_check_date = forms.DateField( label=_(u"Check date"), widget=DatePicker, required=False) + qa_appraisal_date = forms.DateField( + label=_("Appraisal date"), widget=DatePicker, required=False) qa_period = widgets.Select2MultipleField( label=_("Period"), choices=[], required=False) @@ -655,6 +661,7 @@ class QAFindFormMulti(QAForm): is_multiple=True), FieldType('qa_checked_type', models.CheckedType), FieldType('qa_conservatory_state', models.ConservatoryState), + FieldType('qa_treatment_emergency', models.TreatmentEmergencyType), FieldType('qa_period', Period, is_multiple=True), ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 5b980a590..209682785 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1608,9 +1608,9 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, on_delete=models.SET_NULL, blank=True, null=True ) - insurance_value = models.FloatField(_(u"Insurance value"), blank=True, + insurance_value = models.FloatField(_("Insurance value"), blank=True, null=True) - appraisal_date = models.DateField(_(u"Appraisal date"), blank=True, + appraisal_date = models.DateField(_("Appraisal date"), blank=True, null=True) public_description = models.TextField(_("Public description"), blank=True, null=True) |