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 | 7dc79581218a205fb5b80ea6db306b77b9bd529b (patch) | |
| tree | be8d4564e68a0bf65a2b4f0136621d67f2acf62a /ishtar/templates | |
| parent | 571aa094f71d152df9a8ce60cd41a0bcad64bd0b (diff) | |
| download | Ishtar-7dc79581218a205fb5b80ea6db306b77b9bd529b.tar.bz2 Ishtar-7dc79581218a205fb5b80ea6db306b77b9bd529b.zip | |
Disambiguation of closing date and end of excavation work (closes #526)
Diffstat (limited to 'ishtar/templates')
| -rw-r--r-- | ishtar/templates/sheet_file.html | 4 | ||||
| -rw-r--r-- | ishtar/templates/sheet_operation.html | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ishtar/templates/sheet_file.html b/ishtar/templates/sheet_file.html index ea5842991..88ef1b3a2 100644 --- a/ishtar/templates/sheet_file.html +++ b/ishtar/templates/sheet_file.html @@ -91,7 +91,7 @@ <th>{% trans "Type" %}</th> <th>{% trans "In charge" %}</th> <th>{% trans "Start date" %}</th> - <th>{% trans "End date" %}</th> + <th>{% trans "Excavation end date" %}</th> <th class='link'> </th> </tr> {% for operation in item.operations.all %} @@ -102,7 +102,7 @@ <td class='string'>{{operation.operation_type}}</td> <td class='string'>{{operation.in_charge|default:""}}</td> <td>{{operation.start_date|default:""}}</td> - <td>{{operation.end_date|default:""}}</td> + <td>{{operation.excavation_end_date|default:""}}</td> <td class='link'><a href="#" onclick='load_window("{%url show-operation operation.pk ''%}")'>{% trans "Details" %}</a></td> </tr> {% empty %} 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> |