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

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM

3 files changed, 62 insertions, 33 deletions

diff --git a/templates/index.html b/templates/index.html
index 0122bdd..bbc4312 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,11 +7,22 @@
 

 <h2>The unfinished front page</h2>

 <b>Work down through an expedition page link</b>

-<p class="indent">Remaining work: continue to build up the network; tables of trips per year per person; parse 1996 logbook; 

-continue to correct the name matching and spelling; detect T/U on log entries; match caves to log entries; see the cave list; 

-simplify the survex parsing code (if necessary); vast front-page layout table of folks and caving trips and years; 

-links between logbooks and survex blocks to cave things; where are the subcaves; mini-tree of survexblocks; connect sketches 

-to caves to survey blocks and render thumbnailwise; all images to start appearing in pages; and so on</p>

+<p class="indent"><b>Remaining work:</b> 

+

+<p>continue to build up the network; </p>

+<p>tables of trips per year per person;</p> 

+<p>parse 1995-1976 logbooks; </p>

+<p>continue to correct the name matching and spelling; </p>

+<p>detect T/U on log entries; </p>

+<p>match caves to log entries; </p>

+<p>see the cave list;</p> 

+<p>simplify the survex parsing code (if necessary); </p>

+<p>vast front-page layout table of folks and caving trips and years; </p>

+<p>links between logbooks and survex blocks to cave things; </p>

+<p>where are the subcaves; </p>

+<p>mini-tree of survexblocks; </p>

+<p>connect sketches to caves to survey blocks and render thumbnailwise; </p>

+<p>all images to start appearing in pages; and so on</p>

 

 <h3>{{message}}</h3>

 

diff --git a/templates/personexpedition.html b/templates/personexpedition.html
index bbbc067..07dcb54 100644
--- a/templates/personexpedition.html
+++ b/templates/personexpedition.html
@@ -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>

-

-<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><b><a href="{% url expedition personexpedition.expedition.year %}">Main page for expedition: {{personexpedition.expedition}}</a></b></p>

+

+<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>

diff --git a/templates/survexblock.html b/templates/survexblock.html
index ef392df..dedf09f 100644
--- a/templates/survexblock.html
+++ b/templates/survexblock.html
@@ -29,10 +29,10 @@
 <p>Date: {{survexblock.date}}</p>

 

 <table>

-{% for personrole in survexblock.personrole_set.all %}

+{% for personrole in survexblock.GetPersonroles %}

 <tr>

-  <td><a href="{% url personexpedition personrole.personexpedition.person.href personrole.personexpedition.expedition.year%}">{{personrole.personexpedition.person}}</a></td>

-  <td>{{personrole.role}}</td>

+  <td><a href="{% url personexpedition personrole.person.href personrole.expeditionyear%}">{{personrole.person}}</a></td>

+  <td>{{personrole.roles}}</td>

 </tr>

 {% endfor %}

 </table>

@@ -40,7 +40,7 @@
 

 </div>

 

-<div id="col1">

+<div class="survexblock">

 {{ftext|survex_to_html}}

 </div>