diff options
5 files changed, 73 insertions, 1 deletions
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 %}<strong>{{SITE_LABEL}}</strong> - {{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 %} + +<div class="row"> + <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12"> + <div class="card"> + {% include "ishtar/blocks/window_image.html" %} + <div class="card-body"> + <div class="row"> + <div class="col main"> + {{item.reference}} + {{item.name}} + </div> + <div class="col text-muted"> + {% include "ishtar/blocks/sheet_external_id.html" %} + </div> + </div> + <p class="card-text"> + </p> + </div> + </div> + </div> +</div> + +<h3>{% trans "General"%}</h3> + +<div class="row"> + {% include "ishtar/blocks/sheet_creation_section.html" %} + {% field_flex_multiple "Periods" item.periods %} + {% field_flex_multiple "Remains" item.remains %} +</div> +{% 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 }} +<div id="pdfheader"> +Ishtar – {{APP_NAME}} – {{item}} +</div> +{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +</body> +</html> +{%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<type>.+)?$', views.get_site, name='get-site-full', kwargs={'full': True}), + url(r'show-site(?:/(?P<pk>.+))?/(?P<type>.+)?$', + views.show_site, name=models.ArchaeologicalSite.SHOW_URL), url(r'site_search/(?P<step>.+)?$', 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)], |