2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-19 06:52:17 +00:00
Commit Graph

1215 Commits

Author SHA1 Message Date
8dcae6437e Comments chnaged to be more accurate 2023-09-30 20:35:40 +03:00
904b6309cf First attempts at reforming the FirstnameSurname parsing 2023-09-29 22:00:10 +03:00
e98c63f51c Fix odd glitches in cave parsing 2023-09-28 01:01:32 +03:00
7f9f598f11 comment updates 2023-09-27 21:44:04 +03:00
421b47c137 bugfix 2023-09-27 21:43:35 +03:00
0d5297f08c lat/long values now persistent on Entrances 2023-09-27 00:38:07 +03:00
505eb6475e pending caves aliases stuff 2023-09-26 19:44:06 +03:00
d4cf76da40 slightly cleaning up slug/areacode/unofficial_number mess 2023-09-26 01:10:50 +03:00
18e1775cff fix for eastings page test 2023-09-23 01:45:38 +03:00
9c05cb6af0 rotatable images & text 2023-09-23 00:48:35 +03:00
017f916ef9 Entrance locations showing lat long screwups 2023-09-16 22:46:17 +03:00
a85f859f88 add WGS84 lat/long entrance locations 2023-09-16 21:12:49 +03:00
81b5198cd1 fix code so tests work 2023-09-16 19:53:39 +03:00
9db0b2a191 recognise old cave id codes in old wallets "1623-" 2023-09-16 13:53:05 +03:00
3390f17aa4 .3d cave file links 2023-09-15 22:41:02 +03:00
1effc10e3f tidyup of image rotate 2023-09-14 15:08:10 +03:00
85487efee3 debug mogrify 2023-09-14 14:24:36 +03:00
db3d1ff4ef ROTATE image option 2023-09-14 14:15:16 +03:00
1085a14b92 comments 2023-09-14 13:40:33 +03:00
0295fce110 logic rearranged 2023-09-14 13:40:19 +03:00
70dd61b2ba sanitize filenames 2023-09-13 18:46:10 +03:00
33a485d207 notable caves fix 2023-09-13 18:45:59 +03:00
d323ff2700 debugging Cave page links.. 2023-09-11 20:38:14 +03:00
2f6017d6d3 testsuite passes - Area removed 2023-09-10 15:55:01 +03:00
ab79a43afa Removed class Area, use Cave.areacode Cave.subarea 2023-09-10 15:42:36 +03:00
327b1923b0 Cleaning auto Cave creation from survex file detection 2023-09-10 02:06:38 +03:00
5a191ee554 Big refactor of cave lookuo & creation. Works. 2023-09-08 19:51:04 +03:00
28d1092956 Removing unneeded svx from parse list 2023-09-08 01:26:01 +03:00
5fc5c1285a bugfix - bad variable 2023-09-07 21:47:40 +03:00
8b76cad15a EPOCH = 1970-01-01 2023-09-07 21:47:02 +03:00
6d5cee7f6a tidy 2023-09-07 00:42:26 +03:00
2c5ebde308 Survex directories report tidied 2023-09-07 00:01:03 +03:00
69340db438 SurvexDirectory removed from active code 2023-09-06 22:58:14 +03:00
1ddb8248df SUrvexDirectory no longer necessary 2023-09-06 21:38:45 +03:00
0dc0e27519 moving primary survex file to each survexfile 2023-09-06 17:19:20 +03:00
83d058221d Fixed survex file list for one or more caves 2023-09-06 13:20:29 +03:00
cc9f425fb5 Ongoing work to remove SurvexDirectory as a concept 2023-09-05 23:14:48 +03:00
8c721e905a New SurvexDirectory report 2023-09-05 21:46:10 +03:00
8e2990ca7a validate year in logbook entry form 2023-09-05 17:19:09 +03:00
220e1327d7 validate author of trip on editing 2023-09-05 15:49:12 +03:00
0ea8fadaeb moer people/logbook improvements 2023-09-05 14:35:56 +03:00
f3d5a389eb hide warning msgs about pre 1999 wallets 2023-09-05 13:29:49 +03:00
2506517e17 Keeping *person and guests such as Karl in the list 2023-09-04 20:12:09 +03:00
d3ac321d38 fix bugs on reload of logbook 2023-09-04 18:56:32 +03:00
3a04a8490e debugged lbe edit tests 2023-09-04 00:25:35 +03:00
2c89cdc1b9 login fix for protected pages in tests 2023-09-03 23:28:36 +03:00
eb7a1efea5 Path seems newly fragile re int rather than str 2023-09-02 19:43:50 +03:00
a4f676fd32 bugfixing 2023-09-02 19:23:22 +03:00
1a8bc17f80 Fixed parsers 2023-09-02 17:49:37 +03:00
c9729c046c Adding field to logbookentry 2023-09-02 14:49:43 +03:00
34064972e9 Still one test failing when it shouldnt 2023-09-01 21:50:03 +03:00
5a7eda0968 new test for lbe 2023-09-01 21:35:26 +03:00
98bc6007a5 fix tests to match code chnages 2023-09-01 21:14:19 +03:00
33a08bed4f bugfix and remove swapped order for title/people 2023-09-01 20:57:23 +03:00
98412c140d more robust tripid labelling 2023-09-01 20:31:19 +03:00
1cf02afec9 add tempest nickname 2023-09-01 19:34:05 +03:00
e209a9bb37 bugfix, name[0] may not exist 2023-08-31 19:17:44 +03:00
c29c12ea76 Edit Logbook Entry mostly working 2023-08-31 18:55:20 +03:00
df86103407 cosmetic 2023-08-30 21:29:51 +03:00
d48163f167 update comment 2023-08-30 21:17:25 +03:00
f23ea0ce4b edits today mean test needs fixing 2023-08-26 18:53:15 +03:00
d08a6aa204 Nicknames preserved, date checked 2023-08-26 18:39:29 +03:00
93397a774f fix _edit access loophole 2023-08-25 22:08:04 +03:00
f2a76da7e2 fix error in test suite when full reset has not been done 2023-08-25 21:49:05 +03:00
3d51588cc1 update test to match code 2023-08-11 07:43:47 +03:00
c44dea4d2b More comment, to-do 2023-08-10 23:36:56 +03:00
d3c1736119 extending logbook entry edit 2023-08-10 23:17:03 +03:00
da8e22c856 more 2023-08-08 19:24:18 +03:00
741754e676 some input validation 2023-08-08 19:23:55 +03:00
a4f84f0812 better placeholdering 2023-08-08 01:27:20 +03:00
9e9c24ad44 better placeholder/value setting 2023-08-08 01:17:36 +03:00
b1a5251768 Format new logbook entry 2023-08-08 00:43:12 +03:00
0b7a9cf03e suppress pointless msg 2023-08-07 23:51:35 +03:00
9269d1ec52 Logbook entry initial form 2023-08-06 13:47:09 +03:00
1baf528d0a better msg 2023-08-05 23:30:46 +03:00
12aa6ced86 length of unreference cave survey added 2023-08-05 14:15:35 +03:00
126aaa0633 add url to wallets 2023-08-05 13:14:45 +03:00
33026ca9ea who to blame 2023-08-05 12:57:38 +03:00
7df2d44748 wild survex file report 2023-08-05 12:43:06 +03:00
51298786c3 debugging entrance creation, single ent works 2023-08-04 23:33:49 +03:00
1375b34cbe bugfix2 2023-08-04 16:17:52 +03:00
2c74a7317d bugfix 2023-08-04 16:11:35 +03:00
3b9a2b990d bugfix 2023-08-04 10:29:20 +03:00
2c509d085e allow editing ent letter if blank on many ent caves 2023-08-04 09:29:25 +03:00
bed663a031 trying to enable eidting of blank letter for entrance 2023-08-04 09:08:18 +03:00
e101f4ed2f trying to isolate bug in letter setting on ents 2023-08-03 16:11:46 +03:00
a0f85454f8 detecting orphan cave ids and adding to pending list 2023-08-02 18:23:04 +03:00
c76c09fced remove excess prints 2023-08-02 15:48:36 +03:00
efa40b47ca change of id for this class of data issue 2023-08-02 15:47:24 +03:00
6bca75b877 NOEDIT fixed 2023-08-02 13:41:12 +03:00
585eb534a9 Entrance locations explanations 2023-08-02 10:17:48 +03:00
7fc058b1da return to correct wallet 2023-07-31 22:00:46 +03:00
8d9b320d89 filesize now shown 2023-07-31 16:16:43 +03:00
89c1c65340 hack wallet scan rename job 2023-07-31 15:49:54 +03:00
5f07f234ef electronic surveys still need notes 2023-07-29 18:21:07 +03:00
4a7c14f8dc remove unused page 2023-07-27 14:40:52 +03:00
d93133c338 ambiguous aliases removed more thoroughly 2023-07-27 00:38:47 +03:00
6482aa697f helpful comments on form 2023-07-26 17:38:19 +03:00
0706d5dc77 fix entrqnce edit bug 2023-07-26 16:54:37 +03:00
72a6b091e6 make more robust 2023-07-25 22:14:13 +03:00
af552a3d62 better detect unknown cave identifer strings from users 2023-07-25 21:07:13 +03:00
5ce21564fc Remove unused field on survexstation class 2023-07-25 18:56:13 +03:00
7d4ca5dae2 Make robust against duplicate objects 2023-07-25 18:55:42 +03:00
3c78ab79ca better fix for variant date formats 2023-07-25 01:34:02 +03:00
748cb91a20 lengthen url field, i hope 2023-07-25 01:34:02 +03:00
Martin Green
8463f8947e Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-24 23:03:47 +01:00
Martin Green
380565c6f5 save connection between cave and entrances, before writing out the cavedata file 2023-07-24 23:03:12 +01:00
9473b22bd9 detect non-ISO dates in JSON and from user and fix 2023-07-23 23:30:19 +03:00
f76c22e843 moving dev configs to _deploy/ 2023-07-17 19:25:40 +03:00
dc06744444 fix exception? 2023-07-14 11:26:47 +02:00
26e96839e4 stop crash onloading wallet with blank caveid 2023-07-14 11:22:48 +02:00
4e4824546a stop crash on live system 2023-07-14 11:21:49 +02:00
b650095588 calendar S T colour >10 per date 2023-07-14 11:13:06 +02:00
761a71930b hack to stop crash 2023-07-13 22:20:01 +02:00
Martin Green
380fe8cc32 Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-13 12:35:00 +02:00
Martin Green
bdb5e3208b Rotate and reflect images, as specified in EXIF whilst uploading 2023-07-13 12:34:52 +02:00
Martin Green
c119c99308 removed print statement 2023-07-13 12:33:55 +02:00
Mark Shinwell
5f6359694d Update test to reflect change in loser repo 2023-07-12 14:12:40 +02:00
Martin Green
67361fa66c Merge branch 'master' of ssh://expo.survex.com/home/expo/troggle 2023-07-10 17:00:56 +02:00
Martin Green
b27852c1f3 redirect to actual login page 2023-07-10 16:55:09 +02:00
Expo on server
086537cb56 =Added string to caveslugs so admin interface works. Added explanation for the rational for cave slugs. 2023-07-08 23:45:32 +01:00
Expo on server
beab42323b Added CaveSlugs to Admin 2023-07-08 23:43:57 +01:00
Expo on server
3d43c0ec12 Allow for parent directories to be created when created photos. 2023-07-08 22:42:06 +01:00
Martin Green
ad37a82713 git comitting allowing files to be comitted in different directories. 2023-07-05 21:10:05 +01:00
Martin Green
ffed6e3ba6 convert uploaded images to RGB so that it can be saved as jpg 2023-07-05 21:08:51 +01:00
Martin Green
63599cb27a Removed ability to add other caves entrances to a cave. 2023-07-05 18:22:08 +01:00
Martin Green
410a285085 Bug fixes to allow adding of a new cave. No longer ask users about filenames or urls. 2023-07-05 17:43:57 +01:00
Martin Green
c4095eb336 Have images saved to correct place, when edited in the cave or entrance view. etc 2023-07-05 13:18:02 +01:00
Martin Green
929f6732d0 Add some sort of orderinng 2023-07-03 08:04:26 +01:00
Martin Green
b91223da66 Add list of entrances 2023-07-03 08:00:03 +01:00
969ed6cce5 added 1627 caves to 'caves'page 2023-05-20 22:47:09 +03:00
Martin Green
43724f1cf6 When reloading a cave, do so from cave.filename, rather than inorrectly assuming the cave is named after its slug 2023-05-08 23:09:15 +01:00
Martin Green
7d140af87a Do not rename caves when saving 2023-05-08 22:34:45 +01:00
Martin Green
f7fca58c57 Start of creating kmz file, with entrance photos and links to expo.survex.com 2023-05-08 01:10:43 +01:00
Philip Sargent (laptop)
ef467ad481 Making the dummy entrance thing clear 2023-05-02 17:42:58 +03:00
Philip Sargent (laptop)
175307773b More fixes for laptop 2023-05-02 15:28:28 +03:00
Martin Green
783154d24a Restored check of git status after a committ, but only for the one file being committed 2023-05-01 22:06:48 +01:00
Martin Green
896af43994 kml file output for google earth etc 2023-05-01 00:01:41 +01:00
Martin Green
2ee63a9804 If a cave is made with no entrances, redirect to a new entrance form for the cave 2023-04-30 21:42:03 +01:00
Martin Green
c7b3e8aff0 Added an ordering of entrances 2023-04-30 21:41:17 +01:00
Martin Green
e8d1265ee4 Be more specific about what is being commited and do not check for unadded changes, and then through an error at the user, which they are unlikely to understand. 2023-04-30 21:04:05 +01:00
Martin Green
10ff8a5aab Fixed errors when creating new caves and entrances via the website. Moved slug logic to forms (previously checked in). This allows slug uniqueness to be validated in the form 2023-04-30 19:05:57 +01:00
Martin Green
374caa0d9a Fixeed spelling error in variable name 2023-04-30 19:01:07 +01:00
Martin Green
82aaa2b523 Improved cave form, layout text and validations 2023-04-30 19:00:22 +01:00
Martin Green
31a60ce85c For a cave, force users to enter are and have a unique URL. Cope better if area not defined 2023-04-30 18:58:41 +01:00
Martin Green
ed9f7b03bf Have entrance coordinates displayed to web pages. (Requires expo web entrance survey points to start with 1623 or 1626) 2023-04-30 00:59:58 +01:00
Martin Green
0b566575f3 Change uploaded images to jpg to png, for much smaller files 2023-04-29 22:49:26 +01:00
30ef427b90 refactor cave import 2023-04-22 22:05:12 +01:00
94b8b357fb Fix entrance edit too, saving slug now 2023-04-22 03:26:53 +01:00
2ed66fe3d0 edit cave reads from HTML file not just db 2023-04-22 01:24:32 +01:00
116cfc7c6e bad tests. 2023-04-06 00:57:19 +01:00
f15555a3bd more tests 2023-04-06 00:51:04 +01:00
dcfff1ede7 tests for QM pages 2023-04-06 00:16:44 +01:00
d3d983eedb QM check-box report for open leads 2023-04-05 23:13:12 +01:00
e002a634ff remove obsolete setting, add PHOTOS_ROOT 2023-04-05 20:42:09 +01:00
489dd157b6 context processor documn link 2023-04-05 20:41:34 +01:00
0a76acd664 test checked 2023-04-05 12:46:10 +01:00
9ffe3f690b tidy up entranceSlug all now deleted 2023-03-28 20:30:00 +01:00
e7d9e9402a bugfixes 2023-03-28 20:05:38 +01:00
9a28e93ac6 EntranceSlug removed from data model. 2023-03-28 19:26:37 +01:00
5738da8566 cached_slug str now a .slug field & pending fixed 2023-03-28 19:08:05 +01:00
bbc13c4eb9 remove 'primary' concept from entrance slugs. tested. 2023-03-28 17:08:55 +01:00
6ca5d5bfa8 debug ent report 2023-03-28 15:37:25 +01:00
2091eb8e8b remove unused versionControlForm 2023-03-28 14:19:06 +01:00
770edd6391 Survex editor now parses edited files 2023-03-23 19:05:25 +00:00
562ef48f19 re-parsing survex file when editing 2023-03-23 01:17:38 +00:00
70d6d9eb77 error msgs improved 2023-03-22 23:30:05 +00:00
2332bfdc57 comment to resolve confusion 2023-03-22 23:29:40 +00:00
1db7c5ffea change on_delete to cascade for blocks in a file 2023-03-22 23:29:12 +00:00
838b358a4a chnage template comment 2023-03-22 23:28:26 +00:00
dd32114698 delete test upload file after test 2023-03-22 17:57:48 +00:00
5f46d8fdc5 Fix bugs 2023-03-22 15:18:16 +00:00
ad48851118 re-enable login restriction on wallet create 2023-03-22 15:04:34 +00:00
ead3f8dc8b fix broken tick-lists in wallets 2023-03-21 18:23:07 +00:00
6b3cb9f02e samedate for all wallets on wallet edit form 2023-03-21 14:56:34 +00:00
435f3cf00b fixed url glitch, added parent url 2023-03-21 14:29:15 +00:00
7caf1690c6 fix download .3d file 2023-03-21 12:56:51 +00:00
9489b9209d obviate meaningless error messages 2023-03-18 20:32:35 +00:00
5a90e7b727 fix more twiddly variations of QMs 2023-03-18 03:03:06 +00:00
7345e3a328 Much QM re-engineering 2023-03-17 20:01:52 +00:00
de54576d11 Fix QMs reports, remove V grade 2023-03-17 14:33:30 +00:00
3011e7b114 Adding QM JSON export 2023-03-16 21:06:52 +00:00
a7660c8ec7 QM report updating 2023-03-14 16:11:37 +00:00
934a19b879 updated .svx template 2023-03-14 16:10:57 +00:00
c247636c4c Working on QMn TICK lines again 2023-03-14 03:27:05 +00:00
85fab88ac9 Fixing inherited *date into sub-blocks 2023-03-14 02:12:28 +00:00
b428a87f1a Better debug messages 2023-03-13 20:27:27 +00:00
94dd0fe1fd documn. url reverse() tests 2023-03-12 23:40:11 +00:00
45fcaac47d test revers() function 2023-03-12 16:21:31 +00:00
35e9eb558d Identified survey length discrepencies 2023-03-12 01:09:17 +00:00
b88b142332 fixing bad splay detection 2023-03-12 00:35:37 +00:00
2c36666d41 tidy test fior git clean 2023-03-08 18:29:14 +00:00
301fa1fce1 re-enable lookup() on survexblock objects (again) 2023-03-08 18:02:00 +00:00
e71939fe00 restore lookup() function 2023-03-06 22:30:36 +00:00
432759bfc1 Import new survexfile ONLY 2023-03-06 16:37:54 +00:00
94e145adce CASCADE fixes in data model 2023-03-06 16:37:38 +00:00
ccfc44a423 Saving new survex file parses contents. 2023-03-06 04:52:41 +00:00
8f3b329552 obscure bug empty directory inside empty directory 2023-03-05 23:55:00 +00:00
63dde36389 100th test 2023-03-05 23:17:11 +00:00
8fc25de794 Initial attempts at saving edited survex file 2023-03-05 23:06:06 +00:00
d5887e8f99 bloody bugs 2023-03-05 19:53:12 +00:00
b086348d38 Bugfixes for new survex file 2023-03-05 19:09:28 +00:00
4a2106183a Bugfix for new survex file 2023-03-05 18:20:18 +00:00
06ac840dd0 Needed for django 4.2 admin pages 2023-03-05 17:46:01 +00:00
6ab7a340e2 Now 99 tests 2023-03-03 15:15:17 +00:00
5c3927c25d all working, queries improved, date-ordered. 2023-02-27 22:23:24 +00:00
154722f765 logbook trips, and some wallets working. 2023-02-27 19:14:08 +00:00
6387de038b get events on same date.progress. 2023-02-27 16:42:08 +00:00
6de4fa66a2 Initial add of On This Day links to svx file page 2023-02-26 22:13:37 +00:00
394d94d5d6 Extended test 2023-02-24 23:12:44 +00:00
a3fc9a17ed New tests for parsing logbooks 2023-02-24 22:55:18 +00:00
3d38611e4f new test for logbook 2023-02-24 20:21:06 +00:00
d1dac92034 Now using HTTP status codes properly 2023-02-24 17:38:06 +00:00
709b720be9 Update URLs to django documn version 2023-02-10 00:05:04 +00:00
19d9942676 Django 3.0 deprecations removed 2023-02-09 20:54:55 +00:00
0740f9ea5a More todos 2023-02-08 23:37:00 +00:00
175e71facf Many many bugs fixed for >1 svx file on a wallet 2023-02-03 22:19:51 +00:00
c1231ff451 refactored and most recent wallet link fixed 2023-02-03 17:13:29 +00:00
e70d51e52b Made JSON visible on wallet edit page 2023-02-03 11:34:38 +00:00
f7d91b5929 todo updates 2023-02-02 22:02:16 +00:00
e94a24bbd4 to-do lists updates 2023-02-02 21:50:40 +00:00
e0a198bac5 Added 'Notes not needed' checkbox 2023-02-02 17:39:56 +00:00
25e00e02b7 Complete set of todo strings on webpage 2023-02-02 16:15:13 +00:00
9abfcdd091 re enable 2023-02-02 14:57:44 +00:00
18541de371 test file permissions 2023-02-02 14:51:20 +00:00
578f02db2d Better diagnostics from bad slug error 2023-02-02 11:19:46 +00:00
3b9695b4f3 spiders are asking for weird urls 2023-02-02 11:13:02 +00:00
9d1c0ac395 Setting wallet dates earlier in the import process 2023-02-01 23:43:05 +00:00
c7d88077ec renamed wallet form file 2023-02-01 21:58:48 +00:00
5798e8dcd5 make nav cope with missing wallets 2023-02-01 21:31:07 +00:00
5ae37eef82 Fix to not create an extra wallet 2023-02-01 19:31:29 +00:00
587ccff501 date handling now working for new wallet 2023-02-01 19:10:46 +00:00
8e51f3aff8 Dedicated 'Create' button for a new wallet 2023-02-01 17:21:33 +00:00
e38d29f33d menu change to go to latest blank wallet 2023-01-31 20:52:22 +00:00
3c7661836c New wallet goes to next available slot now 2023-01-31 20:28:39 +00:00
1f5b56a593 Wallet editor into separate file 2023-01-31 17:13:41 +00:00
3aca0d0c76 ruf cleanup imports, bigly. 2023-01-30 23:04:11 +00:00
e35fccea5d Removed unused properties and moving 2023-01-30 22:27:17 +00:00
7808005498 ran 'black' to reformat all the core files 2023-01-30 19:04:36 +00:00
a12f666e96 Remove unneeded Class ExpeditionDay 2023-01-30 16:42:56 +00:00
ebe86d73d4 Renaming class - step 3 complete 2023-01-30 16:27:01 +00:00
b29ff61871 Renaming class step 2 2023-01-30 16:18:19 +00:00
58f7cf72d4 renaming confusing Class, step 1 2023-01-30 16:07:44 +00:00
3742e0f367 fixing Sunday display on calendar 2023-01-30 15:28:11 +00:00
7d98980121 Fixing dates on expedition table 2023-01-29 22:11:00 +00:00
89d0e1723e fixing cyclic import problem 2023-01-29 21:45:51 +00:00
226cbb6b5c Fixed coloured T and S on expo calendar 2023-01-29 20:59:56 +00:00
a1c34f488d bugfix from rearranged model files 2023-01-29 18:17:43 +00:00
79bccade02 separated out ent locations from survex parser 2023-01-29 17:03:50 +00:00
5639435058 Moved Logbooks to separate model file 2023-01-29 16:47:46 +00:00