From 58c2776a1c15e4b17bdcfc9c9eb9017866713f21 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 11 Jul 2022 01:37:12 +0200 Subject: Preventive file: add some fields - better sheet - Administrativ act: add comment --- .../templates/ishtar/sheet_file.html | 48 +++++++++++----------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'archaeological_files/templates') diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index d54d29e7e..417977a11 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -243,11 +243,13 @@
+ {% field_flex "Intervention period" item.intervention_period %} + {% field_flex "Study period" item.study_period %} + {% field_flex "Report due period" item.report_due_period %} {% field_flex "Start date" item.start_date|date:"DATE_FORMAT" %} {% field_flex "End date" item.end_date|date:"DATE_FORMAT" %} {% field_flex "Ground start date" item.ground_start_date|date:"DATE_FORMAT" %} {% field_flex "Ground end date" item.ground_end_date|date:"DATE_FORMAT" %} - {% field_flex "Study period" item.study_period %} {% field_flex "Execution report date" item.execution_report_date|date:"DATE_FORMAT" %}
@@ -276,17 +278,17 @@ {% trans "Job" %} - {% trans "Planned" %} - {% trans "Effective" %} + {% trans "Planned" %} + {% trans "Effective" %}   - {% trans "Man by day" %} - {% trans "Days" %} - {% trans "Cost" %} - {% trans "Man by day" %} - {% trans "Days" %} - {% trans "Cost" %} + {% trans "Man by day" %} + {% trans "Days" %} + {% trans "Cost" %} + {% trans "Man by day" %} + {% trans "Days" %} + {% trans "Cost" %} {% for job in item.ground_jobs.all %} @@ -328,17 +330,17 @@ {% trans "Job" %} - {% trans "Planned" %} - {% trans "Effective" %} + {% trans "Planned" %} + {% trans "Effective" %}   - {% trans "Man by day" %} - {% trans "Days" %} - {% trans "Cost" %} - {% trans "Man by day" %} - {% trans "Days" %} - {% trans "Cost" %} + {% trans "Man by day" %} + {% trans "Days" %} + {% trans "Cost" %} + {% trans "Man by day" %} + {% trans "Days" %} + {% trans "Cost" %} {% for job in item.jobs.all %} @@ -380,17 +382,17 @@ {% trans "Equipment / service" %} - {% trans "Planned" %} - {% trans "Effective" %} + {% trans "Planned" %} + {% trans "Effective" %}   - {% trans "Quantity" %} + {% trans "Quantity" %}   - {% trans "Cost" %} - {% trans "Quantity" %} + {% trans "Cost" %} + {% trans "Quantity" %}   - {% trans "Cost" %} + {% trans "Cost" %} {% for equipment in equipments %} -- cgit v1.2.3