tunnelfiles scheme added

1 files changed, 65 insertions, 45 deletions

diff --git a/templates/expedition.html b/templates/expedition.html
index 3a917bb..fd78eea 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -6,64 +6,84 @@
 {% block editLink %}<a href={{expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}

 

 {% block related %}

-<table class="prevnextexpeditions">

-<tr>

-  <td>{% if expedition_prev %}&lt; &lt; {{ expedition_prev|link }} {% endif %}</td>

-  <td>{% if expedition_next %}&gt; &gt; {{ expedition_next|link }} {% endif %}</td>

-</tr>

-</ul>

-

-<table class="expeditionpersonlist">

-<tr><th>Caver</th><th>From</th><th>To</th></tr>

-{% for personexpedition in expedition.personexpedition_set.all %}

-  <tr>

-    <td><a href="{{ personexpedition.get_absolute_url }}">{{personexpedition.person}}</a></td>

-    <td>{{personexpedition.date_from}}</td>

-    <td>{{personexpedition.date_to}}</td>

-  </tr>

-{% endfor %}

-</table>

 {% endblock %}

 

 {% block content %}

-<h2>{{expedition.name}}: {{expedition.date_from}} - {{expedition.date_to}}</h2>

-

 

-<div id="col1">

-<h3>Logbook entries</h3>

-<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>

+{% if message %}

 <p>debug message: {{message}}</p>

+{% endif %}

 

-<table class="expeditionlogbooks">

-<tr><th>Date</th><th>Title</th><th>Author</th><th>Place</th></tr>

-{% for logbookentry in logbookentries %}

+<h2>{{expedition.name}}</h2>

+

+<p><b>Other years:</b>

+{% for otherexpedition in expeditions %}

+  {% ifequal otherexpedition expedition %}

+  | <b>{{otherexpedition.year}}</b>

+  {% else %}

+  | <a href="{{otherexpedition.get_absolute_url}}">{{ otherexpedition.year }}</a>

+  {% endifequal %}

+{% endfor %}

+</p>

+

+<p><b>At a single glance:</b> The table shows all expo cavers and their recorded trips.  

+The columns are the date in the month (July or August), with a "T" for a logbook entry, and 

+an "S" for a survey trip.  The colours are the same for people on the same trip.</p>

+

+<table class="expeditionpersonlist">

+<tr>

+<th>Caver</th>

+{% for expeditionday in expedition.expeditionday_set.all %} 

+<th>

+  {{expeditionday.date.day}}

+</th>

+{% endfor %}

+</tr>

+{% for personexpeditionday in personexpeditiondays %}

   <tr>

-    <td>{{logbookentry.date}}</td>

-    <td><a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</td>

-    <td><a href="{{ logbookentry.author.get_absolute_url }}">{{logbookentry.author.name}}</a></td>

+  <td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person}}</a></td>

+  {% for persondayactivities in personexpeditionday.personrow %}

+

+  {% if persondayactivities.persontrips or persondayactivities.survexblocks %}

+  <td class="persondayactivity">

+    {% for persontrip in persondayactivities.persontrips %}

+      <a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-{{persontrip.logbook_entry.DayIndex}}">T</a>

+    {% endfor %}

+   <br/>

+    {% for survexblock in persondayactivities.survexblocks %}

+      <a href="{% url svx survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>

+    {% endfor %}

+  </td>

+  {% else %}

+  <td class="persondayactivity-nothing">

+  </td>

+  {% endif %}

 

-    {% if logbookentry.cave %}

-      <td><a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place}}</a></td>

-    {% else %}

-      <td>{{logbookentry.place}}</td>

-    {% endif %}

+  {% endfor %}

   </tr>

 {% endfor %}

 </table>

-</div>

 

-<div>

-<h3 id="surveysdone">Surveys done</h3>

-<table class="survextrip">

-<tr><th>Date</th><th>Name</th><th>Length</th></tr>

-{% for survexblock in expedition.survexblock_set.all %}

-  <tr>

-    <td>{{survexblock.date}}</td>

-    <td><a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a></td>

-    <td>{{survexblock.totalleglength}}</td>

-  </tr>

+<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>

+

+<h3>Logbooks and survey trips per day</h3>

+<table class="expeditionlogbooks">

+<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>

+{% for expeditionday in expedition.expeditionday_set.all %} 

+<tr>

+  <td>{{expeditionday.date}}</td>

+  <td>

+    {% for logbookentry in expeditionday.logbookentry_set.all %}

+    <a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</a><br/>

+    {% endfor %}

+  </td>

+  <td>

+    {% for survexblock in expeditionday.survexblock_set.all %}

+    <a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a>

+    {% endfor %}

+  </td>

+</tr>

 {% endfor %}

 </table>

-</div>

 

 {% endblock %}