2011-07-11 02:10:22 +01:00
|
|
|
{% extends "base.html" %}
|
|
|
|
{% load wiki_markup %}
|
|
|
|
{% load link %}
|
|
|
|
|
2019-07-16 00:07:37 +01:00
|
|
|
{% block title %}Expedition {{this_expedition.name}}{% endblock %}
|
|
|
|
{% block editLink %}<a href={{this_expedition.get_admin_url}}>Edit expedition {{expedition|wiki_to_html_short}}</a>{% endblock %}
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
{% block related %}
|
|
|
|
{% endblock %}
|
|
|
|
|
|
|
|
{% block content %}
|
|
|
|
|
2019-07-16 00:07:37 +01:00
|
|
|
<h2>{{this_expedition.name}}</h2>
|
2011-07-11 02:10:22 +01:00
|
|
|
|
|
|
|
<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>
|
2019-07-16 00:07:37 +01:00
|
|
|
{% for expeditionday in this_expedition.expeditionday_set.all %}
|
2011-07-11 02:10:22 +01:00
|
|
|
<th>
|
|
|
|
{{expeditionday.date.day}}
|
|
|
|
</th>
|
|
|
|
{% endfor %}
|
|
|
|
</tr>
|
|
|
|
{% for personexpeditionday in personexpeditiondays %}
|
|
|
|
<tr>
|
2019-06-26 18:36:08 +01:00
|
|
|
<td><a href="{{ personexpeditionday.personexpedition.get_absolute_url }}">{{personexpeditionday.personexpedition.person|safe}}</a></td>
|
2011-07-11 02:10:22 +01:00
|
|
|
{% for persondayactivities in personexpeditionday.personrow %}
|
|
|
|
|
|
|
|
{% if persondayactivities.persontrips or persondayactivities.survexblocks %}
|
|
|
|
<td class="persondayactivity">
|
|
|
|
{% for persontrip in persondayactivities.persontrips %}
|
2019-03-06 23:20:34 +00:00
|
|
|
<a href="{{persontrip.logbook_entry.get_absolute_url}}" class="dayindexlog-1">T</a>
|
2011-07-11 02:10:22 +01:00
|
|
|
{% endfor %}
|
|
|
|
<br/>
|
|
|
|
{% for survexblock in persondayactivities.survexblocks %}
|
2018-04-11 22:02:57 +01:00
|
|
|
<a href="{% url "svx" survexblock.survexfile.path %}" class="dayindexsurvex-{{survexblock.DayIndex}}">S</a>
|
2011-07-11 02:10:22 +01:00
|
|
|
{% endfor %}
|
|
|
|
</td>
|
|
|
|
{% else %}
|
|
|
|
<td class="persondayactivity-nothing">
|
|
|
|
</td>
|
|
|
|
{% endif %}
|
|
|
|
|
|
|
|
{% endfor %}
|
|
|
|
</tr>
|
|
|
|
{% endfor %}
|
|
|
|
</table>
|
|
|
|
|
|
|
|
<form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
|
|
|
|
|
|
|
|
<h3>Logbooks and survey trips per day</h3>
|
2019-07-16 00:07:37 +01:00
|
|
|
<a href="{% url "newLogBookEntry" expeditionyear=this_expedition.year %}">New logbook entry</a>
|
2011-07-11 02:10:22 +01:00
|
|
|
<table class="expeditionlogbooks">
|
|
|
|
<tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
|
|
|
|
{% regroup dateditems|dictsort:"date" by date as dates %}
|
|
|
|
{% for date in dates %}
|
|
|
|
<tr>
|
2019-04-02 02:04:38 +01:00
|
|
|
<td>{{date.grouper|date:"D d M Y"}}</td>
|
2011-07-11 02:10:22 +01:00
|
|
|
<td>{% for item in date.list %}
|
|
|
|
{% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
|
|
|
|
{% endfor %}</td>
|
|
|
|
<td>{% for item in date.list %}
|
2018-04-11 22:02:57 +01:00
|
|
|
{% if item.isSurvexBlock %}<a href="{% url "svx" item.survexfile.path %}">{{item.name}}</a><br/>{% endif %}
|
2011-07-11 02:10:22 +01:00
|
|
|
{% endfor %}</td>
|
|
|
|
</tr>
|
|
|
|
{% endfor %}
|
|
|
|
</table>
|
|
|
|
|
|
|
|
{% endblock %}
|