diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-10 18:36:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-10 18:36:48 +0200 |
| commit | e6400e623dff8749bb530349091824ffe1217241 (patch) | |
| tree | be8d4564e68a0bf65a2b4f0136621d67f2acf62a /ishtar/templates/sheet_operation.html | |
| parent | 2d307fd28838a7298d2a552f056d10f548f16df7 (diff) | |
| download | Ishtar-e6400e623dff8749bb530349091824ffe1217241.tar.bz2 Ishtar-e6400e623dff8749bb530349091824ffe1217241.zip | |
Disambiguation of closing date and end of excavation work (closes #526)
Diffstat (limited to 'ishtar/templates/sheet_operation.html')
| -rw-r--r-- | ishtar/templates/sheet_operation.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar/templates/sheet_operation.html b/ishtar/templates/sheet_operation.html index 0005ca82c..aa571d20c 100644 --- a/ishtar/templates/sheet_operation.html +++ b/ishtar/templates/sheet_operation.html @@ -13,10 +13,10 @@ <p><label>{%trans "Edition date:"%}</label> <span class='value'>{{ item.history.all.0.history_date }}</span></p> <!-- date = now --> -{% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p>{%endif%} -{% if item.end_date %}<p><label>{%trans "Field work end date:"%}</label> <span class='value'>{{ item.end_date|default:"-" }}</span></p>{%endif%} - -<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p> +{% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p> +<p><label>{%trans "Excavation end date:"%}</label> <span class='value'>{{ item.excavation_end_date|default:"-" }}</span></p> +{%endif%} +{% if item.in_charge %}<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>{%endif%} <p><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p> {% else %}{%trans "Closed operation"%}</span></p> <p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></p> |
