cucc
0dedf19a4c
[svn r8335] Fixes to deal with reorganization of expo surveys repository. Now that survey scans and Surveys.csv are in different directories, we have two settings variables, settings.SURVEYS for the root of the survey repo, and settings.SURVEY_SCANS for the surveyscans directory.
...
Fixed tab / indent muck in surveys parser. Commented out some "file abstraction" stuff for the time being.
2009-05-10 09:26:36 +02:00
cucc
6f82f7f0e6
[svn r8327] fix it for real this time
2009-05-03 08:18:22 +02:00
cucc
9cabd7203e
[svn r8326] fix import naming mistake
2009-05-03 08:17:03 +02:00
cucc
c24359cb87
[svn r8324] Weeks of local changes.
...
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
2009-05-03 07:56:03 +02:00
aaron
333705092f
[svn r8308] Logbook entries are now at /YYYY-MM-DD/slug .
...
Try editing a logbook entry title in the admin now. The django built in auto slug field is fun and javascripty.
2009-03-16 20:27:52 +01:00
aaron
bcd223bc71
[svn r8305] Added QM wiki markup. The format is [[cave:204 QM:2005-04A]] with the grade (A) being optional. The links color red if the QM does not exist, and in that case clicking on them goes to an admin add page with fields prepopulated.
...
Various other little things, e.g. filled in the footer with links.
2009-03-16 09:53:24 +01:00
aaron
97c9772696
[svn r8274] Reverted the reverts from 8267. Fixed the next / previous trip in personexpedition on the LogbookEntry template -- I had misunderstood what this was supposed to do last time I messed with it. This involved adding the methods PersonTrip.get_persons_next_trip and persons_previous_trip. Couldn't find any other broken things.
...
Kept the productive changes in 8267: extending the logbook parsing back to 1993, changing index page, changes to view_surveys.py
2009-03-14 09:38:55 +01:00
aaron
17a7302afb
[svn r8269] Got QM pages working.
...
Started scripts for exporting to old expo format.
2009-03-12 15:22:21 +01:00
julian
9150ee1229
[svn r8267] revert some of the changes (href element) so that the links work
2009-03-11 11:44:15 +01:00
julian
8473c4a2c3
[svn r8262] Further attempts to make troggle work on windows using surveys stored on an external server
...
settings.PHOTOS changed to setting.PHOTO_ROOT
Made databaseReset.py get info from external server if appropriate (hope this did not break linus disk based scripts)
Still needs more work, to get everything working
Auto create photos directory if it does not already exist
2009-03-02 02:30:45 +01:00
aaron
f5fdfe3793
[svn r8260] Added new abstract base class TroggleModel. Any fields or methods that need to be added to multiple models should be added here.
...
Added edit links to caves, people, logbook entries, and people.
2009-02-26 06:28:04 +01:00
aaron
40e47f368b
[svn r8255]
2009-02-23 05:16:50 +01:00
aaron
4fc8c8ae3c
[svn r8246] Photo file handling and mugshots parsing sorted.
...
Made URL settings more relative, less redundant.
2009-02-18 07:45:45 +01:00
aaron
1baf2cc0d4
[svn r8245]
2009-02-17 02:09:11 +01:00
aaron
6776111c6e
[svn r8244] My crusade to make our project more Djangoic.
...
Got rid of the url tags in template, replaced them with get_absolute_url method calls where possible. Adding get_absolute_url in models enables direct link to the public model views in admin. The use of get_absolute_url, which is the correct Django way of doing things, eliminates any need for the redundant "href" fields we were using. Those fields now need to be deleted from the models and from the parsers.
Made the context processor to pass settings to all templates actually work, although this was a little uglier than expected. I had to put in a new render_response to replace render_to_response. This is because Django uses Context, not RequestContext by default. I wish they would change this, it's annoying. Anyway, I deleted all the manual settings passing in the views.
I also eliminated a couple of unnecessary methods and stuff like that.
2009-02-16 09:31:26 +01:00
julian
08ea56019d
[svn r8236] make work
2009-01-30 18:40:05 +01:00
julian
0d0005ed66
[svn r8232] yorkshire work with tunnel integration
2009-01-30 00:40:56 +01:00
julian
1f70991566
[svn r8228] cave maps to all logbook entry trips done there
2009-01-25 00:59:45 +01:00
julian
c4c1520b64
[svn r8224] made index of people
2009-01-24 19:26:49 +01:00
julian
7d9ec8009a
[svn r8221] merge the trip table to have surveys by date
2009-01-24 15:01:59 +01:00
aaron
83543ee301
[svn r8206] another import statement that caused errors on framos.lawoftheland. does work find on my machine though. Wonder what the difference is.
2009-01-19 18:59:30 +01:00
aaron
49647e5bcc
[svn r8205] fixed broken import statement
2009-01-19 18:51:10 +01:00
julian
9b63d62368
[svn r8199] survey block object
2009-01-19 01:22:54 +01:00
julian
7d1c2b6615
[svn r8190] MOre work on abstracting the file locations on scanned survey notes
2009-01-18 22:04:00 +01:00
julian
2f0eb4f25f
[svn r8189] new person expedition
2009-01-18 20:50:30 +01:00
julian
0701ce3ee2
[svn r8187] Got rid of data relating to specific machines
2009-01-18 19:15:06 +01:00
julian
dfbdb46a1b
[svn r8185] changed import to work one level lower
2009-01-18 18:20:45 +01:00
julian
b19fb42427
[svn r8184] modified import to take it down a level
2009-01-18 18:18:34 +01:00
julian
8663062bad
[svn r8183] modified import settings to import troggle.settings as settings
2009-01-18 18:12:41 +01:00
julian
918dbf3250
[svn r8180] Julian playing with the logbooks and expoyears
2009-01-18 16:59:37 +01:00
julian
8f817b424e
[svn r8173] Continued file abstracted work, to get survey files from either hard disk or the web.
2009-01-18 01:45:56 +01:00
julian
cbb1acd1b4
[svn r8172] Modifications to allow survey files to be pulled from another server. By providing directory listing and download functions,. which could also be used by tunnel
2009-01-18 00:25:59 +01:00
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
309d706bd7
[svn r8169] julian's quick makework and index page
2009-01-17 20:46:05 +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
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
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
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
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
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
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
julian
c057ec34f3
[svn r8066] quick
2008-11-07 03:09:23 +01:00
