expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-04-02 06:31:01 +01:00
Code Issues 18 Projects 3 Activity

[svn] merge the trip table to have surveys by date

Browse Source 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:43:20 +01:00
parent 6598dd5105
commit 60735a9b3a
8 changed files with 139 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
templates/personexpedition.html
View File

@@ -9,32 +9,50 @@
<h3>{{message}}</h3>
<p>Needs links fore and back through expeditions attended by this person (or as a complete barchart type list with one date in bold)</p>
<p>Needs lists below to be sorted by date, and the duplicates removed from survey role list</p>
<p>Finally, a correspondence between these two columns</p>
<p><b><a href="{% url expedition personexpedition.expedition.year %}">Main page for expedition: {{personexpedition.expedition}}</a></b></p>
<div id="col2">
<table class="survexcontibutions">
<tr><th>Date</th><th>Place</th><th>Role</th></tr>
{% for personrole in personexpedition.personrole_set.all %}
<tr>
<td>{{personrole.survex_block.date}}</td>
<td><a href="{% url survexblock personrole.survex_block.survexpath %}">{{personrole.survex_block.survexpath}}</a></td>
<td>{{personrole.role}}</td>
</tr>
<p>List of other expos by this person</p>
<p>
{% for otherpersonexpedition in personexpedition.person.personexpedition_set.all %}
{% ifequal otherpersonexpedition personexpedition %}
| <b>{{otherpersonexpedition.expedition.year}}</b>
{% else %}
| <a href="{% url personexpedition personexpedition.person.href otherpersonexpedition.expedition.year %}">{{otherpersonexpedition.expedition.year}}</a>
{% endifequal %}
{% endfor %}
</table>
</div>
</p>
<div id="col1">
<table class="expeditionlogbooks">
<tr><th>Date</th><th>Title</th><th>Place</th></tr>
{% for persontrip in personexpedition.persontrip_set.all %}
<tr>
<td>{{persontrip.date}}</td>
<td><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</td>
<td>{{persontrip.place}}</td>
</tr>
<h3>Table of all trips and surveys aligned by date</h3>
<div>
<table class="survexcontibutions">
<tr><th>Date</th><th>Trips</th><th>Surveys</th></tr>
{% for persondate in personexpedition.GetPersonChronology %}
<tr>
<td class="date">{{persondate.0}}</td>
<td>
<table>
{% for persontrip in persondate.1.persontrips %}
<tr>
<td class="trip"><a href="{% url logbookentry persontrip.logbook_entry.href %}">{{persontrip.logbook_entry.title|safe}}</a></td>
<td class="place">{{persontrip.place}}</td>
</tr>
{% endfor %}
</table>
</td>
<td>
<table>
{% for personsurvexroles in persondate.1.personroles.items %}
<tr>
<td class="survexblock"><a href="{% url survexblock personsurvexroles.0 %}">{{personsurvexroles.0}}</a></td>
<td class="roles">{{personsurvexroles.1}}</td>
</tr>
{% endfor %}
</table>
</td>
</tr>
{% endfor %}
</table>
</div>