From 399b48288a2eda31dce54b64f2baf7494a675f37 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Thu, 29 Jan 2015 02:14:03 +0100
Subject: Add new fields to context record, find sheets.

---
 archaeological_context_records/data_importer.py    |  2 +-
 archaeological_context_records/models.py           |  4 ++--
 .../templates/ishtar/sheet_contextrecord.html      | 27 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

(limited to 'archaeological_context_records')

diff --git a/archaeological_context_records/data_importer.py b/archaeological_context_records/data_importer.py
index 0d04678c5..0bf6f83a1 100644
--- a/archaeological_context_records/data_importer.py
+++ b/archaeological_context_records/data_importer.py
@@ -35,7 +35,7 @@ class ContextRecordsImporterBibracte(Importer):
         ImportFormater('operation__operation_code', IntegerFormater(),
                    duplicate_fields=['parcel__operation__operation_code'],),
         # ID UE
-        ImportFormater('external_id', UnicodeFormater(120),),
+        ImportFormater('external_id', UnicodeFormater(120), duplicate_fields=['label'],),
         # Type
         ImportFormater('unit', TypeFormater(models.Unit), required=False),
         # description
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 6a08e2f84..81d395ced 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -284,9 +284,9 @@ class RelationType(GeneralType):
 
 class RecordRelations(models.Model):
     left_record = models.ForeignKey(ContextRecord,
-                                    related_name='left_relations')
+                                    related_name='right_relations')
     right_record = models.ForeignKey(ContextRecord,
-                                     related_name='right_relations')
+                                     related_name='left_relations')
     relation_type = models.ForeignKey(RelationType)
 
     class Meta:
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 308c20289..1a18f1cd5 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -64,6 +64,33 @@
 {% if item.tpq_estimated %}<p><label>{% trans "TPQ estimated:" %}</label> <span class='value'>{{ item.tpq_estimated }}</span></p>{%endif%}
 {%endif%}
 
+{% if item.right_relations.count %}
+<h3>{% trans "In relation with"%}</h3>
+<table>
+  <tr>
+    <th>{% trans "Relation type" %}</th>
+    <th>{% trans "ID" %}</th>
+    <th>{% trans "Type" %}</th>
+    <th>{% trans "Chronology" %}</th>
+    <th>{% trans "Description" %}</th>
+    <th>{% trans "Parcel" %}</th>
+    <th class='link'>&nbsp;</th>
+  </tr>
+  {% for relation in item.right_relations.all %}
+  <tr>
+    <td class='string'>{{ relation.relation_type }}</td>
+    <td class='string'>{{ relation.right_record.label }}</td>
+    <td class='string'>{{relation.right_record.unit|default:""}}</td>
+    <td class='string'>{{ relation.right_record.datings.all|join:", " }}</td>{# periods ?#}
+    <td class='string'>{{ relation.right_record.description }}</td>
+    <td class='string'>{{ relation.right_record.parcel.section }} - {{relation.right_record.parcel.parcel_number}}</td>
+    <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-contextrecord relation.right_record.pk ''%}")'>{% trans "Details" %}</a></td>
+  </tr>
+  {% endfor %}
+<table>
+
+{% endif %}
+
 {% if item.operation %}
 <h3>{% trans "Operation resume"%}</h3>
 <p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.operation.year }}</span></p>
-- 
cgit v1.2.3