expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 13:55:24 +00:00
Code Issues 18 Projects 3 Activity

Fixing wiki-parsing for 2009 logbook

Browse Source
This commit is contained in:
Philip Sargent
2022-12-18 19:33:56 +00:00
parent 73b710d53f
commit d1b94763b4
5 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/expedition.html
View File

@@ -68,10 +68,10 @@ an "S" for a survey trip. The colours are the same for people on the same trip.
<form action="" method="GET"><input type="submit" name="reload" value="Reload from logbook"></form>
{% endif %}
<h3 id="trips">Logbooks and survey trips per day</h3>
<h3 id="trips"> {{expedition.name}} - Records per day</h3>
<table class="expeditionlogbooks">
<tr><th>Date</th><th>Logged trips</th><th>Surveys</th><th>Wallets</th></tr>
<tr><th>Date</th><th>Logged trips and diary entries</th><th>Surveys</th><th>Wallets</th></tr>
{% regroup dateditems|dictsort:"date" by date as dates %}
{% for date in dates %}
<tr>
@@ -89,5 +89,5 @@ an "S" for a survey trip. The colours are the same for people on the same trip.
{% endfor %}</td></tr>
{% endfor %}
</table>
<h3> {{expedition.name}} </h3>
{% endblock %}

6
templates/logbook2005style.html
View File

@@ -20,11 +20,11 @@ Exported on {% now 'Y-m-d D' %} using control panel webpage and exportlogbook()
<hr />
<div class="tripdate" id="{{logbook_entry.slug}}">{{logbook_entry.date|date:'Y-m-d'}}</div>
<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person}}</u>{% else %}{{ persontrip.personexpedition.person }}{% endif %}, {% endfor %}</div>
<div class="triptitle">{{logbook_entry.title}}</div>
<div class="trippeople">{% for persontrip in logbook_entry.persontrip_set.all %}{% if persontrip.is_logbook_entry_author %}<u>{{persontrip.personexpedition.person|safe}}</u>{% else %}{{ persontrip.personexpedition.person|safe }}{% endif %}, {% endfor %}</div>
<div class="triptitle">{{logbook_entry.title|safe}}</div>
{{logbook_entry.text|safe}}
<div class="timeug">T/U: {{logbook_entry.time_underground}}</div>
<div class="timeug">T/U: {{logbook_entry.time_underground|safe}} hours</div>
{% endfor %}
<hr />
</body>