diff options
4 files changed, 14 insertions, 4 deletions
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 5f3fc6496..12d25dfdb 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -136,7 +136,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form): widget=forms.Textarea, required=False) start_date = forms.DateField(label=_(u"Start date"), required=False, widget=widgets.JQueryDate) - end_date = forms.DateField(label=_(u"End date"), required=False, + end_date = forms.DateField(label=_(u"Closing date"), required=False, widget=widgets.JQueryDate) image = forms.ImageField( label=_(u"Image"), help_text=mark_safe( diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 76b9a2d86..7f2e4e348 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -118,7 +118,7 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms): description = models.TextField(_(u"Description"), blank=True, null=True) goal = models.TextField(_(u"Goal"), blank=True, null=True) start_date = models.DateField(_(u"Start date"), blank=True, null=True) - end_date = models.DateField(_(u"End date"), blank=True, null=True) + end_date = models.DateField(_(u"Closing date"), blank=True, null=True) container = models.ForeignKey(Container, verbose_name=_(u"Container"), blank=True, null=True) target_is_basket = models.BooleanField(_(u"Target a basket"), default=False) diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html index 887ae4e07..8ce8a0350 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatment.html +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -16,6 +16,11 @@ <p class="window-refs">{{ item.year }} - {{ item.index }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" %} ({{item.end_date}})</p>{% endif %} +{% else %} +<p class="window-refs">{% trans "Active" %}</p>{% endif %} +{% endif %} <ul class='form-flex'> {% field_li_multiple "Treatment type" item.treatment_types %} @@ -26,7 +31,7 @@ {% field_li "Responsible" item.person %} {% field_li "Organization" item.organization %} {% field_li "Start date" item.start_date %} - {% field_li "End date" item.end_date %} + {% field_li "Closing date" item.end_date %} </ul> {% if item.description or item.comment or item.goal %} {% field "Comment" item.comment "<pre>" "</pre>" %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html index 5632afbfd..58efe482a 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -12,6 +12,11 @@ <p class="window-refs">{{ item.year }} - {{ item.index }}</p> {% if item.external_id %} <p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" %} ({{item.end_date}})</p>{% endif %} +{% else %} +<p class="window-refs">{% trans "Active" %}</p>{% endif %} +{% endif %} <ul class='form-flex'> {% field_li "Type" item.type %} @@ -20,7 +25,7 @@ {% field_li "Applicant organisation" item.applicant_organisation %} {% field_li "Creation date" item.creation_date %} {% field_li "Reception date" item.reception_date %} - {% field_li "End date" item.end_date %} + {% field_li "Closing date" item.end_date %} </ul> {% field "Comment" item.comment "<pre>" "</pre>" %} |