Sheets: add ishtar ID (refs #3517)

13 files changed, 76 insertions, 59 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 1c024dcfc..7ba34fd13 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -12,23 +12,13 @@
 
 <p class='window-refs'>{{ item.parcel.short_label }}</p>
 <p class="window-refs">{{ item.label|default:"" }}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 <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>
-<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 %}
+
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
+
 {% field_li "Type" item.unit %}
 {% field_li_multiple "Chronology" item.datings %}
 {% field_li "Town" item.parcel.town %}
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index c8134f28f..7f37a298f 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -236,6 +236,11 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
         return _(u"FILE")
 
     @property
+    def full_internal_ref(self):
+        return u"{}{}".format(settings.ISHTAR_FILE_PREFIX or '',
+                              self.external_id or '')
+
+    @property
     def delay_date(self):
         cache_key, val = get_cache(self.__class__, [self.pk, 'delay_date'])
         if val:
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 408edde34..bfd92eb6f 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -11,29 +11,16 @@
 {% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next 1 %}
 {% endif %}
 
+<p class='window-refs'>{{item.full_internal_ref|default:''}}</p>
+<p class='window-refs'>{{item.internal_reference|default:''}}</p>
+<p class='window-refs'>{{item.name|default:''}}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
+
 <h3>{% trans "General"%}</h3>
 
 <ul class='form-flex'>
-{% field_li "Year" item.year "<strong>" "</strong>" %}
-{% 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 %}
+    {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
 
 
 {% comment %}
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index b088f3161..7889870b9 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -15,26 +15,13 @@
 <p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} &ndash; {% endif %}{{base_find.short_id}}{% endfor %}</p>
 <p class="window-refs">{{ item.administrative_index|default:"" }}</p>
 <p class="window-refs">{{ item.contextrecord|default:"" }}</p>
-
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 
 <ul class='form-flex'>
-{% field_li "Previous ID" item.previous_id %}
-
-  <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 "Previous ID" item.previous_id %}
+
+  {% include "ishtar/blocks/sheet_creation_section.html" %}
 {% field_li "Administrative index" item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
@@ -176,9 +163,16 @@
 <h3>{% trans "Associated base finds"%}</h3>
 
 {% for base_find in item.base_finds.all %}
+<p class='window-refs'>{{base_find.complete_id }}</p>
+<p class='window-refs'>{{base_find.short_id }}</p>
+{% if base_find.external_id %}
+<p class='window-refs external-id'>
+  <small title="{% trans 'Internal ID' %}">
+    <i class="fa fa-key" aria-hidden="true"></i>
+    {{base_find.external_id|default:''}}
+  </small>
+</p>{% endif %}
 <ul class='form-flex'>
-{% field_li "Complete ID" base_find.complete_id %}
-{% field_li "Short ID" base_find.short_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 %}
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index bc2169009..ebe9ae551 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -404,6 +404,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
         return _(u"OPE")
 
     @property
+    def external_id(self):
+        return self.code_patriarche
+
+    @property
     def short_label(self):
         if settings.COUNTRY == 'fr':
             return self.reference
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index d3eb980c4..3e89c3c39 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -20,10 +20,11 @@
 <p class='window-refs'>{% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} &ndash; OA{{item.code_patriarche}}{% endif %}
 </p>
 <p class='window-refs'>{{item.common_name|default:''}}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 <h3>{% trans "General"%}</h3>
 <ul class='form-flex'>
-{% field_li "Old code" item.old_code %}
+  {% field_li "Old code" item.old_code %}
   <li><label>{%trans "Creation:"%}</label>
     <span class='value'>
         {{item.history_creator.ishtaruser.person}}<br/>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 4a7b2f0b9..94be2fc04 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -6,9 +6,11 @@
 {% block content %}
 {% window_nav item window_id 'show-container' '' '' '' previous next 1 %}
 
+<p class="window-refs">{{ item.reference|default:"" }}</p>
+<p class="window-refs">{{ item.container_type|default:"" }}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
+
 <ul class='form-flex'>
-    {% field_li "Reference" item.reference %}
-    {% field_li "Container type" item.container_type %}
     {% field_li_detail "Responsible warehouse" item.responsible %}
     {% field_li_detail "Location (warehouse)" item.location %}
 </ul>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 9fd022281..410108a52 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -6,10 +6,13 @@
 {% block content %}
 {% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %}
 
+<p class="window-refs">{{ item.name|default:"" }}</p>
+<p class="window-refs">{{ item.warehouse_type|default:"" }}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
+
 <ul class='form-flex'>
-    {% field_li "Name" item.name %}
-    {% field_li "Warehouse type" item.warehouse_type %}
     {% field_li "Person in charge" item.person_in_charge %}
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
diff --git a/example_project/settings.py b/example_project/settings.py
index b19867662..efbf0297a 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -214,6 +214,7 @@ APP_NAME = "SRA - Pays de la Loire"
 SURFACE_UNIT = 'square-metre'
 SURFACE_UNIT_LABEL = u'm²'
 JOINT = u" | "
+ISHTAR_FILE_PREFIX = u""
 ISHTAR_OPE_PREFIX = u"OA"
 ISHTAR_DEF_OPE_PREFIX = u"OP"
 # string len of find indexes - i.e: find with index 42 will be 00042
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 2fd56f697..84ef710b2 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -1546,3 +1546,7 @@ table.table-form td input{
     display: block;
 }
 
+.external-id{
+    font-family: monospace;
+    font-size: 0.9em;
+}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
new file mode 100644
index 000000000..1312cbcd5
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
@@ -0,0 +1,19 @@
+{% load i18n link_to_window %}
+{% if item.history_creator.ishtaruser.person %}
+<li><label>{%trans "Creation:"%}</label>
+    <span class='value'>
+        {{item.history_creator.ishtaruser.person}}
+        {{item.history_creator.ishtaruser.person|link_to_window}} <br/>
+        <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
+    </span>
+</li>
+{% endif %}
+{% if item.history_creation_date != item.last_edition_date %}
+<li><label>{%trans "Modification:"%}</label>
+    <span class='value'>
+        {{item.history_modifier.ishtaruser.person}}
+        {{item.history_modifier.ishtaruser.person|link_to_window}} <br/>
+        <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
+    </span>
+</li>
+{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_external_id.html b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html
new file mode 100644
index 000000000..95628ab15
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html
@@ -0,0 +1,7 @@
+{% load i18n %}{% if item.external_id %}
+<p class='window-refs external-id'>
+    <small title="{% trans 'Internal ID' %}">
+        <i class="fa fa-key" aria-hidden="true"></i>
+        {{item.external_id|default:''}}
+    </small>
+</p>{% endif %}
diff --git a/version.py b/version.py
index faeadf711..4d6a65db2 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 15)
+VERSION = (0, 99, 15, 1)
 
 
 def get_version():