2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 05:11:52 +00:00
Commit Graph

774 Commits

Author SHA1 Message Date
1f656b2101 properly turn off automagic entrance creation 2023-07-26 01:23:49 +03:00
fab7adf079 Cleaning up entrance importing robustly 2023-07-26 00:14:46 +03:00
5ce21564fc Remove unused field on survexstation class 2023-07-25 18:56:13 +03:00
31c815eeb0 bugfix in error message 2023-07-24 17:33:39 +03:00
c31615b1ff clean up after Mark changed things a bit 2023-07-24 15:26:36 +03:00
3bd7684d4b formatting terminal o/p 2023-07-24 14:24:53 +03:00
64fa602a07 ignore /subsections/ files 2023-07-24 14:24:39 +03:00
9f2b77bf1d More compact parsing report to terminal 2023-07-24 13:14:42 +03:00
9473b22bd9 detect non-ISO dates in JSON and from user and fix 2023-07-23 23:30:19 +03:00
3ea014ec57 add new *team role 2023-07-23 22:01:01 +03:00
387bdf4f91 shorter msg 2023-07-14 11:20:57 +02:00
127002d736 more entries 2023-07-13 21:36:48 +02:00
Expo laptop Crowley
a5968121a0 add DEPRECATed SURVEX FILES TO IGNORE LIST 2023-07-12 22:04:46 +02:00
5eb6ef4d31 more synonyms 2023-07-12 16:44:45 +02:00
Expo laptop Crowley
8ff438942d handle shortform months and days in svx file 2023-07-10 12:49:14 +02:00
Expo laptop Crowley
b3e2f34960 hack fix 2023-07-10 10:33:57 +02:00
Expo laptop Crowley
d0ccc46260 better test & msg 2023-07-10 10:03:23 +02:00
Expo laptop Crowley
5a7f197bcb hack to make server reset quickly 2023-07-10 09:24:11 +02:00
Expo laptop Crowley
4d48dd4386 Logbook debugging 2023-07-09 11:30:50 +02:00
Martin Green
3359889d97 Better attempt at creating a default url for caves created by svx files 2023-07-08 17:56:49 +02:00
Expo laptop Crowley
7b8e93cdb5 menus and logbook 2023-07-05 21:54:25 +02:00
Expo laptop Crowley
4158f5ba63 add 2023 2023-07-05 20:17:08 +02:00
Martin Green
a0fcb78e95 Removed kataster area for unoffical numbers of pending caves. Added .html to urls of pending caves. 2023-07-05 18:21:15 +01:00
Philip Sargent (laptop)
ef467ad481 Making the dummy entrance thing clear 2023-05-02 17:42:58 +03:00
Martin Green
c50236575f Dummy entrances were being written to a global variable, recording that they have a filename. But the filename was not written. This was then causing an exception when the user asked to edit a cave, leading to all entrances being reread. Obviously the dummy entrances file ould not be read.
PS. Do we really want to reread all entrances when we start editing a cave?
2023-04-30 21:06:57 +01:00
Martin Green
941100a8a3 Previously if a cave was found without an entrance an entrance was added to the database. However as this was not also added as a file, the new entrance could not be edited via the web interface. Without an entrance being made, they can still be added. 2023-04-30 19:03:09 +01:00
8aec40f951 todo 2023-04-22 23:27:06 +01:00
c5a9bdc724 xml parser attmpt retract 2023-04-22 23:15:50 +01:00
30ef427b90 refactor cave import 2023-04-22 22:05:12 +01:00
02e46ed723 Remove uneeded print 2023-04-22 03:35:07 +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
2541766dd5 typo 2023-04-05 20:42:19 +01:00
4d8cb82ef9 initial refactoring 2023-03-31 12:19:22 +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
860ce6b065 Creates new cave from survex file upload 2023-03-24 00:54:26 +00:00
8b5887a87a Allows creation of new svxfile with unknown cave 2023-03-23 21:26:16 +00: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
5a90e7b727 fix more twiddly variations of QMs 2023-03-18 03:03:06 +00:00
d64948749e more QMs parsed correctly 2023-03-18 00:57:40 +00:00
7345e3a328 Much QM re-engineering 2023-03-17 20:01:52 +00:00
3011e7b114 Adding QM JSON export 2023-03-16 21:06:52 +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
d0a05af9c6 Now inheriting *date from parent survexblock 2023-03-13 19:44:39 +00:00
83dc9e6c09 Move code closer to related code 2023-03-13 19:01:30 +00:00
7aeffff00c Better error msgs for poorly formatted QMs 2023-03-13 16:31:42 +00:00
b88b142332 fixing bad splay detection 2023-03-12 00:35:37 +00:00
859a28b4ee 1979 logbook parsing now works 2023-03-06 22:30:07 +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
8fc25de794 Initial attempts at saving edited survex file 2023-03-05 23:06:06 +00:00
6ab7a340e2 Now 99 tests 2023-03-03 15:15:17 +00:00
1cb81cbb09 Duplicate survex files in lists all done properly 2023-02-28 18:52:04 +00:00
dc03016dbe clean up de-duplication code 2023-02-28 16:18:29 +00:00
6de4fa66a2 Initial add of On This Day links to svx file page 2023-02-26 22:13:37 +00:00
3d38611e4f new test for logbook 2023-02-24 20:21:06 +00:00
bc9306fc1b str() needed with python 3.11.0rc1 & added try/execept 2023-02-24 17:21:56 +00:00
4358e6440a remove unneeded warnings 2023-02-11 23:03:30 +00:00
709b720be9 Update URLs to django documn version 2023-02-10 00:05:04 +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
13f0c6f988 * prefix documented 2023-02-02 15:40:50 +00:00
9d1c0ac395 Setting wallet dates earlier in the import process 2023-02-01 23:43:05 +00:00
76ed801077 Minor bulk create tweak 2023-01-31 01:37:00 +00:00
241dde3a84 Bulk_create working for team on a survexblock 2023-01-31 00:39:30 +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
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
3742e0f367 fixing Sunday display on calendar 2023-01-30 15:28:11 +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
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
432be660a4 separated out Model for wallet to its own file 2023-01-29 16:23:58 +00:00
071f68080c Inherit *team to anonymous survex blocks 2023-01-29 01:30:10 +00:00
03fa5f5548 compiling more regexes 2023-01-28 21:17:16 +00:00
0d9d307490 refactor to reduce db hits and fix *team 2023-01-28 21:00:38 +00:00
e6fd1f0ec5 Collect dataissues and write to db all at once 2023-01-28 15:10:39 +00:00
2704fc42d4 faster db creation, safer file reading with 'with' 2023-01-28 14:04:32 +00:00
d9a4069662 moved aliases to people module, faster db too 2023-01-28 14:03:46 +00:00
9e71be8169 refactored, global removed 2023-01-28 13:14:54 +00:00
db0504057b no search before db object creation: faster 2023-01-28 11:45:30 +00:00
e4c804b305 refactoring author checks 2023-01-28 10:47:25 +00:00
e01bd39609 refactored logbooks parser 2023-01-27 23:21:07 +00:00
6565b3f9c4 refactored, faster deletion prior to loading 2023-01-27 17:41:10 +00:00
2fee216e80 Remove logdataissues from TROG 2023-01-27 17:24:31 +00:00
a321625f35 fix number of entries expected 2023-01-26 21:52:56 +00:00
0c4ce6dc3c deleted old parser code 2023-01-26 21:33:17 +00:00
733765802e reformatted all old logbook formats 2023-01-26 21:33:06 +00:00
1be3a3892c ruff removed unused imports 2023-01-19 21:34:09 +00:00
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
1b70ccea3e consistent tests with logbooks junk removal 2023-01-16 19:52:05 +00:00
822965ebe5 remove %s old formatting style (last bits) 2023-01-02 22:26:33 +00:00
5bbb363f12 Adding docstrings, deleting unused code 2022-12-23 23:32:59 +00:00
194470841e logbooks correct numberss of entries expected 2022-12-23 22:13:43 +00:00
a72c2bd96a Using Path() wherever possible in localsettings.py 2022-12-22 16:04:16 +00:00
f23764c486 diagnosing missing entrance file 2022-12-22 00:56:46 +00:00
ec040824f6 fix frontmatter/endmatter 2022-12-21 02:05:26 +00:00
517da57a0c All broken logbooks now parsing correctly. 2022-12-20 23:48:56 +00:00
5ee3ebad3e converting 1988 logboog 2022-12-20 21:53:56 +00:00
05df2e084c converting 1987 logbook 2022-12-20 19:59:36 +00:00
dc3a61addd convert old logbooks to modern format 2022-12-20 16:38:32 +00:00
9169abdb05 2019 blog edits 2022-12-20 15:18:07 +00:00
f24f283a07 attempted speedup, explicit dates wallet objects 2022-12-20 00:07:55 +00:00
bb14c94ab1 Updates to make 2018 blog merge work (faster) 2022-12-19 20:13:26 +00:00
7e9bb73777 Vital fix to stop parsing terminating too early 2022-12-19 11:38:34 +00:00
43a98b4421 Not quite getting all the blog post contents 2022-12-19 00:33:32 +00:00
f1d5df9933 fix author display for logbook entry 2022-12-18 21:20:30 +00:00
8ce86aabee strip spaces from titles 2022-12-18 20:36:11 +00:00
d1b94763b4 Fixing wiki-parsing for 2009 logbook 2022-12-18 19:33:56 +00:00
73b710d53f fix more logbook parsing 2022-12-17 17:05:55 +00:00
0a4471e039 Fixed round-trip import-export-import bugs 2022-12-17 03:02:08 +00:00
f80e4efed8 parse several UK caving blogs per year - working 2022-12-16 19:57:56 +00:00
5e9fd7fd77 bug in python 3.9? 2022-12-15 01:06:54 +00:00
5cc6c26606 blog parsing working 2022-12-15 00:35:48 +00:00
cb50528e2d exptl parse UK Caving blog 2022-12-14 23:46:14 +00:00
0e47909704 tidy and comments 2022-12-10 13:00:57 +00:00
cabcada0b8 2003 logbook export/re-import as now HTML format 2022-12-09 23:45:07 +00:00
17b2b7b89c fix comments and 2019 LB parsing 2022-12-07 18:22:09 +00:00
1eab261b30 fix bugs made visible by py 3.11 2022-11-23 21:59:42 +00:00
Philip Sargent
45a640dfe9 Convert .format() to f-strings 2022-11-23 10:41:14 +00:00
Philip Sargent
ca9a3b5c7b tidy up 2022-11-23 10:36:02 +00:00
Philip Sargent
0b32d51ba3 bugfix 2022-11-23 00:49:47 +00:00
Philip Sargent
1a9e17a7e8 remove entry-type and tidy cache bits 2022-11-23 00:36:44 +00:00
Philip Sargent
259f85742a moved parser settings 2022-11-21 16:47:25 +00:00
Philip Sargent
a795707552 cache tidy and move settings into parser 2022-11-21 16:41:52 +00:00
Philip Sargent
bcb61f9cd9 remove cache and setdatesfromlogbook 2022-11-21 16:26:30 +00:00
Philip Sargent
4260b0f092 Removed misguided ObjStore as we do need multiuser db 2022-11-21 00:04:33 +00:00
Philip Sargent
4514eda311 make compatible with python 3.11 as well as 3.10 2022-11-18 20:42:03 +00:00
Philip Sargent
725c5ad0cd Updating comments 2022-11-17 01:24:39 +00:00
Philip Sargent
0b89979418 bug found by python 3.11 2022-11-15 23:56:35 +00:00
Philip Sargent
43bf2620f1 dump3d --legs future possibility 2022-11-15 22:25:39 +00:00
Philip Sargent
e0ac09d5ec add 'lastvisit' field to entrances, for the date 2022-10-12 23:12:55 +03: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
8c8b6966a7 sort output, accept more comma use 2022-10-10 00:28:57 +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
55bc042798 bugfixes 2022-10-08 00:48:21 +03:00
Philip Sargent
4e9680a3ad big changes to cope with survexblock not yet dated, no *date yet 2022-10-07 23:48:41 +03:00
Philip Sargent
f51d1e114e small chnages to name resolution 2022-10-07 23:47:05 +03:00
Philip Sargent
c76cd38d76 use generator when reading individual survex files too, saves anothe 6MB 2022-10-07 11:41:46 +03:00
Philip Sargent
b4c4f2aefc reduce mem use by 21.2MB by using a generator 2022-10-07 10:57:30 +03:00
Philip Sargent
70709c505c Fixing bugs and better error msgs 2022-10-06 21:02:15 +03:00
Philip Sargent
8d08a67302 strip spaces in pending caves list 2022-10-06 12:51:43 +03:00
Philip Sargent
29c5c82337 polishing outputs for importing unseen survex files 2022-10-05 23:18:11 +03:00
Philip Sargent
7e47fe1f30 Parse all files, not just those in the *include tree 2022-10-05 21:11:18 +03:00
Philip Sargent
9e5bdace2c make cache work even if timestamps wrong 2022-10-05 21:10:05 +03:00
Philip Sargent
a6e60c0bf7 working on loading all the non*inlcuded svx files 2022-10-04 00:00:55 +03:00
Philip Sargent
c8163ab0cd fix bug for wallet with empty fpath 2022-10-03 21:18:35 +03:00
Philip Sargent
b60e1f2493 rename data issue tag 2022-09-27 21:37:45 +03:00
Philip Sargent
78a62a1551 error msg was incorrect. fix. 2022-09-26 00:18:41 +03:00
Philip Sargent
2f64e2d4c1 FIx pending caves which had got a bit garbled 2022-09-25 21:43:00 +03:00
Philip Sargent
f3ecdd6d87 Cleaner monitoring output when importing wallets and scans 2022-09-24 00:17:51 +03:00
Philip Sargent
6e3fdd35c1 Replaced maintenance headache with cleaner folder walking 2022-09-23 23:43:34 +03:00
Philip Sargent
97b0ce8c96 removing technical debt, replace convoluted code 2022-09-23 00:49:40 +03:00
Philip Sargent
aa20692ad6 bugfixes and enabling older wallets to be found and listed 2022-09-22 22:41:42 +03:00
Philip Sargent
11b1d41a55 increase entires to 64 2022-09-22 00:22:09 +03:00
Philip Sargent
36995ec051 handling survex files not linked in completely 2022-09-20 02:36:40 +03:00
Philip Sargent
61f9863a06 bug fixes and coping with a list of cave ids in JSON 2022-09-20 01:02:06 +03:00
Philip Sargent
0611c3f00f documn improvements 2022-09-19 21:54:51 +03:00
Philip Sargent
2648bada30 remove URL field from wallet as seen and edited 2022-09-19 20:55:34 +03:00
Philip Sargent
d2c6c4d7fb find perps guilty of bad *ref brhaviour 2022-09-18 23:53:04 +03:00
Philip Sargent
68865a80ef Fixing bad date parsing, better warning msgs 2022-09-16 22:54:22 +03:00
Philip Sargent
f12d0bd580 Remove unneeded code now svx files have been edited 2022-09-15 22:55:16 +03:00
Philip Sargent
0853bbdd19 Many fixes and speedups 2022-08-30 17:58:49 +03:00
Philip Sargent
6daa96b69e correcting output comment 2022-08-30 17:30:46 +03:00
Philip Sargent
ab184bccf3 comment updates 2022-08-25 16:31:38 +03:00
Philip Sargent
79672dd4b3 bugfix 2022-08-25 16:12:13 +03:00
Philip Sargent
760abe1a9e cope with swapped people/title 2022-08-25 15:54:00 +03:00
Philip Sargent
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
96b2c6c9ed fix url for cave edit page in error msg 2022-08-24 14:15:40 +03:00
Philip Sargent
41c68aef26 detecting empty wallets where we only have JSON and no files 2022-08-16 20:02:28 +03:00
Philip Sargent
aaba4fd2a9 minor refactoring 2022-08-16 17:42:37 +03:00
Philip Sargent
3c13f62bd1 re-fettled scan upload, creates Wallet object earlier 2022-08-14 23:40:56 +03:00
Philip Sargent
284e044a03 Fix wallets scan upload faults 2022-08-14 22:52:14 +03:00
Philip Sargent
b093d00ff4 match therion files to wallets, scans names therein 2022-08-14 01:47:53 +03:00
Philip Sargent
8e93680146 personrole is not just about roles 2022-08-13 23:57:57 +03:00
Philip Sargent
edfba8d355 git commit edits to wallet data 2022-08-13 23:56:56 +03:00
Philip Sargent
25c425cff8 QMs grayed out for survex files 2014 and earlier 2022-08-07 23:41:45 +03:00
Philip Sargent
f33c6cc057 bugfix in new wallet 2022-08-06 22:23:39 +03:00
Philip Sargent
0fd3cf43e8 formatting 2022-08-01 17:32:49 +03:00
Philip Sargent
bc3da1182b starting jsn population when we know the data 2022-07-29 17:49:07 +03:00
Philip Sargent
7872e98cb2 fixing pending caves system to be cleaner 2022-07-28 18:36:57 +03:00
Philip Sargent
c29e240c2b creating new wallet now copies nd commits 2022-07-28 18:36:40 +03:00