summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-12-29 19:17:06 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-12-29 19:17:06 +0100
commitb8d84f2e1014cd09d7820fbb0650d5d089fe3919 (patch)
tree4ded02e0b70766bc41cf11a377c2ffb7aeb328c6 /archaeological_finds
parent73b91b53f95859450f4be9a8a5035909eed213dc (diff)
downloadIshtar-b8d84f2e1014cd09d7820fbb0650d5d089fe3919.tar.bz2
Ishtar-b8d84f2e1014cd09d7820fbb0650d5d089fe3919.zip
Add sheets for context record source and find source
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/models.py3
-rw-r--r--archaeological_finds/templates/ishtar/sheet_findsource.html11
-rw-r--r--archaeological_finds/templates/ishtar/sheet_findsource_pdf.html18
-rw-r--r--archaeological_finds/templates/ishtar/sheet_findsource_window.html3
-rw-r--r--archaeological_finds/urls.py6
-rw-r--r--archaeological_finds/views.py2
6 files changed, 42 insertions, 1 deletions
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 32b4334ff..f677b1297 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -246,6 +246,7 @@ CHECK_CHOICES = (('NC', _(u"Not checked")),
class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
CHECK_DICT = dict(CHECK_CHOICES)
+ SHOW_URL = 'show-find'
TABLE_COLS = ['label', 'material_types', 'datings.period',
'base_finds.context_record.parcel.town',
'base_finds.context_record.operation.year',
@@ -533,6 +534,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
class FindSource(Source):
+ SHOW_URL = 'show-findsource'
+
class Meta:
verbose_name = _(u"Find documentation")
verbose_name_plural = _(u"Find documentations")
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource.html b/archaeological_finds/templates/ishtar/sheet_findsource.html
new file mode 100644
index 000000000..04db0336c
--- /dev/null
+++ b/archaeological_finds/templates/ishtar/sheet_findsource.html
@@ -0,0 +1,11 @@
+{% extends "ishtar/sheet_source.html" %}
+{% load i18n window_field link_to_window %}
+
+{% block head_sheet %}
+{{block.super}}
+<h1>{% trans "Find source"%}</h1>
+{% endblock %}
+
+{% block related %}
+{% field "Related find" item.owner '' item.owner|link_to_window %}
+{% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html b/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html
new file mode 100644
index 000000000..b7f8ec473
--- /dev/null
+++ b/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html
@@ -0,0 +1,18 @@
+{% extends "ishtar/sheet_findsource.html" %}
+{% block header %}
+<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css" />
+{% endblock %}
+{% block main_head %}
+{{ block.super }}
+<div id="pdfheader">
+Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
+</div>
+{% endblock %}
+{%block head_sheet%}{%endblock%}
+{%block main_foot%}
+<div id="pdffooter">
+&ndash; <pdf:pagenumber/> &ndash;
+</div>
+</body>
+</html>
+{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource_window.html b/archaeological_finds/templates/ishtar/sheet_findsource_window.html
new file mode 100644
index 000000000..b2a2974bf
--- /dev/null
+++ b/archaeological_finds/templates/ishtar/sheet_findsource_window.html
@@ -0,0 +1,3 @@
+{% extends "ishtar/sheet_findsource.html" %}
+{% block main_head %}{%endblock%}
+{% block main_foot %}{%endblock%}
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index 7a01f952b..e38520329 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/urls.py
@@ -22,6 +22,8 @@ from django.conf.urls.defaults import *
from ishtar_common.wizards import check_rights
import views
+from archaeological_finds import models
+
# be carreful: each check_rights must be relevant with ishtar_menu
# forms
@@ -76,8 +78,10 @@ urlpatterns += patterns(
name='get-find-full', kwargs={'full': True}),
url(r'get-findsource/(?P<type>.+)?$',
'get_findsource', name='get-findsource'),
+ url(r'show-findsource(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_findsource',
+ name=models.FindSource.SHOW_URL),
url(r'show-find(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_find',
- name='show-find'),
+ name=models.Find.SHOW_URL),
url(r'show-historized-find/(?P<pk>.+)?/(?P<date>.+)?$',
'show_find', name='show-historized-find'),
url(r'revert-find/(?P<pk>.+)/(?P<date>.+)$',
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 40c241cb1..16b47881e 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -64,6 +64,8 @@ get_find_for_ope = get_item(
extra_request_keys=find_extra_keys,
own_table_cols=models.Find.TABLE_COLS_FOR_OPE)
+show_findsource = show_item(models.FindSource, 'findsource')
+
get_findsource = get_item(
models.FindSource, 'get_findsource', 'findsource',
extra_request_keys={