disambiguating names on wallets

core/views/scans.py

@@ -29,6 +29,10 @@ manywallets dict.
 TODO 
 cave for a wallet - just gets the last one, randomly. SHould make this a list or many:many ideally
 
+
+-- add the participants on an explicit wallet list to .slugpeople so that they get proper URL-linked 
+on the per-person wallet report, and do the same thing for per-cave and per-year wallet reports
+
 add this file in to the todo list thinggy.
 """
 

parsers/people.py

@@ -196,6 +196,7 @@ foreign_friends = [
     "K. Jäger",
     "Kai Schwekend",
     "Karl Gaisberger",
+    "Marcus Scheuermann",
     "Marcus Scheuerman",
     "Mark Morgan",
     "P. Jeutter",
@@ -279,6 +280,11 @@ def GetPersonExpeditionNameLookup(expedition):
             if n:
                 possnames += apply_variations(n, l)
 
+            if f == "Adeleide".lower():
+                possnames += apply_variations("Adelaide", l)
+            if f == "Adelaide".lower():
+                possnames += apply_variations("Adeleide", l)
+
             if f == "Robert".lower():
                 possnames += apply_variations("Bob", l)
             if f == "Rob".lower():
@@ -303,6 +309,7 @@ def GetPersonExpeditionNameLookup(expedition):
                 possnames += apply_variations("Andy", l)
             if f == "Andy".lower():
                 possnames += apply_variations("Andrew", l)
+                
             if f == "Michael".lower():
                 possnames += apply_variations("Mike", l)
 
@@ -316,6 +323,11 @@ def GetPersonExpeditionNameLookup(expedition):
             if f == "Pete".lower():
                 possnames += apply_variations("Peter", l)
 
+            if f == "Tobias".lower():
+                possnames += apply_variations("Toby", l)
+            if f == "Toby".lower():
+                possnames += apply_variations("Tobias", l)
+
             if f == "Olly".lower():
                 possnames += apply_variations("Oliver", l)
             if f == "Oliver".lower():

templates/cavewallets.html

@@ -31,7 +31,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     
     <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td>
     <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td>
-    <td style="padding:2px">{% if wallet.slugpeople %}{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}{% else %}{{wallet.persons }}{% endif %}</td>
+    <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td>
     <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
     <td style="padding:2px">
     {% for survexblock in wallet.survexblock_set.all %}

templates/expedition.html

@@ -22,6 +22,7 @@
 <li> <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo 
 <li> <a href="/wallets/year/{{expedition.year}}">wallet completion status</a> for this Expo 
 <li> <a href="/years/{{expedition.year}}/{{expedition.logbookfile}}">full logbook</a> for this Expo
+<li> <a href="/aliases/{{expedition.year}}">alias names</a> for this Expo
 {% if logged_in %}
 <p>Reparse and reload this year's logbook by clicking here: <a href="/expedition/{{expedition.year}}?reload">RELOAD</a>
 {% endif %}

templates/personwallets.html

@@ -30,7 +30,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     
     <td style="padding:2px" >{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td>
     <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td>
-    <td style="padding:2px">{% if wallet.slugpeople %}{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}{% else %}{{wallet.persons }}{% endif %}</td>
+    <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td>
     <td style="padding:2px">
     {% if wallet.cave %}
         {% if wallet.caveobj.slug %}

templates/yearwallets.html

@@ -39,7 +39,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
     
     <td style="padding:2px">{% if wallet.walletdate %}{{wallet.walletdate}}{% else %} {% endif %}</td>
     <td style="padding:2px">{% if wallet.name %}{{wallet.name|truncatechars:20}}{% else %}<em>{% if wallet.displaynames %} {% for dn in wallet.displaynames %}{{dn}}{%if not forloop.last %}, {% endif %} {% endfor %}{% else %} {% endif %}</em>{% endif %}</td>
-    <td style="padding:2px">{% if wallet.slugpeople %}{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}{% else %}{{wallet.persons }}{% endif %}</td>
+    <td style="padding:2px">{% if wallet.slugpeople %}<em>{%for p in wallet.slugpeople%}<a href="/person/{{p.slug}}">{{p.fullname}}</a>{%if not forloop.last %}, {% endif %}{% endfor %}</em>{% else %}{{wallet.persons }}{% endif %}</td>
     <td style="padding:2px">
     {% if wallet.cave %}
         {% if wallet.caveobj.slug %}