diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-20 13:09:03 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2014-02-20 13:09:03 +0100 |
| commit | c627c24a51ef1f428f8bb81e30d9e90f18cd2a81 (patch) | |
| tree | 6ee2b89fc33d08825d3b3d347a916086df5722aa /archaeological_operations/templates | |
| parent | dae850a2dcf7fc208a9d948a84b3251a4a88d747 (diff) | |
| download | Ishtar-c627c24a51ef1f428f8bb81e30d9e90f18cd2a81.tar.bz2 Ishtar-c627c24a51ef1f428f8bb81e30d9e90f18cd2a81.zip | |
Operations: in_charge -> scientist - new field in_charge (refs #1600)
* model update
* forms update
* templates update
* search update
* operation owned update
Diffstat (limited to 'archaeological_operations/templates')
| -rw-r--r-- | archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html | 2 | ||||
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html index e67214fbf..765bdc7e4 100644 --- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html +++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html @@ -172,7 +172,7 @@ </tr> {% for org in dashboard.survey.org %} <tr> - <th class='sub'>{{org.in_charge__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> + <th class='sub'>{{org.scientist__attached_to__name}}</th><td>{{org.area}}</td><td>{{org.manday}}</td><td>{{org.mandayhect}}</td> </tr> {% endfor %} </table></div> diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index b403d29df..b99ace961 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -39,7 +39,8 @@ {% 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%} +{% if item.scientist %}<p><label>{%trans "Head scientist:"%}</label> <span class='value'>{{ item.scientist.full_label }}</span></p>{%endif%} +{% if item.in_charge %}<p><label>{%trans "In charge:"%}</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> |