2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-30 22:01:53 +00:00
Commit Graph

54 Commits

Author SHA1 Message Date
ba2ae6cd82 reformatted using black 2023-01-19 21:18:42 +00:00
939d3970aa sort imports using isort. tested. 2023-01-19 18:33:04 +00:00
73b710d53f fix more logbook parsing 2022-12-17 17:05:55 +00:00
Philip Sargent
45a640dfe9 Convert .format() to f-strings 2022-11-23 10:41:14 +00:00
Philip Sargent
45f06293f5 Add 'foreign friends' to names alias list 2022-10-12 23:10:48 +03:00
Philip Sargent
ff8eaa241e *team parsing much improved. Copes with everything now. 2022-10-10 15:40:21 +03:00
Philip Sargent
52a035e4cf more fixes 2022-10-10 01:08:37 +03:00
Philip Sargent
861980a8e9 More fixes to name resolution checking 2022-10-09 23:50:32 +03:00
Philip Sargent
3c31c333f2 Widen the recognizer capabilities for names 2022-10-09 02:32:34 +03:00
Philip Sargent
e6ca20b1ed new report to make aliases visible 2022-10-09 00:17:53 +03:00
Philip Sargent
e9790e70d6 abbrv. names now accepted when parsing logbooks, survex 2022-10-08 01:52:10 +03:00
Philip Sargent
f51d1e114e small chnages to name resolution 2022-10-07 23:47:05 +03:00
Philip Sargent
02d58d440e WORKING both py3.9.10 & 3.8.10 (dj2.2.25) 2022-03-02 23:19:48 +00:00
Philip Sargent
5e478c7eb0 Imports in control panel work again 2021-04-27 20:44:24 +01:00
Philip Sargent
27491c933a enabled mugshots & blurb in people pages 2021-04-15 17:51:01 +01:00
Philip Sargent
267741fa8b fixing typos and changes in importing 2021-04-13 01:13:08 +01:00
Philip Sargent
2a1710596a moving save_carefully() 2021-04-13 00:11:08 +01:00
Philip Sargent
5836c6ff90 Importing old logbooks 2021-02-06 00:18:48 +00:00
Philip Sargent
ff3cdb10dc extra error printout and remove old code 2020-07-06 21:46:58 +01:00
Philip Sargent
d2833d26cc fix schema and try cache caves import 2020-07-06 20:27:31 +01:00
Philip Sargent
8530b0643d person attribution of surveyed length working 2020-07-06 01:24:43 +01:00
Philip Sargent
b35a0b0d26 Fully working dj 1.11.29 2020-06-19 16:39:05 +01:00
Philip Sargent
50d753a87b Convert codebase for python3 usage 2020-05-24 20:56:27 +01:00
Philip Sargent
d4ac28af18 Remove PHOTOS_ROOT and DPhoto class 2020-05-15 21:32:55 +01:00
Philip Sargent
931aa4e3cb add mysql startup documentation 2020-05-14 19:37:46 +01:00
Philip Sargent
a8460065a4 Thorough spring clean and profiling 2020-04-27 23:51:41 +01:00
53b797fb53 Validation of mugshot or blrub file added 2020-04-01 19:58:31 +01:00
Sam Wenham
a26109cb30 Allow comments against names in logbooks in brackets
Convert accent chars in names into simple chars as this is what people enter in the logbook
2019-07-11 12:29:38 +01:00
Sam Wenham
b42249890e Updating caves and entrances is no longer nuclear!
Big overhaul of people processing, fullname added to the model
lastname is now names -1 unless you only have one (yes you Wookey)
this allows for Jon Arne Toft and Wookey to live it the same DB
names can now have html chars in them, this should be real unicode but that can
only happen when we go to Python 3!
2019-04-19 22:52:54 +01:00
Wookey
b3089fafe9 Merge lots of troggle fixes 2019-04-02 00:57:54 +01:00
Wookey
e913a56a6b folk.csv has moved into 'folk' dir out of 'noinfo' 2019-04-02 00:57:13 +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
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
expo
29adaa03c6 get rid of photo 2009-08-29 18:08:55 +01:00
substantialnoninfringinguser
8446047ab2 [svn] Brief code cleanup. 2009-07-03 05:31:49 +01:00
substantialnoninfringinguser
205a73917d [svn] Fix leftover from expo -> core rename, and add databaseReset.py to README.txt 2009-07-02 22:31:28 +01:00
substantialnoninfringinguser
2c2f11be39 [svn] 2009-05-19 06:32:42 +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
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
8916b460e1 [svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8255 by aaron @ 2/23/2009 4:16 AM
2009-05-13 05:55:00 +01:00
substantialnoninfringinguser
24dc7c5a0c [svn] Photo file handling and mugshots parsing sorted.
Made URL settings more relative, less redundant.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
2009-05-13 05:53:37 +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
d25fd97864 [svn] 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.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8244 by aaron @ 2/16/2009 8:31 AM
2009-05-13 05:52:15 +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
264594ed05 [svn] made index of people
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8224 by julian @ 1/24/2009 6:26 PM
2009-05-13 05:44:35 +01:00