diff options
Diffstat (limited to 'archaeological_finds/templates')
13 files changed, 247 insertions, 7 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 00470906d..05a796a9f 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -44,11 +44,9 @@ {% field_li "Width (cm)" item.width %} {% field_li "Height (cm)" item.height %} {% field_li "Diameter (cm)" item.diameter %} +{% field_li "Thickness (cm)" item.thickness %} {% field_li "Volume (l)" item.volume %} - -{% if item.weight %}{% with item.weight|add:' '|add:item.weight_unit as weight %} -{% field_li "Weight" weight %} -{% endwith %}{% endif %} +{% field_li "Weight" item.weight_string %} {% if item.dimensions_comment %} </ul> {% field "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %} @@ -56,6 +54,8 @@ {% endif %} {% field_li "Find number" item.find_number %} +{% field_li "Minimum number of individuals (MNI)" item.min_number_of_individuals %} +{% field_li "Point of topographic reference" item.topographic_reference_point %} {% field_li "Conservatory state" item.conservatory_state %} {% if item.conservatory_comment %} </ul> @@ -73,9 +73,16 @@ {% if item.history_object and item.history_object.CHECK_DICT %} {% field_li "Checked" item.checked|from_dict:item.history_object.CHECK_DICT %} {% endif%} -{% field_li "Container" item.container %} </ul> +{% if item.container %} +<h3>{% trans "Warehouse"%}</h3> +{% field_detail "Container" item.container %} +{% field_detail "Responsible warehouse" item.container.responsible %} +{% field_detail "Location (warehouse)" item.container.location %} +{% field "Precise localisation" item.container.divisions_lbl %} +{% endif %} + {% if item.upstream_treatment or item.downstream_treatment %} <h3>{% trans "Treatments"%}</h3> @@ -85,6 +92,9 @@ <div class='clean-table-wrap'> <table id='{{window_id}}-upstream'> <tr> + <th> </th> + <th>{% trans "Year - index" %}</th> + <th>{% trans "Label" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> <th>{% trans "Doer" %}</th> @@ -94,7 +104,15 @@ </tr> {% for items, treatment in item.upstream_treatments %} <tr> - <td class='string'>{{ treatment.treatment_type }}</td> + <td> + <a class="display_details" href="#" + onclick="load_window('{% url 'show-treatment' treatment.id %}/');"> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a> + </td> + <td class='string'>{{ treatment.year }} - {{treatment.index}}</td> + <td class='string'>{{ treatment.label }}</td> + <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"-" }}</td> <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> @@ -114,6 +132,9 @@ <div class='clean-table-wrap'> <table id='{{window_id}}-downstream'> <tr> + <th> </th> + <th>{% trans "Year - index" %}</th> + <th>{% trans "Label" %}</th> <th>{% trans "Type" %}</th> <th>{% trans "Related finds" %}</th> <th>{% trans "Doer" %}</th> @@ -123,7 +144,15 @@ </tr> {% for items, treatment in item.downstream_treatments %} <tr> - <td class='string'>{{ treatment.treatment_type }}</td> + <td> + <a class="display_details" href="#" + onclick="load_window('{% url 'show-treatment' treatment.id %}/');"> + <i class="fa fa-info-circle" aria-hidden="true"></i> + </a> + </td> + <td class='string'>{{ treatment.year }} - {{treatment.index}}</td> + <td class='string'>{{ treatment.label }}</td> + <td class='string'>{{ treatment.treatment_types_lbl }}</td> <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"" }}</td> <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> diff --git a/archaeological_finds/templates/ishtar/sheet_treatment.html b/archaeological_finds/templates/ishtar/sheet_treatment.html new file mode 100644 index 000000000..9ec9db754 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatment.html @@ -0,0 +1,53 @@ +{% extends "ishtar/sheet.html" %} +{% load i18n window_field from_dict link_to_window window_tables window_header humanize %} +{% load url from future %} + +{% block head_title %}{% trans "Treatment" %}{% endblock %} +{% block content %} +{% window_nav item window_id 'show-treatment' 'treatment_modify' %} + +{% if item.image %} +<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a> +{% endif%} + +<p class="window-refs">{{ item.label|default:"" }}</p> +{% if item.other_reference %} +<p class="window-refs">{{ item.other_reference }}</p>{% endif %} +<p class="window-refs">{{ item.year }} - {{ item.index }}</p> +{% if item.external_id %} +<p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" context "Treatment" %} ({{item.end_date}})</p> +{% else %} +<p class="window-refs">{% trans "Active" context "Treatment" %}</p> +{% endif %} + +<ul class='form-flex'> + {% field_li_multiple "Treatment type" item.treatment_types %} + {% field_li "State" item.treatment_state %} + {% field_li_detail "Associated request" item.file %} + {% field_li "Location" item.location %} + {% field_li "Container" item.container %} + {% field_li "Responsible" item.person %} + {% field_li "Organization" item.organization %} + {% field_li "Start date" item.start_date %} + {% field_li "Closing date" item.end_date %} +</ul> +{% if item.description or item.comment or item.goal %} +{% field "Comment" item.comment "<pre>" "</pre>" %} +{% field "Description" item.description "<pre>" "</pre>" %} +{% field "Goal" item.goal "<pre>" "</pre>" %} +{% endif %} + +{% trans "Upstream finds" as finds %} +{% if item.upstream.count %} +{% dynamic_table_document finds 'finds_for_treatment' 'downstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %} +{% endif %} + +{% trans "Downstream finds" as finds %} +{% if item.downstream.count %} +{% dynamic_table_document finds 'finds_for_treatment' 'upstream_treatment' item.pk 'TABLE_COLS_FOR_OPE' output %} +{% endif %} + + +{% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatment_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatment_pdf.html new file mode 100644 index 000000000..08df52e97 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatment_pdf.html @@ -0,0 +1,18 @@ +{% extends "ishtar/sheet_treatment.html" %} +{% block header %} +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> +{% endblock %} +{% block main_head %} +{{ block.super }} +<div id="pdfheader"> + Ishtar – {{APP_NAME}} – {{item}} +</div> +{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +<div id="pdffooter"> + – <pdf:pagenumber/> – +</div> +</body> +</html> +{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatment_window.html b/archaeological_finds/templates/ishtar/sheet_treatment_window.html new file mode 100644 index 000000000..fb0757d10 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatment_window.html @@ -0,0 +1,3 @@ +{% extends "ishtar/sheet_treatment.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html new file mode 100644 index 000000000..097f5defd --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile.html @@ -0,0 +1,50 @@ +{% extends "ishtar/sheet.html" %} +{% load i18n window_field from_dict link_to_window window_tables window_header humanize %} +{% load url from future %} + +{% block head_title %}{% trans "Treatment request" %}{% endblock %} +{% block content %} +{% window_nav item window_id 'show-treatmentfile' 'treatmentfile_modify' %} + +<p class="window-refs">{{ item.name|default:"" }}</p> +{% if item.internal_reference %} +<p class="window-refs">{{ item.internal_reference }}</p>{% endif %} +<p class="window-refs">{{ item.year }} - {{ item.index }}</p> +{% if item.external_id %} +<p class="window-refs">{{ item.external_id }}</p>{% endif %} +{% if item.end_date %} +<p class="window-refs">{% trans "Closed" context "Treatment request" %} ({{item.end_date}})</p> +{% else %} +<p class="window-refs">{% trans "Active" context "Treatment request" %}</p> +{% endif %} + +<ul class='form-flex'> + {% field_li "Type" item.type %} + {% field_li_detail "Responsible" item.in_charge %} + {% field_li "Creation date" item.creation_date %} + {% field_li "Reception date" item.reception_date %} + {% field_li "Closing date" item.end_date %} +</ul> +{% field "Comment" item.comment "<pre>" "</pre>" %} + +{% if item.applicant %} +<h3>{% trans "Applicant" %}</h3> +<ul class='form-flex'> + {% field_li_detail "Name" item.applicant %} +</ul> +{% field "Contact" item.applicant.address_lbl %} +{% endif %} +{% if item.applicant_organisation %} +<h3>{% trans "Applicant organisation" %}</h3> +<ul class='form-flex'> + {% field_li_detail "Name" item.applicant_organisation %} +</ul> +{% field "Contact" item.applicant.address_lbl %} +{% endif %} + +{% trans "Treatments" as treatments %} +{% if item.treatments.count %} +{% dynamic_table_document treatments 'treatments' 'file' item.pk '' output '' 'treatment' %} +{% endif %} + +{% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile_pdf.html new file mode 100644 index 000000000..be64ff7eb --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile_pdf.html @@ -0,0 +1,18 @@ +{% extends "ishtar/sheet_treatmentfile.html" %} +{% block header %} +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> +{% endblock %} +{% block main_head %} +{{ block.super }} +<div id="pdfheader"> + Ishtar – {{APP_NAME}} – {{item}} +</div> +{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +<div id="pdffooter"> + – <pdf:pagenumber/> – +</div> +</body> +</html> +{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfile_window.html b/archaeological_finds/templates/ishtar/sheet_treatmentfile_window.html new file mode 100644 index 000000000..ac692c304 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfile_window.html @@ -0,0 +1,3 @@ +{% extends "ishtar/sheet_treatmentfile.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html new file mode 100644 index 000000000..e558296a8 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html @@ -0,0 +1,12 @@ +{% extends "ishtar/sheet_source.html" %} +{% load i18n window_field window_header link_to_window %} + +{% block head_title %}{% trans "Treatment request source" %}{% endblock %} + +{% block window_nav %} +{% window_nav item window_id 'show-treatmentfilesource' 'treatmentfile_source_modify' %} +{% endblock %} + +{% block related %} +{% field "Related treatment request" item.owner '' item.owner|link_to_window %} +{% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html new file mode 100644 index 000000000..d0a0ec8e7 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html @@ -0,0 +1,18 @@ +{% extends "ishtar/sheet_treatmentfilesource.html" %} +{% block header %} +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> +{% endblock %} +{% block main_head %} +{{ block.super }} +<div id="pdfheader"> +Ishtar – {{APP_NAME}} – {{item}} +</div> +{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +<div id="pdffooter"> +– <pdf:pagenumber/> – +</div> +</body> +</html> +{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html new file mode 100644 index 000000000..4ebf9c02a --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html @@ -0,0 +1,3 @@ +{% extends "ishtar/sheet_treatmentfilesource.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html new file mode 100644 index 000000000..0825810ad --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html @@ -0,0 +1,12 @@ +{% extends "ishtar/sheet_source.html" %} +{% load i18n window_field window_header link_to_window %} + +{% block head_title %}{% trans "Treatment source" %}{% endblock %} + +{% block window_nav %} +{% window_nav item window_id 'show-treatmentsource' 'treatment_source_modify' %} +{% endblock %} + +{% block related %} +{% field "Related treatment" item.owner '' item.owner|link_to_window %} +{% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html new file mode 100644 index 000000000..c38764559 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html @@ -0,0 +1,18 @@ +{% extends "ishtar/sheet_treatmentsource.html" %} +{% block header %} +<link rel="stylesheet" href="{{STATIC_URL}}/media/style_basic.css?ver={{VERSION}}" /> +{% endblock %} +{% block main_head %} +{{ block.super }} +<div id="pdfheader"> +Ishtar – {{APP_NAME}} – {{item}} +</div> +{% endblock %} +{%block head_sheet%}{%endblock%} +{%block main_foot%} +<div id="pdffooter"> +– <pdf:pagenumber/> – +</div> +</body> +</html> +{%endblock%} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html new file mode 100644 index 000000000..2af5ff708 --- /dev/null +++ b/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html @@ -0,0 +1,3 @@ +{% extends "ishtar/sheet_treatmentsource.html" %} +{% block main_head %}{%endblock%} +{% block main_foot %}{%endblock%} |