expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-26 09:11:54 +00:00
Code Issues 19 Projects 3 Activity
641 Commits 7 Branches 0 Tags 34 MiB
8a1be45aac
Commit Graph

63 Commits

Author SHA1 Message Date
Sam Wenham
8a1be45aac Remove this stupid hard coded name match 2019-06-26 20:56:08 +01:00
Sam Wenham
cc313246bb missed objects 2019-04-18 19:27:23 +01:00
Sam Wenham
bfe018cde6 Clear data issues for logbooks before reloading 2019-04-18 19:26:09 +01:00
Sam Wenham
23df89cf31 Fix CSRF issues in svx form 
Set date formats
Add DataIssue model and add errors to it to allow us to give people a list of
stuff to fix
 2019-04-14 22:45:31 +01:00
Sam Wenham
d1d0c24ed8 Sort people by notability 
Better errors and tidy
Nicer date formats
 2019-04-02 02:04:38 +01:00
Sam Wenham
9df91b221b Support html and wiki logbook entrys 
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
 2019-03-31 15:39:53 +01:00
Sam Wenham
a4532a29da Update new management command for DB reset 
Switch to content_type from mimetype
Make DB reset not nuke so much
Tidy logbook parser
 2019-03-30 13:58:38 +00:00
Sam Wenham
b4296f1736 Fix people list 
Cope with Jimmy McFoo as a name!
Don't set the top expo value in the code whin it is piss easy to calculate
Fix typo from last commit
 2019-03-09 18:21:10 +00:00
Sam Wenham
1bac650aee There is no point having two functions do basicaly the same thing so make the 
load all logbooks call load logbook(expo)
Remove the return message from load logbook as it isn't used
 2019-03-09 11:18:44 +00:00
Sam Wenham
9fc80bed35 Make the logbook parser a little more sane 
Move the parser to expo mapping to settings
Set a default parser
Iterate over the expo years rather than the mapping list!
 2019-03-06 23:20:34 +00:00
Sam Wenham
798ae591c6 Django 1.7 mostly working. Big refactor so probably bugs 2018-04-15 16:28:13 +01:00
wookey
3f98470af8 Add a function for running people parser 
And comments on how logbooks can't be read in until 'year' exists in database
 2013-06-25 15:59:19 +01:00
Wookey
ae693ca4c5 Add 2010 and 2011 logbooks to parsing list (can we make this auto 
somehow - by agreeing a logbook format, or letting it guess)?
 2011-09-15 12:12:18 +01:00
Wookey
dc1327674c remove all the DOS linefeeds 2011-07-11 02:10:22 +01:00
Martin Green
69ab1e0249 Changed to regex to make 2003 expo logbooks parse 2011-07-10 23:45:45 +01:00
Martin Green
b001df1f53 edit logbooks, new logbook format, increased database normalisation 2011-05-01 19:32:41 +01:00
goatchurch
1294444026 make 2008 logbook correctly parse 2009-09-14 22:52:46 +01:00
goatchurch
ced45c92f7 tunnelfiles scheme added 2009-09-11 23:56:47 +01:00
goatchurch
f21cddb2d0 modelviz added 2009-09-11 09:04:59 +01:00
goatchurch
c5b933f922 parsing 2009-09-08 23:05:04 +01:00
goatchurch
c66b5e2dad [svn] latest hacking for various statistics 2009-08-05 11:58:36 +01:00
goatchurch
9077462893 [svn] now with ability to make new svx file 2009-08-01 07:31:27 +01:00
goatchurch
7158a79a34 [svn] full checkin. animations disabled, sorry 2009-07-27 13:43:43 +01:00
substantialnoninfringinguser
8446047ab2 [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
ae3fe8cd42 [svn] Renaming troggle.expo to troggle.core. To do this, used: 
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`

and then manually checked each change (had to remove a couple)
 2009-07-02 20:43:18 +01:00
goatchurch
17175637dc [svn] codemirror 2009-06-09 18:59:54 +01:00
substantialnoninfringinguser
006becf6ca [svn] Removed redundant fields "date" and "place" from Persontrip model. A PersonTrip's date and place are stored in its parent LogbookEntry. PersonTrips are the people who participate in the trip in a LogbookEntry, so it would make no sense to have different dates and places from the LogbookEntry they are foreignkeyed to. 2009-06-09 00:29:00 +01:00
substantialnoninfringinguser
97e423ba86 [svn] fix imports 2009-05-23 16:51:21 +01:00
substantialnoninfringinguser
e2e47e5876 [svn] fix it for real this time 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8327 by cucc @ 5/3/2009 6:18 AM
 2009-05-13 06:18:09 +01:00
substantialnoninfringinguser
a19781d7dd [svn] fix import naming mistake 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8326 by cucc @ 5/3/2009 6:17 AM
 2009-05-13 06:17:09 +01:00
substantialnoninfringinguser
625b2156e3 [svn] 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
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
 2009-05-13 06:15:48 +01:00
substantialnoninfringinguser
6137f8baaa [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8308 by aaron @ 3/16/2009 7:27 PM
 2009-05-13 06:09:55 +01:00
substantialnoninfringinguser
91e4f0f8c0 [svn] 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

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8274 by aaron @ 3/14/2009 8:38 AM
 2009-05-13 06:02:42 +01:00
substantialnoninfringinguser
90da85e856 [svn] revert some of the changes (href element) so that the links work 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM
 2009-05-13 05:58:58 +01:00
substantialnoninfringinguser
4b34241a16 [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8260 by aaron @ 2/26/2009 5:28 AM
 2009-05-13 05:56:56 +01:00
substantialnoninfringinguser
25b695e53d [svn] 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8245 by aaron @ 2/17/2009 1:09 AM
 2009-05-13 05:52:59 +01:00
substantialnoninfringinguser
cb52c47aa9 [svn] yorkshire work with tunnel integration 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8232 by julian @ 1/29/2009 11:40 PM
 2009-05-13 05:48:47 +01:00
substantialnoninfringinguser
cdd4e685ee [svn] cave maps to all logbook entry trips done there 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8228 by julian @ 1/24/2009 11:59 PM
 2009-05-13 05:46:12 +01:00
substantialnoninfringinguser
60735a9b3a [svn] merge the trip table to have surveys by date 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8221 by julian @ 1/24/2009 2:01 PM
 2009-05-13 05:43:20 +01:00
substantialnoninfringinguser
0ba4dd4ef4 [svn] survey block object 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
 2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
0f5109cb09 [svn] new person expedition 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM
 2009-05-13 05:38:18 +01:00
substantialnoninfringinguser
db523ed603 [svn] modified import to take it down a level 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8184 by julian @ 1/18/2009 5:18 PM
 2009-05-13 05:36:53 +01:00
substantialnoninfringinguser
91b68aef0d [svn] modified import settings to import troggle.settings as settings 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8183 by julian @ 1/18/2009 5:12 PM
 2009-05-13 05:36:33 +01:00
substantialnoninfringinguser
f229ff35f9 [svn] Julian playing with the logbooks and expoyears 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8180 by julian @ 1/18/2009 3:59 PM
 2009-05-13 05:35:59 +01:00
substantialnoninfringinguser
8d13864181 [svn] julian's quick makework and index page 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8169 by julian @ 1/17/2009 7:46 PM
 2009-05-13 05:33:29 +01:00
substantialnoninfringinguser
c6cce8d2fe [svn] 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. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8152 by aaron @ 1/15/2009 6:22 AM
 2009-05-13 05:27:43 +01:00
substantialnoninfringinguser
95a08ffbd9 [svn] Undo some changes that were only meant for my local use. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8151 by aaron @ 1/7/2009 4:50 AM
 2009-05-13 05:26:51 +01:00
substantialnoninfringinguser
b7bf1b37ac [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8150 by aaron @ 1/4/2009 2:06 PM
 2009-05-13 05:26:14 +01:00
substantialnoninfringinguser
7aee3fb920 [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8094 by aaron @ 12/31/2008 2:59 AM
 2009-05-13 05:25:17 +01:00
substantialnoninfringinguser
29984ff15a [svn] Added cave and logbook search, collapsible footer navbar, useless statistics page. Also fixed broken css. Toying with forms but not committing those yet. 
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8081 by aaron @ 12/8/2008 4:28 AM
 2009-05-13 05:22:14 +01:00