diff options
| -rw-r--r-- | expo/views.py | 3 | ||||
| -rw-r--r-- | parsers/logbooks.py | 10 | ||||
| -rw-r--r-- | settings.py | 2 | ||||
| -rw-r--r-- | templates/person.html | 24 | ||||
| -rw-r--r-- | templates/personindex.html | 26 | ||||
| -rw-r--r-- | urls.py | 5 |
6 files changed, 59 insertions, 11 deletions
diff --git a/expo/views.py b/expo/views.py index 0ffd800..eed5872 100644 --- a/expo/views.py +++ b/expo/views.py @@ -1,2 +1,3 @@ from views_caves import *
-from views_survex import *
\ No newline at end of file +from views_survex import *
+from views_logbooks import *
diff --git a/parsers/logbooks.py b/parsers/logbooks.py index df2c9a9..cc3a746 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -7,14 +7,6 @@ import re import os
import datetime
-# Dave Johnson (Stonker) is hacked -- are there two of this DJ name
-# Dave Collins (Scout) is hacked
-# Letty ten Harkel has middle , tu = timeug or ""name removed
-# the <span lang=""sv""> have been removed
-# Dave Milne (Lummat)
-# Ben van Millingen
-# Rebecca Lawson (Becka)
-
persontab = open(os.path.join(settings.EXPOWEB, "noinfo", "folk.csv"))
personreader = csv.reader(persontab)
headers = personreader.next()
@@ -186,7 +178,7 @@ def Parseloghtmltxt(year, expedition, txt): def LoadLogbooks():
models.LogbookEntry.objects.all().delete()
- expowebbase = os.path.join(settings.EXPOWEB, "years") # this could be a url
+ expowebbase = os.path.join(settings.EXPOWEB, "years")
yearlinks = [
# ("2008", "2008/logbook/2008logbook.txt"),
# ("2007", "2007/logbook/2007logbook.txt"),
diff --git a/settings.py b/settings.py index 7a83050..bccbe9a 100644 --- a/settings.py +++ b/settings.py @@ -67,7 +67,7 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'troggle.urls' TEMPLATE_DIRS = ( - "templates" + "/home/mjg/expoweb/troggle/templates" # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". # Always use forward slashes, even on Windows. # Don't forget to use absolute paths, not relative paths. diff --git a/templates/person.html b/templates/person.html new file mode 100644 index 0000000..c710208 --- /dev/null +++ b/templates/person.html @@ -0,0 +1,24 @@ +{% extends "base.html" %}
+{% load wiki_markup %}
+
+{% block title %}Person {{person.id}}{% endblock %}
+
+{% block content %}
+ <div class="personblock"><a href="/person/{{person.id}}">{{person}}</a>
+ <ul>
+ {% for personexpedition in person.personexpedition_set.all %}
+ <li>
+ <table><tr><td>
+ {{personexpedition.expedition}}
+ </td><td>
+ <div>
+ {% for persontrip in personexpedition.persontrip_set.all %}
+ <a href="/logbook/{{persontrip.logbookentry.id}}">{{persontrip.date}}</a>
+ {% endfor %}
+ </div>
+ </td></tr></table>
+ </li>
+ {% endfor %}
+ </ul>
+</div>
+{% endblock %}
diff --git a/templates/personindex.html b/templates/personindex.html new file mode 100644 index 0000000..45591e6 --- /dev/null +++ b/templates/personindex.html @@ -0,0 +1,26 @@ +{% extends "base.html" %}
+{% load wiki_markup %}
+
+{% block title %}Person Index{% endblock %}
+
+{% block content %}
+{% for person in persons %}
+ <div class="personblock"><a href="/person/{{person.id}}">{{person}}</a>
+ <ul>
+ {% for personexpedition in person.personexpedition_set.all %}
+ <li>
+ <table><tr><td>
+ {{personexpedition.expedition}}
+ </td><td>
+ <div>
+ {% for persontrip in personexpedition.persontrip_set.all %}
+ <a href="/logbook/{{persontrip.logbookentry.id}}">{{persontrip.date}}</a>
+ {% endfor %}
+ </div>
+ </td></tr></table>
+ </li>
+ {% endfor %}
+ </ul>
+</div>
+{% endfor %}
+{% endblock %}
@@ -9,11 +9,16 @@ urlpatterns = patterns('', (r'^troggle/cave/$', caveindex),
(r'^troggle/cave/(?P<cave_id>[^/]+)/$', cave),
(r'^troggle/cave/(?P<cave_id>[^/]+)/(?P<ent_letter>[^/]?)$', ent),
+
(r'^troggle/survex/(?P<survex_file>.*)\.index$', index),
(r'^troggle/survex/(?P<survex_file>.*)\.svx$', svx),
(r'^troggle/survex/(?P<survex_file>.*)\.3d$', threed),
(r'^troggle/survex/(?P<survex_file>.*)\.log$', log),
(r'^troggle/survex/(?P<survex_file>.*)\.err$', err),
+
+ (r'^person/$', personindex),
+ (r'^person/(.*)$', person),
+
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/(.*)', admin.site.root),
|