expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity
2,915 Commits 7 Branches 0 Tags 34 MiB
baf58a5433
Commit Graph

293 Commits

Author SHA1 Message Date
Philip Sargent
a72c2bd96a Using Path() wherever possible in localsettings.py 2022-12-22 16:04:16 +00:00
Philip Sargent
f23764c486 diagnosing missing entrance file 2022-12-22 00:56:46 +00:00
Philip Sargent
f24f283a07 attempted speedup, explicit dates wallet objects 2022-12-20 00:07:55 +00:00
Philip Sargent
45a640dfe9 Convert .format() to f-strings 2022-11-23 10:41:14 +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
43bf2620f1 dump3d --legs future possibility 2022-11-15 22:25:39 +00: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
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
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
a6e60c0bf7 working on loading all the non*inlcuded svx files 2022-10-04 00:00:55 +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
6e3fdd35c1 Replaced maintenance headache with cleaner folder walking 2022-09-23 23:43:34 +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
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
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
284e044a03 Fix wallets scan upload faults 2022-08-14 22:52:14 +03:00
Philip Sargent
8e93680146 personrole is not just about roles 2022-08-13 23:57:57 +03:00
Philip Sargent
7872e98cb2 fixing pending caves system to be cleaner 2022-07-28 18:36:57 +03:00
Philip Sargent
93622b111f obscure bug fixed for lines ;*include 2022-07-28 15:15:11 +03:00
Philip Sargent
dd0fcc28dd update todo strings 2022-07-27 23:24:53 +03:00
Philip Sargent
5007393536 better error handling 2022-07-23 20:05:58 +03:00
Philip Sargent
a1e538e93a making it work with 1626 no schonberg 2022-07-23 19:26:47 +03:00
Philip Sargent
7288bd9da3 add comment on point where it crashes 2022-07-22 13:42:04 +03:00
Philip Sargent
796dbf1438 more dead chicken waving 2022-07-21 21:52:10 +03:00
Philip Sargent
d058942084 revert, this was a bad idea 2022-07-20 21:04:59 +03:00
Philip Sargent
0a158db97d Trial QM tick mechanism in survex files 2022-07-20 20:47:29 +03:00
Philip Sargent
a215ebd62c fix QM regex for number and rearrange url code 2022-07-20 17:02:38 +03:00
Philip Sargent
549c1649b4 QMs now have working url to survexfile & tick description 2022-07-20 14:44:56 +03:00
Philip Sargent
145540caf5 more weirdness in circumventing MariaDB/Django misunderstandings 2022-07-17 16:08:01 +03:00
Philip Sargent
8aab01c126 cleaner zeroth cave setting 2022-07-15 16:44:02 +03:00
Philip Sargent
73e9ae54fa cleaner survexdirectory creation 2022-07-15 16:17:40 +03:00
Philip Sargent
b8355cbf8d fix bugs and tidyup in recent changes 2022-07-15 15:11:49 +03:00
Philip Sargent
86a18c3ebc catch nonUTF8 survex files, DataIssues url editor 2022-07-15 14:09:32 +03:00
Philip Sargent
278a84a485 better error msg 2022-07-09 01:54:48 +03:00
Philip Sargent
ca5586fc42 Report badly formatted ;QM lines 2022-07-08 20:08:42 +03:00
Philip Sargent
d3572e18c3 QM reports all working 2022-07-06 17:35:08 +03:00
Philip Sargent
7dc3cc3b91 fix for individual QM display from survex 2022-07-06 15:38:53 +03:00
Philip Sargent
da4d7d6d5e shorten slug to fit 2022-07-06 11:10:50 +03:00
Philip Sargent
0ea3ed1ef2 Not quite so broken QMs from survex files 2022-07-05 22:40:58 +03:00
Philip Sargent
2bd617b543 Fixed QM report for survex-imported QMs 2022-07-05 20:24:51 +03:00
Philip Sargent
7f16bca7f7 Better error messaged and url 2022-03-29 15:31:25 +01:00
Philip Sargent
42b615d16b survex legs bug fix 2022-03-23 20:05:38 +00:00
Philip Sargent
8fd4f818b5 better err text for mysterious error 2022-03-22 02:24:26 +00:00
Philip Sargent
f1b206ad34 fixing bugs after wookey session 2022-03-22 02:22:15 +00:00
Philip Sargent
f99ebf84e9 running cavern on svx files improved 2022-03-11 16:22:37 +00:00
Philip Sargent
d6cc32ee9a Detect more survex errors 2022-03-07 16:23:20 +00:00
Philip Sargent
3ac617431f Make .3d files in same dir as .svx 2022-03-06 01:29:45 +00:00
Philip Sargent
32377f4e6c Cave import & reports fixes 2022-03-05 12:20:26 +00:00
Philip Sargent
7f41017ce3 git merge failure caught in svx files 2022-03-03 00:26:04 +00:00
Philip Sargent
af50d4912d Catch error if unfixed merges in survex files 2022-03-01 01:30:09 +00:00
Philip Sargent
9b44ba3ef2 precompile regexes 2021-12-19 14:24:20 +00:00
Philip Sargent
64f89be6a9 docm .3d file generation for CaveView 2021-11-06 23:57:51 +02:00
Philip Sargent
c38aa357b7 Better error msg for overwriting 3d files 2021-11-05 23:51:10 +02:00
Philip Sargent
b461b87df6 fix unneeded runs of survex on survex mport 2021-11-05 22:59:54 +02:00
Philip Sargent
d374779c47 dwg upload and django admin extra search 2021-05-05 00:35:10 +01:00
Philip Sargent
fd95bb8198 split surveys->scans + drawings 2021-05-03 20:36:29 +01:00
Philip Sargent
03a5f5989e chipping away bug in personexpedition, remove role 2021-04-30 00:24:36 +01:00
Philip Sargent
49b9225b6e rename scansfolder to wallet 2021-04-26 19:50:03 +01:00
Philip Sargent
7f64670f36 reanme manyscansfolders to manywallets 2021-04-26 19:22:29 +01:00
Philip Sargent
0997fd0901 rename ScansFolder class as Wallet 2021-04-26 18:18:16 +01:00
Philip Sargent
72fa8a5883 Making entrances work for pending caves 2021-04-26 02:10:45 +01:00
Philip Sargent
f8b613e0aa prospect and moving code to better places 2021-04-17 01:41:06 +01:00
Philip Sargent
16ef4fa9fb split out prospecting guide code 2021-04-16 03:05:39 +01:00
Philip Sargent
27491c933a enabled mugshots & blurb in people pages 2021-04-15 17:51:01 +01:00
Philip Sargent
2f03f77ce4 rename function more accurately 2021-04-13 23:52:56 +01:00
Philip Sargent
daf58e9e45 replace assert() with message logging 2021-04-13 22:27:01 +01:00
Philip Sargent
0820d7c0dc Docstrings for all modules 2021-04-13 01:37:42 +01:00
Philip Sargent
267741fa8b fixing typos and changes in importing 2021-04-13 01:13:08 +01:00
Philip Sargent
7bc73d1ca8 move models_survex to models/survex.py 2021-04-13 00:50:12 +01:00
Philip Sargent
957169d9aa move models_caves to models/caves.py 2021-04-13 00:47:17 +01:00
Philip Sargent
b602f3ae13 creating core/utils.py 2021-04-12 23:58:48 +01:00
Philip Sargent
b7d54111ba Import Therion files too 2021-04-07 21:53:43 +01:00
Philip Sargent
8707e4a819 fix missing slug field in pending caves 2021-04-03 00:34:34 +01:00
Philip Sargent
7cccf4daf1 move *_views files to /views/* 2021-03-31 21:51:17 +01:00
Philip Sargent
9a91487375 pathlib for path management & cavelist fixes 2021-03-24 15:46:35 +00:00
Philip Sargent
7f37327bcd Fixing cave list webpage 2021-03-24 00:55:36 +00:00
Philip Sargent
5836c6ff90 Importing old logbooks 2021-02-06 00:18:48 +00:00
Philip Sargent
f131509c56 3dtopos to survexpos + comments 2020-07-20 22:53:26 +01:00
Philip Sargent
90dfa516da *team format updates 2020-07-09 18:06:03 +01:00
Philip Sargent
37620b4dbc *units factor x and feet 2020-07-08 00:00:56 +01:00
Philip Sargent
52afb9f466 units conversion not quite working 2020-07-07 02:46:18 +01:00
Philip Sargent
efc43b0863 *units in feet and metres, subcaves 2020-07-07 01:35:58 +01:00
Philip Sargent
d27a74c97b per svxfile debug printing enabled 2020-07-06 21:46:19 +01:00
Philip Sargent
8530b0643d person attribution of surveyed length working 2020-07-06 01:24:43 +01:00
Philip Sargent
3f9971d2ee title and wallet folders working in /survexfile/258 2020-07-05 17:22:26 +01:00
Philip Sargent
5be41c8163 splays and alias splays implemented 2020-07-04 13:31:46 +01:00
Philip Sargent
5ed6271c08 rename variables and leglength calc 2020-07-04 01:10:17 +01:00
Philip Sargent
abbe8d467b refactored LinearLoad(), output unchanged 2020-07-03 18:08:59 +01:00
Philip Sargent
fd6f0b0a35 stack-based state of *data fixed 2020-07-03 17:22:15 +01:00
Philip Sargent
67f66b72e8 State push/pop working 2020-07-03 14:53:36 +01:00
Philip Sargent
9a514e7d3f rebuild all .3d files and progress on compass/clino/tape 2020-07-02 16:25:51 +01:00
Philip Sargent
df434cd399 SurvexBlocks now importing in deatil 2020-07-01 22:49:38 +01:00
Philip Sargent
8cc768e5b6 fix survexdirectories to ref files properly 2020-07-01 17:41:09 +01:00
Philip Sargent
0a57ac3132 all SurvexDirectory set OK, pending caves made 2020-06-30 15:39:24 +01:00
Philip Sargent
39f042240d Fix SurvexDirectory import 2020-06-29 21:16:13 +01:00
Philip Sargent
bf1c683fd0 fixing parent blocks & titles 2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8 replace GetCaveByReference 2020-06-28 01:50:34 +01:00
Philip Sargent
899ba13df4 working and refactored 2020-06-27 19:00:26 +01:00
Philip Sargent
467baec7da Renaming functions 2020-06-27 18:00:24 +01:00
Philip Sargent
4716eaa4b6 Working. More fault checking. 2020-06-27 17:55:59 +01:00
Philip Sargent
c55716df08 move function (correctly this time) 2020-06-27 12:08:02 +01:00
Philip Sargent
e2713cfe2d recursive scan *import to make linear filelist 2020-06-27 00:50:40 +01:00
Philip Sargent
030c49ff7c rewritten QM loading from SVX files 2020-06-25 03:17:56 +01:00
Philip Sargent
d3654266ee Better error msgs, one bug fix 2020-06-25 02:10:20 +01:00
Philip Sargent
04f14c91f0 rearrange ref and comment detection 2020-06-24 22:46:18 +01:00
Philip Sargent
664c18ebbe refactor team and ignore sections 2020-06-24 19:07:11 +01:00
Philip Sargent
3645c98685 extract *date function 2020-06-24 17:55:42 +01:00
Philip Sargent
45bbfce4d3 extract *ref, ;ref and ;QMs to functions 2020-06-24 14:49:39 +01:00
Philip Sargent
bb69cc073a start refactor survex import 2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d exploring recusrive behaviour 2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f bin Makesurvexstation, survextitle, survexEquate 2020-06-24 01:57:20 +01:00
Philip Sargent
9cd70b31ac simple rename survexscansfolder to scansfolder 2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58 rename SurvexScansFolders and tidy survex parser 2020-06-23 23:34:08 +01:00
Philip Sargent
674cea629d clean up import statements: more specific 2020-06-22 00:03:23 +01:00
Philip Sargent
2c469718f6 caves, scans, survex work in databaseRest 2020-06-19 00:26:15 +01:00
Philip Sargent
222d85f052 regex deprecation warning 2020-06-18 10:59:11 +01:00
Philip Sargent
94e5a06a15 clean up survexlegs 2020-06-16 19:27:32 +01:00
Philip Sargent
453af2851b Stop storing all SurvexStations 2020-06-15 03:28:51 +01:00
Philip Sargent
44fe6a8b89 cleanup and better DatIssue msgs 2020-06-13 01:24:46 +01:00
Philip Sargent
269b8840ad import fixes & statistics table 2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913 stopped storing survex legs 2020-06-12 14:06:03 +01:00
Philip Sargent
fda50ed570 attempt to simplify wnt horribly wrong 2020-06-06 22:51:55 +01:00
Philip Sargent
90dc3dac3b Change troggle horizontal menu items 2020-06-01 17:41:41 +01:00
Philip Sargent
8c4c2ad1cf Progress dots on importing data 2020-06-01 00:42:48 +01:00
Philip Sargent
d857cc9084 format tidy & normalise paths in survex *inlcude 2020-05-30 02:35:05 +01:00
Philip Sargent
6a755598b2 Moved classes to models_caves and fixed imports 2020-05-28 04:54:53 +01:00
Philip Sargent
6cc578435c Refactor to avoid loading unused surveystations 2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c preparing to clean up LoadPos 2020-05-26 16:41:11 +01:00
Philip Sargent
50d753a87b Convert codebase for python3 usage 2020-05-24 20:56:27 +01:00
Philip Sargent
b69bdcd126 tidying and prep for python3 2020-05-24 13:35:47 +01:00
Philip Sargent
15d0d05185 bugfix 2020-05-20 13:40:09 +01:00
Philip Sargent
e017c6effc Indented msgs for recursive file traversal 2020-05-15 21:45:23 +01:00
Philip Sargent
ccc5813b3f indent recursion and update comments 2020-05-14 17:21:34 +01:00
Philip Sargent
e4290c4ab0 adding *ref to troggle svx parser 2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf dbReset now loads into memory first (fast err checking), then into db 2020-04-30 23:15:57 +01:00
Philip Sargent
ecf92e2079 getting the LoadPos to work better 2020-04-28 21:50:53 +01:00