diff options
4 files changed, 59 insertions, 21 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index e44597961..1c024dcfc 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -15,8 +15,20 @@ <ul class='form-flex'> <li><label>{% if item.operation.code_patriarche %}{%trans "Complete ID:"%}{% else %}{%trans "Temporary ID:"%}{% endif %}</label><span class='value'>{{item.full_label}}</span></li> -{% field_li "Creation date" item.creation_date %} -{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} +<li><label>{%trans "Creation:"%}</label> + <span class='value'> + {{item.history_creator.ishtaruser.person}}<br/> + <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small> + </span> +</li> + {% if item.history_creation_date != item.last_edition_date %} +<li><label>{%trans "Modification:"%}</label> + <span class='value'> + {{item.history_modifier.ishtaruser.person}}<br/> + <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small> + </span> +</li> + {% endif %} {% field_li "Type" item.unit %} {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 071db20ee..408edde34 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -18,12 +18,23 @@ {% field_li "Numerical reference" item.numeric_reference "<strong>" "</strong>" %} {% field_li "Other reference" item.internal_reference %} {% field_li "Name" item.name %} + {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} + + <li><label>{%trans "Creation:"%}</label> + <span class='value'> + {{item.history_creator.ishtaruser.person}}<br/> + <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small> + </span> + </li> + {% if item.history_creation_date != item.last_edition_date %} + <li><label>{%trans "Modification:"%}</label> + <span class='value'> + {{item.history_modifier.ishtaruser.person}}<br/> + <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small> + </span> + </li> + {% endif %} -<li><label>{%trans "Edition date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now --> - -{% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} -{% field_li "Creation date" item.creation_date|date:"DATE_FORMAT" %} -{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% comment %} {% if item.deadline_date and not item.acts %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index a6a0ccf69..b088f3161 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -20,18 +20,21 @@ <ul class='form-flex'> {% field_li "Previous ID" item.previous_id %} -{% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} -{% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" as creator %} -{% field_li "Created by" creator|safe %} -{% endwith %} -{% endwith %} -{% if item.history_creation_date != item.last_edition_date %} -{% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} -{% with item.history_modifier.ishtaruser.full_label|add:"<br/><i>"|add:edition_date|add:"</i>" as modifier %} -{% field_li "Last modified by" modifier|safe %} -{% endwith %} -{% endwith %} -{% endif %} + + <li><label>{%trans "Creation:"%}</label> + <span class='value'> + {{item.history_creator.ishtaruser.person}}<br/> + <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small> + </span> + </li> + {% if item.history_creation_date != item.last_edition_date %} + <li><label>{%trans "Modification:"%}</label> + <span class='value'> + {{item.history_modifier.ishtaruser.person}}<br/> + <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small> + </span> + </li> + {% endif %} {% field_li "Administrative index" item.administrative_index %} {% field_li_multiple "Material types" item.material_types %} {% field_li "Dating" item.dating %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 28e4ae6b5..d3eb980c4 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -24,8 +24,20 @@ <h3>{% trans "General"%}</h3> <ul class='form-flex'> {% field_li "Old code" item.old_code %} -<li><label>{%trans "Last modification date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now --> -{% field_li_detail "Created by" item.history_creator.ishtaruser.person %} + <li><label>{%trans "Creation:"%}</label> + <span class='value'> + {{item.history_creator.ishtaruser.person}}<br/> + <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small> + </span> + </li> + {% if item.history_creation_date != item.last_edition_date %} + <li><label>{%trans "Modification:"%}</label> + <span class='value'> + {{item.history_modifier.ishtaruser.person}}<br/> + <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small> + </span> + </li> + {% endif %} {% field_li "Begining date" item.start_date %} {% field_li "Excavation end date" item.excavation_end_date|default:"-" %} {% field_li_detail "Head scientist" item.scientist %} |