Commit Graph

78 Commits

Author SHA1 Message Date
julian 22b7620253 [svn r8171] Converted screen output display to ASCII, so that I could run the script
via SSH on a server
2009-01-17 21:36:14 +01:00
julian 820564de79 [svn r8170] Changed admin media prefix and enabled smart slash adding 2009-01-17 21:35:13 +01:00
julian 309d706bd7 [svn r8169] julian's quick makework and index page 2009-01-17 20:46:05 +01:00
julian c538cc7e95 [svn r8168] aaron changes 2009-01-17 18:49:29 +01:00
aaron 93197231cf [svn r8167] Fix double / error 2009-01-17 09:11:45 +01:00
aaron 47060929b5 [svn r8166] 2009-01-17 08:52:51 +01:00
aaron 82598eacd6 [svn r8165] 2009-01-17 08:44:39 +01:00
aaron 1316f7657f [svn r8164] Got rid of ugly old design; brought in ugly new design. This one works a little better, still needs a lot of work. 2009-01-17 08:11:01 +01:00
aaron 014f390100 [svn r8163] More work on survey images parser and virtual survey binder. Renamed expedition_year field of Survey model to expedition because this makes more sense. 2009-01-16 20:50:23 +01:00
aaron 246bb42545 [svn r8162] 2009-01-16 03:47:39 +01:00
aaron 03f4046e61 [svn r8161] randSent is unnecessary and causing problems 2009-01-16 03:44:39 +01:00
aaron f3bd6169ab [svn r8160] 2009-01-16 03:41:47 +01:00
aaron 8edaff3045 [svn r8159] randomLogbookSentance.py renamed to randSent.py, and expanded 2009-01-16 03:40:58 +01:00
aaron e543df8b83 [svn r8158] same mistake 2009-01-16 03:21:46 +01:00
aaron 73d73a8a41 [svn r8157] 2009-01-16 03:19:09 +01:00
aaron 7ef80e36a3 [svn r8156] Added a line to call the parser for surveys.csv and the scanned images. 2009-01-16 00:25:36 +01:00
aaron 0404030f87 [svn r8155] Added some actual funtionality to virtual survey binder. 2009-01-16 00:21:55 +01:00
aaron 95d6ae7011 [svn r8154] Whoops, commented out lines with were just for my local debugging. 2009-01-15 20:32:41 +01:00
aaron db1eab0c25 [svn r8153] Forgot this in the last checkout. It's the template for the virtual survey binder. 2009-01-15 07:25:09 +01:00
aaron 083b5a3f1d [svn r8152] Add beginnings of virtual survey binder: new Survey and ScannedImage models, survey parser. Still has lots of problems, but I need some help with the file upload aspect so am committing now. Biggest problem is trying to call save() on the images from the API. It needs arguments that I don't understand. Also, the # in our survey paths was causing trouble. I worked around this with a correctURL method which urlencodes the actual URL, but admin still tries to use a URL with a # in it. 2009-01-15 07:22:54 +01:00
aaron 96288429f3 [svn r8151] Undo some changes that were only meant for my local use. 2009-01-07 05:50:55 +01:00
aaron 785a130d0c [svn r8150] Added new photo model.
Logbook parser now looks for mugshots when adding people. If it finds an image, it adds a new photo model instance linked to that person. If it finds an html page, it adds the body text of that page as the person's "blurb" and then adds the mugshot.

My interface web design isn't working, sorry. Need a blank slate on that one.
2009-01-04 15:06:01 +01:00
aaron 7aaff3f64c [svn r8095] Fix plurals because they're starting to get on my nerves! 2008-12-31 18:07:50 +01:00
aaron 134c6f8694 [svn r8094] QM parser now parses Hauchhoehle QMs.py
Photo model added.

Logbook parser now puts mugshots in as photo models, and descriptions from the old folk html pages in as "blurbs" on the person model.

Experimented with eye candy and a random logbook quote generator.
2008-12-31 03:59:15 +01:00
aaron 7a4f8987f8 [svn r8093] Added QM model and parser. Had to merge models_cave.py and models_logbooks.py into models.py. This is because logbook entries now have an optional foreign key to caves, and QMs have a required foreign key to a logbook entry of the trip that created them. So, the two files became circularly dependent.
Also, the urls for the person model now allow lookups using their actual first and last name in the url instead of the primary key. We should do similar things for all models, maybe even using the url as a search which results in a page with multiple model instance results if the input is ambiguous (e.g. they only enter a first name).
2008-12-14 00:17:33 +01:00
aaron fe81408800 [svn r8092] 2008-12-09 19:58:32 +01:00
aaron 88146c9a25 [svn r8091] undo stupid change 2008-12-09 19:51:11 +01:00
aaron e783b3b576 [svn r8090] 2008-12-09 18:45:34 +01:00
aaron f4f4efbe0e [svn r8089] Fix settings reference. 2008-12-09 09:49:59 +01:00
aaron 7f43f0ccc8 [svn r8088] 2008-12-09 09:02:21 +01:00
aaron 4e1b4684cd [svn r8087] Try and sort out settings mess. 2008-12-09 05:48:56 +01:00
aaron b04d822383 [svn r8086] whoops, no slash 2008-12-09 03:05:23 +01:00
aaron 262b32bad5 [svn r8085] Trying to fix framos troggle 2008-12-09 03:01:31 +01:00
aaron 5720e9f9c5 [svn r8084] Forgot to add cave and logbook search templates in earlier commit. 2008-12-09 02:31:30 +01:00
aaron feb0f3a5c5 [svn r8083] 2008-12-08 06:17:35 +01:00
aaron 6b1555f867 [svn r8082] Remove MEDIA_ROOT from settings.py because it belongs in local settings, and comment out urlconf line for unfinished edit form which I haven't checked in. 2008-12-08 06:10:45 +01:00
aaron 97332b8103 [svn r8081] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 2008-12-08 05:28:03 +01:00
aaron 12118e4a59 [svn r8080] Replace "django" with "troggle" in admin 2008-12-07 23:18:58 +01:00
julian aff675d7f4 [svn r8079] Generalised the way dates are stored, and added a personRole and Role field 2008-11-09 00:27:00 +01:00
julian a76fd17c4e [svn r8078] Added survex persons to admin site 2008-11-09 00:24:24 +01:00
julian 503d00db90 [svn r8077] *teams and *date identified and scrapped 2008-11-09 00:23:27 +01:00
julian b85c962575 [svn r8076] Djangoed Julians code
added underscores to field names
turned __str__ to __unicode__
2008-11-08 19:24:03 +01:00
julian f08d6b6ecf [svn r8075] Removed troggle from urls 2008-11-08 16:37:12 +01:00
julian c126d85b87 [svn r8074] Use URL_ROOT for links 2008-11-07 10:12:11 +01:00
julian 400276daae [svn r8073] Added URL_ROOT to local settings 2008-11-07 10:10:03 +01:00
julian 379183b9db [svn r8072] add local settings files 2008-11-07 10:09:45 +01:00
julian 657046ca8c [svn r8071] convert unfound files to lower case and try again 2008-11-07 09:55:37 +01:00
julian abcd18531d [svn r8069] going back now works 2008-11-07 03:31:52 +01:00
julian 5f18df3822 [svn r8068] going back now works 2008-11-07 03:30:53 +01:00
julian e8b493d070 [svn r8067] remove nonasc 2008-11-07 03:25:00 +01:00