2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Commit Graph

779 Commits

Author SHA1 Message Date
Martin Green
12cee59605 Try not showing kataster codes if they are empty/None 2023-06-07 22:38:22 +01:00
Martin Green
90862e9a89 Add editlink classes for editing the entrances 2023-06-07 22:26:11 +01:00
Martin Green
ec3ebe8499 Fixed comments again 2023-06-07 22:21:41 +01:00
Martin Green
1ef636ca6f fixed broken commment tags 2023-06-07 22:19:12 +01:00
Martin Green
174d7bfe13 Commented out Kataster status. Chnaged Survey heading to Surveys and Rigging Guides. Moved explorers and references down the page. 2023-06-07 22:08:11 +01:00
Martin Green
4e34ae0530 Reordered cave description and survey. 2023-06-07 21:54:25 +01:00
969ed6cce5 added 1627 caves to 'caves'page 2023-05-20 22:47:09 +03:00
Martin Green
77ed1b444c Hack to turn cave URL to absolute links, so they can work from anywhere on the website. 2023-05-08 22:32:49 +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
Martin Green
0052385333 Add lat long to entrance locations on cave pages 2023-05-02 22:40:44 +01:00
Martin Green
1ccd9c418b template missing from last commit 2023-05-01 00:03:58 +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
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
Expo on server
fc8584775e Get CaveView working again on cave pages. (v2.2.0)
Move caveView section back to bottom of page.
2023-04-29 23:35:18 +01:00
Expo on server
73af227fb3 remove unused copy of CaveView in troggle and updated cave.html
template for caveview2
2023-04-29 22:46:14 +01:00
c5a9bdc724 xml parser attmpt retract 2023-04-22 23:15:50 +01:00
275adc8efa mistaken default fixed 2023-04-22 03:46:34 +01:00
94b8b357fb Fix entrance edit too, saving slug now 2023-04-22 03:26:53 +01:00
0f76422d85 format change 2023-04-05 23:33:01 +01:00
d3d983eedb QM check-box report for open leads 2023-04-05 23:13:12 +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
8b5887a87a Allows creation of new svxfile with unknown cave 2023-03-23 21:26:16 +00:00
562ef48f19 re-parsing survex file when editing 2023-03-23 01:17:38 +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
4ae79a642e Report format clean-up 2023-03-19 19:12:09 +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
de54576d11 Fix QMs reports, remove V grade 2023-03-17 14:33:30 +00:00
12c7b9b5d1 + ? grades 2023-03-16 21:55:14 +00:00
c40b56844f TICK shown 2023-03-16 21:38:03 +00:00
09f5741b71 cleaner formatting 2023-03-16 21:31:09 +00:00
17fa306b09 More QM fields in JSON export 2023-03-16 21:26:31 +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
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
870b290726 add station to QM report 2023-03-11 21:14:35 +00:00
4d66548920 Fix URL to survex file in menus 2023-03-11 00:47:13 +00:00
7c923842ca more comment into generated file 2023-03-11 00:11:56 +00:00
02970512c1 link to 204 wallets 2023-03-08 22:42:02 +00:00
e8c824a396 More names in cross-references 2023-02-28 17:41:15 +00:00
5067ef2c8c reformat template fragment 2023-02-28 16:18:13 +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
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
28f87e82e9 page rename fix 2023-02-03 22:36:15 +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
e0a198bac5 Added 'Notes not needed' checkbox 2023-02-02 17:39:56 +00:00
5798e8dcd5 make nav cope with missing wallets 2023-02-01 21:31:07 +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
57930b7aa5 Show survey length per survex file 2023-01-31 14:49:54 +00:00
b98d7d246c bug fixes renaming 2023-01-30 23:22:28 +00:00
d06dd3d166 Updated all.svx documn 2023-01-30 19:00:05 +00:00
a12f666e96 Remove unneeded Class ExpeditionDay 2023-01-30 16:42:56 +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
226cbb6b5c Fixed coloured T and S on expo calendar 2023-01-29 20:59:56 +00:00
f73640522b More public debug reports 2023-01-29 12:41:50 +00:00
d9d4181dda Add new survex import report 2023-01-29 12:11:47 +00:00
75834902f2 new report on tehrion file parsing 2023-01-26 23:36:56 +00:00
719e0fe918 therion issues report 2023-01-26 22:36:49 +00:00
1ab7528f7b Clean up unused templates. All checked. 2022-12-29 15:07:58 +00:00
de74cd4867 tidy up 2022-12-29 13:56:46 +00:00
9dc1853e10 cope with bad wallet name 2022-12-29 13:56:09 +00:00
0e29cdd48c bugfix 2022-12-23 22:18:17 +00:00
8374500da5 Put colour bar on wallet editor 2022-12-23 22:14:00 +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
a7a126dd55 Formatting wallets tables 2022-12-21 22:10:55 +00:00
d06af5b0ec rearrange control panel 2022-12-21 15:29:57 +00:00
dc3a61addd convert old logbooks to modern format 2022-12-20 16:38:32 +00:00
81e95291e8 More surveyors in list 2022-12-20 12:48:39 +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
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
d1b94763b4 Fixing wiki-parsing for 2009 logbook 2022-12-18 19:33:56 +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
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
Philip Sargent
d82c521f4f direct link to lower table 2022-10-19 14:00:08 +03:00
Philip Sargent
2cafa32c7e links to other years wallets 2022-10-18 23:28:38 +03:00
Philip Sargent
830150ade6 Making page templates autoadjust to the current year 2022-10-15 21:28:56 +03:00
Philip Sargent
55ac98ebe1 Add survex trips to logbook mentions 2022-10-15 19:33:30 +03: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
004a3e2db1 comment out hr and top heading, never needed and disrupt layout 2022-10-12 23:09:58 +03:00
Philip Sargent
b81b4ef2ef Add date of update to the generated html file 2022-10-12 22:09:58 +03:00
Philip Sargent
52c0ab213a Person twiddles 2022-10-11 21:47:18 +03:00
Philip Sargent
c3bfd50cf1 Update link to new person wallets on person page 2022-10-11 21:33:13 +03:00
Philip Sargent
39683cc413 TIdy and docum of cave entry code 2022-10-11 21:01:02 +03:00
Philip Sargent
47e2c6e214 more text on aliases page 2022-10-10 22:12:42 +03:00
Philip Sargent
52a035e4cf more fixes 2022-10-10 01:08:37 +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
70709c505c Fixing bugs and better error msgs 2022-10-06 21:02:15 +03:00
Philip Sargent
c8163ab0cd fix bug for wallet with empty fpath 2022-10-03 21:18:35 +03:00
Philip Sargent
4495be2083 explanation of column headings 2022-10-03 20:35:23 +03:00
Philip Sargent
fe28d9ba39 Add survex files,wallets and same-day LBEs to the logbook entry 2022-09-27 23:59:25 +03:00
Philip Sargent
78a62a1551 error msg was incorrect. fix. 2022-09-26 00:18:41 +03:00
Philip Sargent
f0195682f2 Now shows cave id even if no *ref 2022-09-25 22:39:01 +03:00
Philip Sargent
829e18baef Make scans in wallet subfolders clickable 2022-09-25 21:42:21 +03:00
Philip Sargent
760dbc588a Make scans in subfolders somewhat visible 2022-09-24 00:34:39 +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
af88cb4d0f Show list of folders in a wallet 2022-09-22 19:42:44 +03:00
Philip Sargent
b4cf2bac95 more complete list of caves linked to wallets 2022-09-22 01:37:25 +03:00
Philip Sargent
5c0835e076 create links from cave ids 2022-09-22 00:25:02 +03:00
Philip Sargent
94b49adc4e added free text field to wallet JSON 2022-09-20 22:05:35 +03:00
Philip Sargent
47878d264b Make survex file more obvious in table 2022-09-19 23:10:09 +03:00
Philip Sargent
13b57d2bb6 year list for wallets by year 2022-09-19 21:54:32 +03:00
Philip Sargent
2648bada30 remove URL field from wallet as seen and edited 2022-09-19 20:55:34 +03:00
Philip Sargent
e28f04a51c add link to Help on using wallets 2022-09-14 01:20:00 +03:00
Philip Sargent
9410dda69e List the logbook trips and other svx files of the same date 2022-09-14 00:31:37 +03:00
Philip Sargent
04696b7b80 better link text 2022-09-13 00:08:37 +03:00
Philip Sargent
dfc903208e more useful links ion wallets pages 2022-09-12 22:47:12 +03:00
Philip Sargent
beecb4b0ac remove redundant code 2022-09-12 22:46:45 +03:00
Philip Sargent
182df351b9 Extra useful links on wallets pages 2022-09-12 22:20:14 +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
17bbbd6eab get the survexfile path when editing a naked wallet 2022-08-24 19:08:08 +03:00
Philip Sargent
7e9fd0f353 Better display of wallet names copied from svx files 2022-08-24 18:28:15 +03:00
Philip Sargent
e98ffced98 better explanation text 2022-08-24 15:07:19 +03:00
Philip Sargent
b8cd8c4785 wallets form edits 2022-08-24 13:40:49 +03:00
Philip Sargent
03cda8a897 update prompt from 2019 to 2022 2022-08-16 21:21:03 +03:00
Philip Sargent
d05294adaf better, non-real prompt 2022-08-16 20:52:34 +03:00
Philip Sargent
f1aa6a9794 better hint for svx file name input 2022-08-16 20:47:24 +03:00
Philip Sargent
e94dc6eb6f remove more "None" text 2022-08-16 17:49:55 +03:00
Philip Sargent
1a49e5347f cleaner table for None values 2022-08-16 17:42:13 +03:00
Philip Sargent
b2d8b21822 update 2019 to 2022 2022-08-16 16:26:19 +03:00
Philip Sargent
b2a26be8c8 change photo to GPS guide: more useful 2022-08-16 15:28:27 +03:00
Philip Sargent
dcc36f3286 Docum for creating empty wallet 2022-08-16 14:19:25 +03:00
Philip Sargent
284e044a03 Fix wallets scan upload faults 2022-08-14 22:52:14 +03:00
Philip Sargent
a0a1927437 removed outdated text 2022-08-11 21:57:23 +03:00
Philip Sargent
3607b9f140 enable photo file rename 2022-08-11 21:19:52 +03:00
Philip Sargent
61c04a1fb9 removing links to most old-style wallets pages 2022-08-01 17:46:54 +03:00
Philip Sargent
0fd3cf43e8 formatting 2022-08-01 17:32:49 +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
eed35d01a8 tick lists now on 3 wallets reports 2022-08-01 15:55:20 +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
5da1fce41f tidy links 2022-07-31 19:33:14 +03: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
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
c39fb30707 new urls and dummy functions and rename 2022-07-27 23:24:51 +03:00
Martin Green
7090bab632 closed form for search item in right hand menu 2022-07-26 15:56:31 +01:00
Philip Sargent
cddcb0e321 fix minor bug in setting dummy entrance 2022-07-25 11:31:43 +03:00
Philip Sargent
7785843597 error msg when no .pos file 2022-07-25 04:10:28 +03:00
Philip Sargent
f194126fb5 better error description 2022-07-22 13:41:47 +03:00
Philip Sargent
31b912f3ca bugfixes 2022-07-22 12:40:42 +03:00
Philip Sargent
c747664a26 Better links for 2022 2022-07-21 19:34:52 +03:00
Philip Sargent
f895a7e44c wallets now sorted as well as deduplicated 2022-07-21 11:10:04 +03:00
Philip Sargent
5161fce32e remove duplicate lines, add heading link 2022-07-21 10:50:15 +03:00
Philip Sargent
8245ee103e wallets for just one cave 2022-07-21 10:32:11 +03:00
Philip Sargent
dd0a448f90 fix 3d file download on cave page 2022-07-21 01:22:07 +03:00
Philip Sargent
3ab8a5d1ad layout tidy 2022-07-21 00:40:03 +03:00
Philip Sargent
0a158db97d Trial QM tick mechanism in survex files 2022-07-20 20:47:29 +03:00
Philip Sargent
de37eea167 typo 290 instead of 291 2022-07-20 17:25:36 +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
23462df49c bugfix 2022-07-19 19:06:56 +03:00
Philip Sargent
3db9c16082 add Homecoming to QMs list 2022-07-18 19:19:30 +03:00
Philip Sargent
8484f26ee9 Fix URL links and better name display 2022-07-18 16:16:58 +03:00
Philip Sargent
b7035f1574 more helpful message 2022-07-17 16:07:27 +03:00
Philip Sargent
7c82c2d97c rename 2022-07-17 15:01:25 +03:00
Philip Sargent
810e058c07 new complaints messages for wallet 2022-07-17 15:00:37 +03:00
Martin Green
d4c213e0b3 Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new 2022-07-15 14:06:43 +01:00
Martin Green
3748840e23 Removed extranious characters where there is one unnnumbered entrance. 2022-07-15 14:05:48 +01:00
Philip Sargent
02cf9b1c22 fixing Beckas complaint 2022-07-15 16:04:07 +03:00
Martin Green
a1560c60c6 Added kataster number to cave heading 2022-07-15 13:42:58 +01:00
Philip Sargent
d3572e18c3 QM reports all working 2022-07-06 17:35:08 +03:00
Philip Sargent
ee4237b14c cleaner template pages 2022-07-06 13:44:40 +03:00
Philip Sargent
848043f7f4 Linkt to QMs on cave page 2022-07-06 11:39:19 +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