3 files changed, 139 insertions, 115 deletions
diff --git a/ishtar/templates/sheet_context_proto.html b/ishtar/templates/sheet_context_proto.html
deleted file mode 100644
index 365a766b5..000000000
--- a/ishtar/templates/sheet_context_proto.html
+++ /dev/null
@@ -1,115 +0,0 @@
-{% extends "sheet.html" %}
-{% load i18n %}
-{% block content %}
-<div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.operation.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.operation.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-
-<h3>{% trans "Context Unit"%}</h3>
-
-{% if item.operation.patriarche_code %}<p><label>{%trans "Complete_label:"%}</label> <span class='value'>{{ item.operation.complete_label }}</span></p>{%endif%}<!-- Displayed as Patriarche_code/Context_unit_label -->
-{% if item.operation.patriarche_code_not_recorded %}<p><label>{%trans "Patriarche OA code not yet recorded !"%}</label></p>
-<p><label>{%trans "Temporary_label:"%}</label> <span class='value'>{{ item.operation.temporary_label }}<!-- Displayed as Ope_year/Ope_number/Context_unit_label -->
-{%endif%}
-<p><label>{% trans "Type:" %}</label> <span class='value'>{{ item.unit_type }}</span></p>
-<p><label>{% trans "Chronology:" %}</label> <span class='value'>{{ item.period.all|join:", " }}</span></p>
-<p><label>{% trans "Place:" %}</label> <span class='value'>{{ item.place }}</span></p>    
-<p><label>{% trans "Parcel:" %}</label> <span class='value'>{{ item.section_and_parcel }}</span></p>
-
-<h3>{% trans "Description"%}</h3>
-
-<p><label>{% trans "Description:" %}</label> <span class='value'>{{ item.description }}</span></p> 
-{% if item.lenght %}<p><label>{% trans "Length (cm):" %}</label> <span class='value'>{{ item.length }}</span></p>{%endif%}
-{% if item.width %}<p><label>{% trans "Width (cm):" %}</label> <span class='value'>{{ item.width }}</span></p>{%endif%}
-{% if item.depth %}<p><label>{% trans "Depth (cm):" %}</label> <span class='value'>{{ item.depth }}</span></p>{%endif%}
-
-<h3>{% trans "Interpretation"%}</h3>
-
-{% if item.activity %}<p><label>{% trans "Activity:" %}</label> <span class='value'>{{ item.activity }}</span></p>{%endif%}
-{% if item.identification %}<p><label>{% trans "Identification:" %}</label> <span class='value'>{{ item.identification }}</span></p>{%endif%}
-{% if item.interpretation %}<p><label>{% trans "Interpretation:" %}</label> <span class='value'>{{ item.interpretation }}</span></p>{%endif%}
-
-{% if item.TAQ or item.TAQ_estimated or item.TPQ or item.TPQ_estimated %}
-<h3>{% trans "Datations"%}</h3>
-{% if item.TAQ %}<p><label>{% trans "TAQ:" %}</label> <span class='value'>{{ item.TAQ }}</span></p>{%endif%}
-{% if item.TAQ_estimated %}<p><label>{% trans "TAQ estimated:" %}</label> <span class='value'>{{ item.TAQ_estimated }}</span></p>{%endif%}
-{% if item.TPQ %}<p><label>{% trans "TPQ:" %}</label> <span class='value'>{{ item.TPQ }}</span></p>{%endif%}
-{% if item.TPQ_estimated %}<p><label>{% trans "TPQ estimated:" %}</label> <span class='value'>{{ item.TPQ_estimated }}</span></p>{%endif%}
-{%endif%}
-    
-{% if item.related_operation %}<!-- If an Operation is linked to that context then a resume is displayed -->
-<h3>{% trans "Operation resume"%}</h3>
-<p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.operation.year }}</span></p>
-<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.operation.numeric_reference }}</span></p>
-{% if item.operation.patriarche_code %}<p><label>{%trans "Patriarche OA code:"%}</label> <span class='value'>{{ item.operation.patriarche_code }}</span></p>{%endif%}
-{% if item.operation.patriarche_code_not_recorded %}<p><label>{%trans "Patriarche OA code not yet recorded !"%}</label></p>{%endif%}
-<p><label>{%trans "Operation's name:"%}</label> <span class='value'>{{ item.operation.internal_reference }}</span></p>
-<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.operation.head_scientist.full_label }}</span></p>
-<p><label>{%trans "State:"%}</label> <span class='value'>{% if item.operation.is_active %}{%trans "Active file"%}</span></p>
-{% else %}{%trans "Closed operation"%}</span></p>
-<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.operation.closing.date }} <strong>{%trans "by" %}</strong> {{ item.operation.closing.user }}</span></p>
-{% endif %}
-<p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.operation.operation_type }}</span></p>
-<p><label>{%trans "Remains:"%}</label> <span class='value'>{{ item.operation.remains.all|join:", " }}</span></p>
-<p><label>{%trans "Periods:"%}</label> <span class='value'>{{ item.operation.periods.all|join:", " }}</span></p>
-{% if item.operation.comment %}<p><label>{%trans "Comment:"%}</label> <span class='value'>{{ item.operation.comment }}</span></p>{%endif%}
-<h3>{% trans "Localisation"%}</h3>
-<p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.operation.towns.all|join:", " }}</span></p>
-<p><label>{%trans "Related operation:"%}</label> <span class='value'><a href='{% url show-operation item.related_operation.pk ''%}'>{{ item.related_operation }}</a></span></p><!-- Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related operation -->
-{% else %}<p><label>{%trans "No operation linked to this context unit !"%}</label></p>
-{% endif %}
-
-<h3>{% trans "Documentation"%}</h3>
-<table>
-  <caption>{%trans "Documents"%}</caption>
-  <tr>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Type" %}</th>
-    <th>{% trans "Authors" %}</th>
-    <th>{% trans "Localisation" %}</th>
-  </tr>
-  {% for doc in item.operation.doc.all %}
-  <tr>
-    <td>{{ doc.title }}</td>
-    <td class='string'>{{doc.type}}</td>
-    <td>{{ doc.author.all|join:", " }}</td>
-    <td>{{ doc.localisation }}</td>
-  </tr>
-  {% empty %}
-  <tr><td colspan="4" class='no_items'>{% trans "No document associated to this context unit" %}</td></tr>
-  {% endfor %}
-</table>
-
-<h3>{% trans "Finds"%}</h3><!-- The list of finds must be listed here -->
-<table>
-  <caption>{%trans "Finds"%}</caption>
-  <tr>
-    <th>{% trans "Find_complete_Label" %}</th>
-    <th>{% trans "Find_complete_material_type_Label" %}</th>
-    <th>{% trans "Context_record" %}</th> 
-    <th>{% trans "Periods" %}</th>
-    <th>{% trans "Description" %}</th>
-    <th>{% trans "Weight" %}</th>
-    <th>{% trans "Numbers" %}</th>
-    <th>{% trans "Parcel" %}</th>
-    <th class='link'>&nbsp;</th>
-  </tr>
-  {% for find in item.find.all %}
-  <tr>
-    {% if item.operation.patriarche_code %}<th>{% trans "item.find.complete_label" %}</th><!-- Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). -->{%endif%}
-    {% if item.operation.patriarche_code_not_recorded %}<th>{% trans "item.find.not_patriarche_complete_label" %}</th><!-- Displayed as (Year)-(index)-(Record unit label)-(Finds label). -->{%endif%}
-    {% if item.operation.patriarche_code %}<th>{% trans "item.find.material_type_complete_label" %}</th><!-- Displayed as (Patriarche operation code)-(Record unit label)-(material code)-(Finds label indexed by material type). -->{%endif%}
-    {% if item.operation.patriarche_code_not_recorded %}<th>{% trans "item.find.material_type_not_patriarche_complete_label" %}</th><!-- Displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type). -->{%endif%}
-
-    <td class='string'>{{item.find.context_record}}</td>
-    <td>{{ item.find.period.all|join:", " }}</td>
-    <td>{{ item.find.description }}</td>
-    <td>{{ item.find.weight }}</td>
-    <td>{{ item.find.numbers }}</td>
-    <td>{{ item.find.record_unit.section_and_parcel }}</td><!-- Displayed as (Section)-(parcel number). A record unit can be linked to only one parcel. -->
-    <td class='link'><a href="#{#{%url show-find item.find.pk%}#}">{% trans "Details" %}</a></td>
-  </tr>
-  {% empty %}
-  <tr><td colspan="9" class='no_items'>{% trans "No find associated to this operation" %}</td></tr>
-  {% endfor %}
-</table>
-
-{% endblock %}
diff --git a/ishtar/templates/sheet_contextrecord.html b/ishtar/templates/sheet_contextrecord.html
new file mode 100644
index 000000000..0f7259f3a
--- /dev/null
+++ b/ishtar/templates/sheet_contextrecord.html
@@ -0,0 +1,136 @@
+{% extends "sheet.html" %}
+{% load i18n %}
+{% block content %}
+<div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
+
+<h3>{% trans "Context Record"%}</h3>
+
+{% if item.parcel.operation.code_patriarche %}
+<p><label>{%trans "Complete label:"%}</label>
+{% else %}
+<p class='alert'><label>{%trans "Patriarche OA code not yet recorded!"%}</label></p>
+<p><label>{%trans "Temporary label:"%}</label>
+{%endif%}
+<span class='value'>{{item.full_label}}</span></p>
+{%if item.unit %}
+<p><label>{% trans "Type:" %}</label> <span class='value'>{{ item.unit }}</span></p>
+{%endif%}
+<p><label>{% trans "Chronology:" %}</label> <span class='value'>{{ item.datings.all|join:", " }}</span></p>
+<p><label>{% trans "Place:" %}</label> <span class='value'>{{ item.parcel.town }}</span></p>
+<p><label>{% trans "Parcel:" %}</label> <span class='value'>{{ item.parcel.short_label }}</span></p>
+
+{% if item.description or item.lenght or item.width or item.depth %}
+<h3>{% trans "Description"%}</h3>
+
+<p><label>{% trans "Description:" %}</label> <span class='value'>{{ item.description }}</span></p> 
+{% if item.lenght %}<p><label>{% trans "Length (cm):" %}</label> <span class='value'>{{ item.length }}</span></p>{%endif%}
+{% if item.width %}<p><label>{% trans "Width (cm):" %}</label> <span class='value'>{{ item.width }}</span></p>{%endif%}
+{% if item.depth %}<p><label>{% trans "Depth (cm):" %}</label> <span class='value'>{{ item.depth }}</span></p>{%endif%}
+{% endif %}
+
+{% if item.activity or item.identification or item.interpretation %}
+<h3>{% trans "Interpretation"%}</h3>
+
+{% if item.activity %}<p><label>{% trans "Activity:" %}</label> <span class='value'>{{ item.activity }}</span></p>{%endif%}
+{% if item.identification %}<p><label>{% trans "Identification:" %}</label> <span class='value'>{{ item.identification }}</span></p>{%endif%}
+{% if item.interpretation %}<p><label>{% trans "Interpretation:" %}</label> <span class='value'>{{ item.interpretation }}</span></p>{%endif%}
+{% endif %}
+
+{% if item.taq or item.taq_estimated or item.tpq or item.tpq_estimated %}
+<h3>{% trans "Datations"%}</h3>
+{% if item.taq %}<p><label>{% trans "TAQ:" %}</label> <span class='value'>{{ item.taq }}</span></p>{%endif%}
+{% if item.taq_estimated %}<p><label>{% trans "TAQ estimated:" %}</label> <span class='value'>{{ item.taq_estimated }}</span></p>{%endif%}
+{% if item.tpq %}<p><label>{% trans "TPQ:" %}</label> <span class='value'>{{ item.tpq }}</span></p>{%endif%}
+{% if item.tpq_estimated %}<p><label>{% trans "TPQ estimated:" %}</label> <span class='value'>{{ item.tpq_estimated }}</span></p>{%endif%}
+{%endif%}
+
+{% if item.parcel.operation %}
+<h3>{% trans "Operation resume"%}</h3>
+<p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.parcel.operation.year }}</span></p>
+<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.parcel.operation.numeric_reference }}</span></p>
+{% if item.parcel.operation.code_patriarche %}
+<p><label>{%trans "Patriarche OA code:"%}</label>
+<span class='value'>{{ item.parcel.operation.code_patriarche }}</span></p>
+{% else %}<p class='alert'><label>{%trans "Patriarche OA code not yet recorded!"%}</label></p>
+{%endif%}
+<p><label>{%trans "Operation's name:"%}</label>
+<span class='value'>{{ item.parcel.operation.internal_reference }}</span></p>
+<p><label>{%trans "Head scientist:"%}</label>
+<span class='value'>{{ item.parcel.operation.in_charge.full_label }}</span></p>
+<p><label>{%trans "State:"%}</label>
+{% if item.parcel.operation.is_active %}
+<span class='value'>{%trans "Active file"%}</span></p>
+{% else %}
+<span class='value'>{%trans "Closed operation"%}</span></p>
+<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.parcel.operation.closing.date }}
+<strong>{%trans "by" %}</strong> {{ item.parcel.operation.closing.user }}</span></p>
+{% endif %}
+<p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.parcel.operation.operation_type }}</span></p>
+<p><label>{%trans "Remains:"%}</label> <span class='value'>{{ item.parcel.operation.remains.all|join:", " }}</span></p>
+<p><label>{%trans "Periods:"%}</label> <span class='value'>{{ item.parcel.operation.periods.all|join:", " }}</span></p>
+{% if item.parcel.operation.comment %}<p><label>{%trans "Comment:"%}</label> <span class='value'>{{ item.parcel.operation.comment }}</span></p>{%endif%}
+<h3>{% trans "Localisation"%}</h3>
+<p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.parcel.operation.towns.all|join:", " }}</span></p>
+<p><label>{%trans "Related operation:"%}</label>
+<span class='value'><a href="#" onclick='load_window("{% url show-operation item.parcel.operation.pk ''%}");'>{{ item.parcel.operation }}</a></span></p>
+{# TODO: Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related operation #}
+{% else %}<p class='alert'><label>{%trans "No operation linked to this context unit!"%}</label></p>
+{% endif %}
+
+<table>
+  <caption>{%trans "Documents"%}</caption>
+  <tr>
+    <th>{% trans "Title" %}</th>
+    <th>{% trans "Type" %}</th>
+    <th>{% trans "Authors" %}</th>
+    <th>{% trans "Localisation" %}</th>
+  </tr>
+  {% for doc in item.parcel.operation.documents.all %}
+  <tr>
+    <td>{{ doc.title }}</td>
+    <td class='string'>{{doc.type}}</td>
+    <td>{{ doc.author.all|join:", " }}</td>
+    <td>{{ doc.localisation }}</td>
+  </tr>
+  {% empty %}
+  <tr><td colspan="4" class='no_items'>{% trans "No document associated to this context record" %}</td></tr>
+  {% endfor %}
+</table>
+
+<table>
+  <caption>{%trans "Finds"%}</caption>
+  <tr>
+    <th>{% trans "Find" %}</th>
+    <th>{% trans "Material type" %}</th>
+    <th>{% trans "Context record" %}</th> 
+    <th>{% trans "Periods" %}</th>
+    <th>{% trans "Description" %}</th>
+    <th>{% trans "Weight" %}</th>
+    <th>{% trans "Numbers" %}</th>
+    <th>{% trans "Parcel" %}</th>
+    <th class='link'>&nbsp;</th>
+  </tr>
+  {% for find in item.base_items.all %}
+  <tr>
+    <td>{{ find.full_label }}</td>
+{# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #}
+{# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #}
+    <td>{{ find.get_last_item.material_type_label }}</td>
+{# Displayed as (Patriarche operation code)-(Record unit label)-(material code)-(Finds label indexed by material type). #}
+{# or displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type) #}
+
+    <td class='string'>{{find.context_record.short_label}}</td>
+    <td>{{ find.get_last_item.dating}}</td>{# TODO .all|join:", " ? #}
+    <td>{{ find.get_last_item.description }}</td>
+    <td>{{ find.get_last_item.weight }}</td>
+    <td>{{ find.get_last_item.item_number }}</td>
+    <td>{{ item.context_record.parcel.short_label }}</td>
+    <td class='link'><a href="#">{% trans "Details" %}</a></td>
+    {#<a href="#" onclick='load_window("{% url show-find find.pk%}");'>{%trans "Details"%}</a></td>#}
+  </tr>
+  {% empty %}
+  <tr><td colspan="9" class='no_items'>{% trans "No find associated to this operation" %}</td></tr>
+  {% endfor %}
+</table>
+
+{% endblock %}
diff --git a/ishtar/templates/sheet_contextrecord_window.html b/ishtar/templates/sheet_contextrecord_window.html
new file mode 100644
index 000000000..7ff65d1e7
--- /dev/null
+++ b/ishtar/templates/sheet_contextrecord_window.html
@@ -0,0 +1,3 @@
+{% extends "sheet_contextrecord.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}