From 83a5855c7bb49f0caca9b18d01579688b6490380 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 13 Mar 2017 13:54:25 +0100
Subject: Sheets: add ishtar ID (refs #3517)

---
 archaeological_files/models.py                     |  5 ++++
 .../templates/ishtar/sheet_file.html               | 27 ++++++----------------
 2 files changed, 12 insertions(+), 20 deletions(-)

(limited to 'archaeological_files')

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
@@ -235,6 +235,11 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
     def short_class_name(self):
         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'])
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 %}
-- 
cgit v1.2.3