diff options
Diffstat (limited to 'archaeological_finds/templates/ishtar/sheet_find.html')
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 131 |
1 files changed, 70 insertions, 61 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 076c20c47..a3ecbdc67 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -48,7 +48,6 @@ {% trans "Identification / Description" %} </a> </li> - {% if display_warehouse_treatments %} <li class="nav-item"> <a class="nav-link" id="{{window_id}}-warehouse-tab" data-toggle="tab" href="#{{window_id}}-warehouse" role="tab" @@ -56,7 +55,6 @@ {% trans "Preservation / Treatments" %} </a> </li> - {% endif %} {% if display_documents %} <li class="nav-item"> <a class="nav-link" id="{{window_id}}-documents-tab" @@ -158,7 +156,7 @@ {% field_flex "Free ID" item.label %} {% field_flex "Previous ID" item.previous_id %} {% field_flex "Excavation ID" item.excavation_ids %} - {% field_flex "Museum inventory number" item.museum_id %} + {% field_flex "Museum ID" item.museum_id %} {% field_flex "Laboratory ID" item.laboratory_id %} {% field_flex "Seal number" item.seal_number %} {% trans "Administrative index" as admin_index_label %} @@ -176,17 +174,22 @@ {% field_flex_multiple_obj "Material types" item 'material_types' %} {% endif %}{% endwith %} {% field_flex "Material type quality" item.material_type_quality %} + {% field_flex_multiple_obj "Technical processes" item 'technical_processes' %} {% field_flex_full "Comment on the material" item.material_comment "<pre>" "</pre>" %} {% field_flex_multiple_obj "Object types" item 'object_types' %} {% field_flex "Object type quality" item.object_type_quality %} {% field_flex_multiple_obj "Functional areas" item 'functional_areas' %} + {% field_flex_multiple_obj "Technical areas" item 'technical_areas' %} {% field_flex "Number of remains" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} + {% field_flex "Inventory quantity" item.museum_inventory_quantity %} + {% field_flex "Observed quantity" item.museum_observed_quantity %} + {% field_flex_full "Comment on quantity" item.quantity_comment "<pre>" "</pre>" %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} {% field_flex_multiple_obj "Communicability" item 'communicabilities' %} - {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} + {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %} </div> {% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %} @@ -208,6 +211,37 @@ </div> {% endif %} + {% if item.has_museum_section %} + <h3>{% trans "Museum / legal status" %}</h3> + <div class='row'> + {% field_flex "Museum ID prefix" item.museum_id_prefix %} + {% field_flex "Museum inventory number" item.museum_id %} + {% field_flex "Museum ID suffix" item.museum_id_suffix %} + {% field_flex "Comment on museum ID" item.museum_id_comment %} + {% field_flex_detail "Owner institution" item.museum_owner_institution %} + {% field_flex_detail "Assigned institution" item.museum_assigned_institution %} + {% field_flex_detail "Custodian institution" item.museum_custodian_institution %} + {% field_flex "Depositor inventory number" item.museum_depositor_inventory_number %} + {% field_flex "Collections entry mode" item.museum_collection_entry_mode %} + {% field_flex "Comment on museum entry mode" item.museum_entry_mode_comment %} + {% trans "Museum entry date" as museum_entry_date_label %} + {% field_flex museum_entry_date_label item.museum_entry_date_label %} + {% field_flex "Comment on museum entry date" item.museum_entry_date_comment %} + {% field_flex "Name of donor, testator or vendor" item.museum_donor %} + {% field_flex_multiple_obj "Presence of inventory marking" item "museum_inventory_marking_presence" %} + {% field_flex_multiple_obj "Type of marking" item "museum_marking_type" %} + {% field_flex "Collection" item.museum_collection %} + {% field_flex_multiple_obj "Former collection" item "museum_former_collections" %} + {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} + {% field_flex "Conformity with inventory" item.museum_inventory_conformity %} + {% field_flex "Comment on conformity" item.museum_conformity_comment %} + {% field_flex "Inventory transcript" item.museum_inventory_transcript %} + {% field_flex "Original/reproduction" item.museum_original_repro %} + {% field_flex "Date of museum allocation" item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %} + {% field_flex "Purchase price" item.museum_purchase_price %} + </div> + {% endif %} + {% with dating_list=item|m2m_listing:"datings" %} {% if dating_list or item.dating_comment or item.cultural_attributions_count %} <h3>{% trans "Dating" %}</h3> @@ -216,38 +250,9 @@ {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %} </div> {% endif %} - <table id='{{window_id}}-datings' class="table table-striped"> - <tr> - <th>{% trans "Chronological period" %}</th> - <th>{% trans "Start date" %}</th> - <th>{% trans "End date" %}</th> - <th>{% trans "Dating type" %}</th> - <th>{% trans "Quality" %}</th> - <th>{% trans "Precise on dating" %}</th> - </tr> - {% for dating in dating_list %} - <tr> - <td> - {{dating.period}} - </td> - <td> - {{dating.start_date|default_if_none:"-"}} - </td> - <td> - {{dating.end_date|default_if_none:"-"}} - </td> - <td> - {{dating.dating_type|default_if_none:"-"}} - </td> - <td> - {{dating.quality|default_if_none:"-"}} - </td> - <td> - {{dating.precise_dating|default_if_none:"-"}} - </td> - </tr> - {% endfor %} - </table> + {% if dating_list %} + {% include "ishtar/blocks/sheet_dating_list.html" %} + {% endif %} <div class='row'> {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} </div> @@ -264,7 +269,6 @@ {% include "ishtar/blocks/sheet_creation_section.html" %} </div> </div> - {% if display_warehouse_treatments %} <div class="tab-pane fade" id="{{window_id}}-warehouse" role="tabpanel" aria-labelledby="{{window_id}}-warehouse-tab"> {% comment %} @@ -274,12 +278,12 @@ </div> {% endif %} {% endcomment %} - {% if item.integrities_count or item.remarkabilities_count or item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} + {% if item.integrities_count or item.remarkabilities_count or item.conservatory_states_count or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} <h3>{% trans "Preservation" %}</h3> <div class='row'> - {% field_flex_multiple_obj "Integrity / interest" item 'integrities' %} + {% field_flex_multiple_obj "Integrity" item 'integrities' %} {% field_flex_multiple_obj "Remarkability" item 'remarkabilities' %} - {% field_flex "Conservatory state" item.conservatory_state %} + {% field_flex_multiple_obj _("Conservatory states") item 'conservatory_states' %} {% field_flex_multiple_obj "Alteration" item 'alterations' %} {% field_flex_multiple_obj "Alteration cause" item 'alteration_causes' %} {% field_flex_multiple_obj "Recommended treatments" item 'preservation_to_considers' %} @@ -356,21 +360,19 @@ <dl class="col-12 flex-wrap"> <dt>{% trans "Index" %}</dt> <dd> - {{ item.container.location }} - {{ item.container.index }} + {{ item.container.location }} - {{ item.container.index|unlocalize }} </dd> </dl> </div> {% endif %} {% endif %} </div> - {% endif %} - - + {% else %} <div class="alert alert-info" role="alert"> <i class="fa fa-info-circle" aria-hidden="true"></i> {% trans "Container information not available." %} </div> - + {% endif %} {% endif %} {% if item.upstream_treatment or item.downstream_treatment or non_modif_treatments_count %} @@ -380,14 +382,12 @@ <tr> <th> </th> <th>{% trans "Year - index" %}</th> - <th>{% trans "Label" %}</th> - <th>{% trans "Type" %}</th> + <th>{% trans "Label/type" %}</th> <th>{% trans "State" %}</th> <th>{% trans "Related finds (max. 15 displayed)" %}</th> <th>{% trans "Doer" %}</th> - <th>{% trans "Container" %}</th> - <th>{% trans "Start date" %}</th> - <th>{% trans "End date" %}</th> + {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %} + <th>{% trans "Date start/end" %}</th> </tr> {# {% for treatment in item.treatments.all %} #} {% for items, treatment in item.non_modif_treatments %} @@ -398,17 +398,27 @@ <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|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.treatment_types_lbl }}</td> + <td class='string'>{{ treatment.year|unlocalize }}-{{treatment.index|unlocalize}}</td> + <td class='string'>{% if treatment.label %}{{ treatment.label}} ({{treatment.treatment_types_lbl}}){% else %}{{treatment.treatment_types_lbl}}{% endif %}</td> <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for it in items %}<span>{{it}} {{it|link_to_window:request}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td> + {% if can_view_container %}<td class='string'>{% for find_treatment in treatment.get_find_treatment_list %}{% if find_treatment.find.pk == item.pk %}{{ find_treatment.full_location|default_if_none:"-" }}{% if find_treatment.location_type_label %} <span class="badge badge-secondary">{{find_treatment.location_type_label}}</span>{% endif %}{% endif %}{% endfor %}</td>{% endif %} + <td class='string'>{{ treatment.start_date|default_if_none:"-" }}{% if treatment.end_date %}/{{ treatment.end_date|default_if_none:"-" }}{% endif %}</td> </tr> {% endfor %} + {% if can_view_container and item.container_fisrt_full_location %} + <tr> + <td class="string" colspan="6">{% trans "First packaging" %}</td> + <td class="string" colspan="2">{{ item.container_fisrt_full_location }} <span class="badge badge-secondary">{% if item.container_fisrt_full_location == item.container_ref_fisrt_full_location %}{% trans "Reference/current" %}{% else %}{% trans "Current" %}{% endif %}</span></td> + </tr> + {% endif %} + {% if can_view_container and item.container_ref_fisrt_full_location and item.container_ref_fisrt_full_location != item.container_fisrt_full_location %} + <tr> + <td class="string" colspan="6">{% trans "First packaging" %}</td> + <td class="string" colspan="2">{{ item.container_ref_fisrt_full_location }} <span class="badge badge-secondary">{% trans "Reference" %}</span></td> + </tr> + {% endif %} </table> {% endif %} @@ -423,7 +433,7 @@ <th>{% trans "State" %}</th> <th>{% trans "Related finds (max. 15 displayed)" %}</th> <th>{% trans "Doer" %}</th> - <th>{% trans "Container" %}</th> + {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %} <th>{% trans "Start date" %}</th> <th>{% trans "End date" %}</th> </tr> @@ -441,7 +451,7 @@ <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for it in items %}<span>{{it}} {{it|link_to_window:request}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"-" }}</td> - <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> + {% if can_view_container %}<td class='string'>{{ treatment.container|default_if_none:"-" }}</td>{% endif %} <td class='string'>{{ treatment.start_date|default_if_none:"-" }}</td> <td class='string'>{{ treatment.end_date|default_if_none:"-" }}</td> </tr> @@ -461,7 +471,7 @@ <th>{% trans "State" %}</th> <th>{% trans "Related finds (max. 15 displayed)" %}</th> <th>{% trans "Doer" %}</th> - <th>{% trans "Container" %}</th> + {% if can_view_container %}<th>{% trans "Container" %}</th>{% endif %} <th>{% trans "Start date" %}</th> <th>{% trans "End date" %}</th> </tr> @@ -479,7 +489,7 @@ <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td> <td class='item-list'>{% for it in items %}<span>{{it}} {{ it|link_to_window:request}}</span>{% endfor %}</td> <td class='string'>{{ treatment.person|default_if_none:"" }}</td> - <td class='string'>{{ treatment.container|default_if_none:"-" }}</td> + {% if can_view_container %}<td class='string'>{{ treatment.container|default_if_none:"-" }}</td>{% endif %} <td class='string'>{{ treatment.start_date|default_if_none:"" }}</td> <td class='string'>{{ treatment.end_date|default_if_none:"" }}</td> </tr> @@ -524,7 +534,6 @@ </table> {% endif %} </div> - {% endif %} {% if display_documents %} <div class="tab-pane fade" id="{{window_id}}-documents" role="tabpanel" aria-labelledby="{{window_id}}-documents-tab"> |