revised tables

templates/aliases.html

@@ -26,21 +26,24 @@ td {
 {% endfor %}
 </table>
 
+<p>This is the list of people on expo this year.
 <table>
-<tr><th>who</th><th>aliases</th></tr>
-{% for key, value  in invert.items %}
- <tr>
-   <td>{{key}}</td>
-   <td>{{value}}</td>
+<tr><th>Person</th><th>mugshot</th><th>blurbfile</th></tr>
+{% for pe in personexpeditions %}
+<tr>
+   <td>{{pe.person}}</td>
+   <td>{% if pe.person.mugshot %}<a href="{{pe.person.mugshot}}">{{pe.person.mugshot}}</a>{% endif %}</td>
+   <td>{% if pe.person.blurbfile %}<a href="{{pe.person.blurbfile}}">{{pe.person.blurbfile}}</a>{% endif %}</td>
  </tr>
 {% endfor %}
 </table>
 
 <p>The aliases below are specified in the folk.csv file. Only one alias is possible in that format. The specified alias ('nickname') 
-is used in the table above to construct possible unambiguous identifiers.
+is used in the table above to construct possible unambiguous identifiers. This is ordered by the date of last appearance on expo.
+
 <table>
 <tr><th>First</th><th>Last</th><th>Full name</th><th>Nickname</th><th>expo first</th><th>expo last</th></tr>
-{% for p in persons %}
+{% for p in oldpersons %}
 <tr>
    <td><b>{{p.first_name}}</b></td>
    <td><b>{{p.last_name}}</b></td>
@@ -53,17 +56,7 @@ is used in the table above to construct possible unambiguous identifiers.
 {% endfor %}
 </table>
 
-<p>This is the list of people on expo this year.
-<table>
-<tr><th>Person</th><th>mugshot</th><th>blurbfile</th></tr>
-{% for pe in personexpeditions %}
-<tr>
-   <td>{{pe.person}}</td>
-   <td>{% if pe.person.mugshot %}<a href="{{pe.person.mugshot}}">{{pe.person.mugshot}}</a>{% endif %}</td>
-   <td>{% if pe.person.blurbfile %}<a href="{{pe.person.blurbfile}}">{{pe.person.blurbfile}}</a>{% endif %}</td>
- </tr>
-{% endfor %}
-</table>
+
 
 <p>And these are people known to us, who appear as survex *team members or in logbook participant lists, but are not expo members 
 and so are not managed or reported: