2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-12-12 11:32:18 +00:00
Commit Graph

277 Commits

Author SHA1 Message Date
c9729c046c Adding field to logbookentry 2023-09-02 14:49:43 +03:00
1cf02afec9 add tempest nickname 2023-09-01 19:34:05 +03:00
c29c12ea76 Edit Logbook Entry mostly working 2023-08-31 18:55:20 +03:00
d08a6aa204 Nicknames preserved, date checked 2023-08-26 18:39:29 +03:00
0b7a9cf03e suppress pointless msg 2023-08-07 23:51:35 +03:00
1baf528d0a better msg 2023-08-05 23:30:46 +03:00
e101f4ed2f trying to isolate bug in letter setting on ents 2023-08-03 16:11:46 +03:00
efa40b47ca change of id for this class of data issue 2023-08-02 15:47:24 +03:00
5f07f234ef electronic surveys still need notes 2023-07-29 18:21:07 +03:00
d93133c338 ambiguous aliases removed more thoroughly 2023-07-27 00:38:47 +03:00
72a6b091e6 make more robust 2023-07-25 22:14: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
9473b22bd9 detect non-ISO dates in JSON and from user and fix 2023-07-23 23:30:19 +03: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
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
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
896af43994 kml file output for google earth etc 2023-05-01 00:01:41 +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
9ffe3f690b tidy up entranceSlug all now deleted 2023-03-28 20:30:00 +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
770edd6391 Survex editor now parses edited files 2023-03-23 19:05:25 +00:00
1db7c5ffea change on_delete to cascade for blocks in a file 2023-03-22 23:29:12 +00:00
ead3f8dc8b fix broken tick-lists in wallets 2023-03-21 18:23:07 +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
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
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
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
6de4fa66a2 Initial add of On This Day links to svx file page 2023-02-26 22:13:37 +00:00
709b720be9 Update URLs to django documn version 2023-02-10 00:05:04 +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
e0a198bac5 Added 'Notes not needed' checkbox 2023-02-02 17:39:56 +00:00
9d1c0ac395 Setting wallet dates earlier in the import process 2023-02-01 23:43:05 +00:00
587ccff501 date handling now working for new wallet 2023-02-01 19:10:46 +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
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
0d9d307490 refactor to reduce db hits and fix *team 2023-01-28 21:00:38 +00:00
e01bd39609 refactored logbooks parser 2023-01-27 23:21:07 +00:00
be9fcc522a sort imports using isort. tested. 2023-01-19 18:35:56 +00:00
5bbb363f12 Adding docstrings, deleting unused code 2022-12-23 23:32:59 +00:00
a72c2bd96a Using Path() wherever possible in localsettings.py 2022-12-22 16:04:16 +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
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
Philip Sargent
b06d1dae42 Convert.format() to f-strings with flynt 2022-11-23 10:48:39 +00:00
Philip Sargent
1a9e17a7e8 remove entry-type and tidy cache bits 2022-11-23 00:36:44 +00:00
Philip Sargent
995df16bec bugfix length declaration 2022-11-21 16:52:10 +00:00
Philip Sargent
a795707552 cache tidy and move settings into parser 2022-11-21 16:41:52 +00:00
Philip Sargent
e0ac09d5ec add 'lastvisit' field to entrances, for the date 2022-10-12 23:12:55 +03:00
Philip Sargent
b81b4ef2ef Add date of update to the generated html file 2022-10-12 22:09:58 +03:00
Philip Sargent
e6ca20b1ed new report to make aliases visible 2022-10-09 00:17:53 +03:00
Philip Sargent
bec262bb2d comments 2022-10-07 23:47:45 +03:00
Philip Sargent
c8163ab0cd fix bug for wallet with empty fpath 2022-10-03 21:18:35 +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
b4cf2bac95 more complete list of caves linked to wallets 2022-09-22 01:37:25 +03:00
Philip Sargent
86ea33bbce Correct and validate JSON dates when they are read from file 2022-09-20 23:06:45 +03:00
Philip Sargent
71bd07e70e Handling and fixing bad dates in JSON input 2022-09-20 22:52:31 +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
0ab3a4ff44 comments added 2022-09-15 22:55:45 +03:00
Philip Sargent
6452a7beed fix green block for survex files on table 2022-08-31 12:09:07 +03:00
Philip Sargent
dc2b8ad431 fixes for crashes,svx files in wallets 2022-08-31 09:27:14 +03:00
Philip Sargent
ab184bccf3 comment updates 2022-08-25 16:31:38 +03:00
Philip Sargent
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
aaba4fd2a9 minor refactoring 2022-08-16 17:42:37 +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
186eb20fb3 Make drawings repo the MASTER for contents.json 2022-08-06 21:27:36 +03:00
Martin Green
c1aaf07885 Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2022-08-01 16:05:17 +02:00
Martin Green
f491264b9e Allow entrances to be edited with the correct parent url. Commit changes to caves when adding a new entrance. Order entrances alphabetically 2022-08-01 16:04:22 +02:00
Philip Sargent
df42b1ccb3 remove debugging print 2022-08-01 03:10:07 +03:00
Philip Sargent
129ea3cc5b debugging ticklist 2022-08-01 02:50:19 +03:00
Martin Green
fa6758b9a0 edit entrances within the correct url parent 2022-07-31 21:29:17 +02:00
Philip Sargent
a2a5e9200e wallets per person - slow implementation 2022-07-31 18:58:46 +03:00
Martin Green
94252a94fe Edit caves in the same parent URL as the final file 2022-07-31 17:08:28 +02:00
Philip Sargent
c1ba6a39a5 Wallets by year and by cave 2022-07-31 01:02:02 +03:00
Philip Sargent
724234949f Populate blank wallet fields with survex data 2022-07-29 20:55:19 +03:00
Philip Sargent
93622b111f obscure bug fixed for lines ;*include 2022-07-28 15:15:11 +03:00
Philip Sargent
9a461c31a8 adding people 2022-07-28 02:37:44 +03:00
Philip Sargent
fea69c0371 Extend wallets by cave report 2022-07-28 01:48:22 +03:00
Philip Sargent
039792e320 improve reifying process 2022-07-25 15:03:58 +03:00
Philip Sargent
f9a7ba7927 alias as separate error type 2022-07-25 04:17:06 +03:00
Philip Sargent
3577d8cb68 big rewrite of cave alias lookup system 2022-07-25 02:58:13 +03:00
Philip Sargent
de7388bdc5 GetCave:Lookup neeeds work 2022-07-24 21:38:14 +03:00
Philip Sargent
3b1b96c4c8 EXTEND MESSAGE FILED. cRASHES mARIAdb 2022-07-22 13:41:28 +03:00
Philip Sargent
31b912f3ca bugfixes 2022-07-22 12:40:42 +03:00
Philip Sargent
796dbf1438 more dead chicken waving 2022-07-21 21:52:10 +03:00
Philip Sargent
312ecdcfe1 need to see exception with all the renaming going on 2022-07-21 19:51:04 +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
6883ff49a0 Add fields to QM model 2022-07-19 20:54:28 +03:00
Philip Sargent
6ec7071ffc Fix display of expoyear 2022-07-18 19:19:06 +03:00
Philip Sargent
ee9b808461 moved writetrogglefile() to core.utils 2022-07-18 16:57:13 +03:00
Philip Sargent
b20e6c5a58 Complaints now on wallet page 2022-07-17 15:01:53 +03:00
Martin Green
3748840e23 Removed extranious characters where there is one unnnumbered entrance. 2022-07-15 14:05:48 +01:00
Martin Green
5582d545a1 Allow QMS to be rendered to a string, if the case that an optional parameter is missing 2022-07-11 23:29:59 +01: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
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
9d4a97fc19 Tidy HTML output 2022-07-05 17:02:43 +03:00
Philip Sargent
5d7d2b82b2 Fixing non-null error, even though it should be allowed 2022-07-05 15:57:49 +03:00
Philip Sargent
779afc2f2a QM report pages now not crashing, working.. 2022-07-05 15:38:23 +03:00
Philip Sargent
6f32364675 fixed get_absolute_url error 2022-03-18 14:18:16 +00:00
Philip Sargent
3ac617431f Make .3d files in same dir as .svx 2022-03-06 01:29:45 +00:00
Philip Sargent
d7fd6b00ae Detect unwriteable file permissions earlier 2022-03-05 17:05:15 +00:00
Philip Sargent
601fc2cffc WORKING Dj2.2.24 & 2.2.25 py3.7 2022-03-02 21:15:24 +00:00
Philip Sargent
b359937eab remove chmod attempt 2021-12-30 21:13:34 +00:00
Philip Sargent
c0545b8777 separate chmod from context 2021-12-30 20:21:47 +00:00
Philip Sargent
4470c5abbd chmod after write 2021-12-30 20:08:24 +00:00
Philip Sargent
c3a54858d5 chmod with context handler 2021-12-30 20:03:34 +00:00
Philip Sargent
0a3037f077 let exceptions bubble up 2021-12-30 19:46:44 +00:00
Philip Sargent
84e165b8fc Move exception handling to calling View 2021-12-30 19:28:33 +00:00
Philip Sargent
5bad82b4f0 bug fix 2021-12-30 19:10:13 +00:00
Philip Sargent
d1e6125d15 add git commit to file saving in 3 places 2021-12-30 19:07:17 +00:00
7575e8c16f fix old comments 2021-10-31 19:42:06 +02:00
Philip Sargent
8c5fdf5021 Entrance locations new report - url to cave 2021-05-07 23:21:57 +01:00
Philip Sargent
c6bcb5fde9 wgs84 lat long for entrances 2021-05-07 20:44:58 +01:00