From 29ca22925d3fbdfdc2c7a09b1d99cc36b0874369 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 14 Feb 2018 15:46:19 +0100 Subject: Archaeological site: simple sheet (refs #3913) --- .../templates/ishtar/sheet_site.html | 44 ++++++++++++++++++++++ .../templates/ishtar/sheet_site_pdf.html | 14 +++++++ .../templates/ishtar/sheet_site_window.html | 3 ++ archaeological_operations/urls.py | 4 ++ archaeological_operations/views.py | 9 ++++- 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 archaeological_operations/templates/ishtar/sheet_site.html create mode 100644 archaeological_operations/templates/ishtar/sheet_site_pdf.html create mode 100644 archaeological_operations/templates/ishtar/sheet_site_window.html diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html new file mode 100644 index 000000000..2f0ac9317 --- /dev/null +++ b/archaeological_operations/templates/ishtar/sheet_site.html @@ -0,0 +1,44 @@ +{% extends "ishtar/sheet.html" %} +{% load i18n window_tables window_header window_ope_tables window_field from_dict %} + +{% block head_title %}{{SITE_LABEL}} - {{item}}{% endblock %} + +{% block toolbar %} +{%comment%} +{% window_nav item window_id 'show-site' 'site_modify' 'show-historized-site' 'revert-site' previous next 1 %} +{%endcomment%} + +{% window_nav item window_id 'show-site' %} +{% endblock %} + +{% block content %} + +
+
+
+ {% include "ishtar/blocks/window_image.html" %} +
+
+
+ {{item.reference}} + {{item.name}} +
+
+ {% include "ishtar/blocks/sheet_external_id.html" %} +
+
+

+

+
+
+
+
+ +

{% trans "General"%}

+ +
+ {% include "ishtar/blocks/sheet_creation_section.html" %} + {% field_flex_multiple "Periods" item.periods %} + {% field_flex_multiple "Remains" item.remains %} +
+{% endblock %} \ No newline at end of file diff --git a/archaeological_operations/templates/ishtar/sheet_site_pdf.html b/archaeological_operations/templates/ishtar/sheet_site_pdf.html new file mode 100644 index 000000000..c180c27ed --- /dev/null +++ b/archaeological_operations/templates/ishtar/sheet_site_pdf.html @@ -0,0 +1,14 @@ +{% extends "ishtar/sheet_site.html" %} +{% block header %} +{% endblock %} +{% block main_head %} +{{ block.super }} +
+Ishtar – {{APP_NAME}} – {{item}} +
+{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} + + +{%endblock%} diff --git a/archaeological_operations/templates/ishtar/sheet_site_window.html b/archaeological_operations/templates/ishtar/sheet_site_window.html new file mode 100644 index 000000000..ed5a8027e --- /dev/null +++ b/archaeological_operations/templates/ishtar/sheet_site_window.html @@ -0,0 +1,3 @@ +{% extends "ishtar/sheet_site.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 00880e303..8075296e8 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -146,6 +146,7 @@ urlpatterns = [ kwargs={'full': True}), url(r'dashboard_operation/$', views.dashboard_operation, name='dashboard-operation'), + url(r'autocomplete-archaeologicalsite/$', views.autocomplete_archaeologicalsite, name='autocomplete-archaeologicalsite'), @@ -156,10 +157,13 @@ urlpatterns = [ views.get_site, name='get-site'), url(r'get-site-full/(?P.+)?$', views.get_site, name='get-site-full', kwargs={'full': True}), + url(r'show-site(?:/(?P.+))?/(?P.+)?$', + views.show_site, name=models.ArchaeologicalSite.SHOW_URL), url(r'site_search/(?P.+)?$', check_rights(['view_archaeologicalsite', 'view_own_archaeologicalsite'])( views.site_search_wizard), name='site_search'), + url(r'autocomplete-patriarche/$', views.autocomplete_patriarche, name='autocomplete-patriarche'), url(r'operation_administrativeact_document/$', diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index d20c14dfa..2cf4b8fb1 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -29,7 +29,7 @@ from ishtar_common.views import get_item, show_item, revert_item, new_item from ishtar_common.wizards import SearchWizard, check_rights_condition from ishtar_common.forms import ClosingDateFormSelection from ishtar_common.forms_common import AuthorFormset, SourceDeletionForm -from ishtar_common.models import get_current_profile +from ishtar_common.models import get_current_profile, IshtarSiteProfile from wizards import * from forms import * import models @@ -310,7 +310,14 @@ operation_deletion_wizard = OperationDeletionWizard.as_view( # archaeological sites +def site_extra_context(request, item): + return {'SITE_LABEL': IshtarSiteProfile.get_default_site_label()} + get_site = get_item(models.ArchaeologicalSite, 'get_site', 'site') +show_site = show_item( + models.ArchaeologicalSite, 'site', + extra_dct=site_extra_context +) site_search_wizard = SiteSearch.as_view( [('general-site_search', SiteFormSelection)], -- cgit v1.2.3