From fa941a1d359603c92cb487849af9f738aa27ad7e Mon Sep 17 00:00:00 2001 From: Wookey Date: Wed, 15 Apr 2020 05:02:48 +0100 Subject: [PATCH 1/4] set to unix linefeeds --- handbook/computing/todo.html | 380 +++++++++++++++++------------------ 1 file changed, 190 insertions(+), 190 deletions(-) diff --git a/handbook/computing/todo.html b/handbook/computing/todo.html index 7c3a4208e..6e721ed09 100644 --- a/handbook/computing/todo.html +++ b/handbook/computing/todo.html @@ -1,199 +1,199 @@ - - - -Expo Systems - To-Do List - - - + + + +Expo Systems - To-Do List + + +

Expo To-Do List

- + + --> -

How this works

- -

Click twice on a sub-heading to reveal the individual to-do items. Click again to hide.
-If a heading is in italics, then there are hidden items. -

Printing this page uses a much smaller font. Complain to the nerd list if you don't like this behaviour. - -

Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. Just be careful not to touch the code at the top and bottom of the page. - -

We are working on a more capable and easier-to-use system (see x-todo.html) which will mimic how GitHub Issues do this sort of thing. - -

Process Documentation

-
-
Wallets and new-cave
- -
Explain (in the wallets process) how to view the surveys - online so that
  (1) you can see an example of how to do your new one, - and
  (2) so that you can check that you have done it properly when you - have finished.
-
Explain how to link a new cave into the other caves in - troggle filesystem
-
Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves
-
svx check
-
explain command line to run on newly typed survex file to check for format errors '$cavern xxxx.svx' -
+

How this works

+ +

Click twice on a sub-heading to reveal the individual to-do items. Click again to hide.
+If a heading is in italics, then there are hidden items. +

Printing this page uses a much smaller font. Complain to the nerd list if you don't like this behaviour. + +

Edit this page by clicking on the big blue button. It uses the same "Edit this page" function that you may have used before. Just be careful not to touch the code at the top and bottom of the page. + +

We are working on a more capable and easier-to-use system (see x-todo.html) which will mimic how GitHub Issues do this sort of thing. + +

Process Documentation

+
+
Wallets and new-cave
+ +
Explain (in the wallets process) how to view the surveys + online so that
  (1) you can see an example of how to do your new one, + and
  (2) so that you can check that you have done it properly when you + have finished.
+
Explain how to link a new cave into the other caves in + troggle filesystem
+
Explain how to add photos with the correct URL format to sub-HTML files attached to New Caves
+
svx check
+
explain command line to run on newly typed survex file to check for format errors '$cavern xxxx.svx' +
+ +

Surveys data entry

+
+
Write code to automatically extract ref info about wallets from tunnel xml files +
This will replace :drawings:chk-xml.txt as used by :drawings:check-xml.sh +
Do similar for Therion files when people start using #REF comments + +
2019 surveyscans + +
edit all the content.json
+
try to autocomplete the content.json by parsing .svx files
+
Put personal names into canonical form
+
2014 contents.json +
parse all the svx files to extract people, dates & svx references +
+ + +

Logbook fettling

+
+
2019 Logbook
+
+ transcribe the rest of those UKcaving blog entries into expoweb/years/2019/logbook.html
+
+ copy the photos from the UKCaving blog into expofiles/photos/2019// -- in fact many of those photos are already there
+
edit in the links to those photos in the right place in 2019/logbook.html
+ +
Garlic cave +
edit logbook entries 2018, 2019 to link to extensive photos of Garlic cave area {Withnall 2018} , {Becka 2019} +
Past logbooks - missing images? +
Which previous years HTML logbooks are missing images extracted from scanned PDF copies of the logbooks? + +
imagemagick convert +
Not working for PDFs on current version of xubuntu ! Fix & document. Also not working on WSL ubuntu. Needed to work with logbook images easily. + +
2018 Logbook
+
Check Natalie Uomini's typed entries and extensive photos are minimized and linked in properly to the HTML logbook + + +
Add missing images to logbooks
+
+ 2000, 2008, 2009, 2011
+
+ fix corrupted image in 2001 log
+ +
2011 logbook:
+
type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML)
+ +
200? logbook:
+
+ Type up "list of GPS locations still to type"
+ +
+ +

Handbook

+
+ +
Desperately needs Navigation - Location Context, Situational Awareness +
No overall view of what there is: need a user-friendly diagrammatic overview sitemap. There are 4,869 files in :expoweb:
+
Not fixed by menus - breadcrumbs needed?
+
Diagrams of major sections: survey handbook, rigging handbook, computing handbook, Areas, cave data..
+
Chase Airoa to help fix the menus for phones
+
Look at gov.uk guidelines for inspiration
+
When git migration done +
Edit out all mercurial +
Split the TortoiseHg/PuTTy documentationa nd retain only PuTTy +
Wookey Overview presentation +
extract content from Troggle which does not render properly and extract the HTML not in slide format - correcting things now outdated. -

Surveys data entry

-
-
Write code to automatically extract ref info about wallets from tunnel xml files -
This will replace :drawings:chk-xml.txt as used by :drawings:check-xml.sh -
Do similar for Therion files when people start using #REF comments - -
2019 surveyscans - -
edit all the content.json
-
try to autocomplete the content.json by parsing .svx files
-
Put personal names into canonical form
-
2014 contents.json -
parse all the svx files to extract people, dates & svx references -
- - -

Logbook fettling

-
-
2019 Logbook
-
- transcribe the rest of those UKcaving blog entries into expoweb/years/2019/logbook.html
-
- copy the photos from the UKCaving blog into expofiles/photos/2019// -- in fact many of those photos are already there
-
edit in the links to those photos in the right place in 2019/logbook.html
- -
Garlic cave -
edit logbook entries 2018, 2019 to link to extensive photos of Garlic cave area {Withnall 2018} , {Becka 2019} -
Past logbooks - missing images? -
Which previous years HTML logbooks are missing images extracted from scanned PDF copies of the logbooks? - -
imagemagick convert -
Not working for PDFs on current version of xubuntu ! Fix & document. Also not working on WSL ubuntu. Needed to work with logbook images easily. - -
2018 Logbook
-
Check Natalie Uomini's typed entries and extensive photos are minimized and linked in properly to the HTML logbook - - -
Add missing images to logbooks
-
- 2000, 2008, 2009, 2011
-
- fix corrupted image in 2001 log
- -
2011 logbook:
-
type up via-ferrate & bolt-testing writeups (In paper book, not in scan or HTML)
- -
200? logbook:
-
- Type up "list of GPS locations still to type"
- -
- -

Handbook

-
- -
Desperately needs Navigation - Location Context, Situational Awareness -
No overall view of what there is: need a user-friendly diagrammatic overview sitemap. There are 4,869 files in :expoweb:
-
Not fixed by menus - breadcrumbs needed?
-
Diagrams of major sections: survey handbook, rigging handbook, computing handbook, Areas, cave data..
-
Chase Airoa to help fix the menus for phones
-
Look at gov.uk guidelines for inspiration
-
When git migration done -
Edit out all mercurial -
Split the TortoiseHg/PuTTy documentationa nd retain only PuTTy -
Wookey Overview presentation -
extract content from Troggle which does not render properly and extract the HTML not in slide format - correcting things now outdated. -

Photos

Fix the BINS package -
set up git on the BINS software? Fix base url sautret.org
-
set up a cron / Makefile job to run BINS
-
why is 'updatephotos' script in expofiles?
-
Document the ~expo/webphotos/ directory and how it works -
Why does expofiles/photos/xml/ get created containing all the generated xml files? Fix this. +
set up git on the BINS software? Fix base url sautret.org
+
set up a cron / Makefile job to run BINS
+
why is 'updatephotos' script in expofiles?
+
Document the ~expo/webphotos/ directory and how it works +
Why does expofiles/photos/xml/ get created containing all the generated xml files? Fix this.
- -

System Documentation

-
-
Document how we generate the SMK overall lengths and stats
-
scripts and manual actions in cavern - - - -
Troggle architecture
- -
Handbook: add more to the new troggle architecture documentation. For future system maintainers
-
Regenerate the diagram of the tables in the database & document
-
Describe the parsing/import procedures so non-nerds can do it
-
Copy [some of] the .wiki material into the documentation somewhere
- - -
Surveyscans
- -
explain where the image files are referenced from: svx, tunnel/therion, and
-
why there are so many broken links
-
Apache & MySQL configuration -
DOCUMENT How to set up a server -
Explain why Docker containers can be a maintenance nightmare -
non-troggle scripts -
DOCUMENT them all - have we got a full list? - - -
-

Troggle

-
-
Better import error messages -
REPORT if import surveyscan file failure -
Why are so many surveyscan foolder missing after import? -
WHY are total lengths of surveyed cave different between expo server and WSL server for 2019 and a few other years only ? -
NOEDIT flag -
Describe how this is implemented using <meta name="keywords" content="NOEDIT"> - -
Logbook data model: unfilled fields? -
'cave' of location field missing on nearly all logbook entroies. Missing from logbook templates. Where is this used and how can we fill it it in? Is it useful? -
- - +

System Documentation

+
+
Document how we generate the SMK overall lengths and stats
+
scripts and manual actions in cavern + + + +
Troggle architecture
+ +
Handbook: add more to the new troggle architecture documentation. For future system maintainers
+
Regenerate the diagram of the tables in the database & document
+
Describe the parsing/import procedures so non-nerds can do it
+
Copy [some of] the .wiki material into the documentation somewhere
+ + +
Surveyscans
+ +
explain where the image files are referenced from: svx, tunnel/therion, and
+
why there are so many broken links
+
Apache & MySQL configuration +
DOCUMENT How to set up a server +
Explain why Docker containers can be a maintenance nightmare +
non-troggle scripts +
DOCUMENT them all - have we got a full list? + + +
+ +

Troggle

+
+
Better import error messages +
REPORT if import surveyscan file failure +
Why are so many surveyscan foolder missing after import? +
WHY are total lengths of surveyed cave different between expo server and WSL server for 2019 and a few other years only ? +
NOEDIT flag +
Describe how this is implemented using <meta name="keywords" content="NOEDIT"> + +
Logbook data model: unfilled fields? +
'cave' of location field missing on nearly all logbook entroies. Missing from logbook templates. Where is this used and how can we fill it it in? Is it useful? +
+ +

Expo Server

document directory structure
as per Julian's GitHub list - then close that issue
-
permissions - -
do we need a cron job or has the group membership fix fixed it ? either way, document it. -
-
- -

Tackle Store Records

-
-
No authoritative list of where the expo paper records are! -
NO expo paperwork at all prior to 2008 in Tackle Store - where is it ? -
FIND where all the wallet binders are, and the logbooks. -<
BUY A4 plastic boxes for filing cabinet for logbooks getting damp there. -
2017, 2018, 2019 wallet binders are in Philip S.'s house. -
+
permissions + +
do we need a cron job or has the group membership fix fixed it ? either way, document it. +
+
+ +

Tackle Store Records

+
+
No authoritative list of where the expo paper records are! +
NO expo paperwork at all prior to 2008 in Tackle Store - where is it ? +
FIND where all the wallet binders are, and the logbooks. +<
BUY A4 plastic boxes for filing cabinet for logbooks getting damp there. +
2017, 2018, 2019 wallet binders are in Philip S.'s house. +

This to-do-list gadget itself

-
-
Status -
Try the Experimental to-do list - no extra display capabilities yet. -
Fix the "click twice" on startup. Make it only click once to change display state of the DT tag +
+
Status +
Try the Experimental to-do list - no extra display capabilities yet. +
Fix the "click twice" on startup. Make it only click once to change display state of the DT tag
Eventual aim @@ -210,40 +210,40 @@ If a heading is in italics, then there are hidden items. in-place (tick, delete) instead of using the tinymce HTML editor in Django
-
Maybe restructure whole page as JSON and use - javascript editor to create (edit), re-order and demote items.
-
if using tinymcs, use the INLINE mode.
+
Maybe restructure whole page as JSON and use + javascript editor to create (edit), re-order and demote items.
+
if using tinymcs, use the INLINE mode.
Implement comments on an issue, mimicking GitHub issues wiki
Use javascript to skip over the _edit page and submit changes direct to server when updating. Needs direct POST and include the javascript in the posted content.
-
checkboxes so that items can be ticked (which also does strike-through)
-
promotion/demotion options?
+
checkboxes so that items can be ticked (which also does strike-through)
+
promotion/demotion options?
bin icon to delete an item? Better to have an archive process.
-
Local WSL server -
Why is it using recuced-capability tinymce, a paths problem ? -
Italics management -
Hide ALL DD if any Heading clicked. -
Put DL into italics when *any* DD is hidden +
Local WSL server +
Why is it using recuced-capability tinymce, a paths problem ? +
Italics management +
Hide ALL DD if any Heading clicked. +
Put DL into italics when *any* DD is hidden -
- + +
- - - Testing area.. -
Demonstation text as initially read from disc
+ + + Testing area.. +
Demonstation text as initially read from disc
+ - -
- +
+ From f61cebb546dfca245307258f22f5b5aef725454f Mon Sep 17 00:00:00 2001 From: Wookey Date: Wed, 15 Apr 2020 05:09:09 +0100 Subject: [PATCH 2/4] note in todo list that 251 needs survey putting on page (and elevation drawing) --- handbook/computing/todo.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/handbook/computing/todo.html b/handbook/computing/todo.html index 6e721ed09..24b59318b 100644 --- a/handbook/computing/todo.html +++ b/handbook/computing/todo.html @@ -29,6 +29,13 @@ If a heading is in italics, then there are hidden items.

We are working on a more capable and easier-to-use system (see x-todo.html) which will mimic how GitHub Issues do this sort of thing. +

Cave Updating

+
+
1623/251
+
Put in tunnel plan instead of scan of drawn-up notes.
+
Draw up elevation (therion)
+
+

Process Documentation

Wallets and new-cave
From d9b763ad307e34c116d032086f2abcf62b8bd2da Mon Sep 17 00:00:00 2001 From: "Philip Sargent (muscogee)" Date: Thu, 16 Apr 2020 12:22:42 +0100 Subject: [PATCH 3/4] trying to stop menu clutter appear inside the iframes --- svxvalid.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svxvalid.html b/svxvalid.html index 2ddb269de..21f8fc36b 100644 --- a/svxvalid.html +++ b/svxvalid.html @@ -8,7 +8,7 @@

Expo Systems - Data Validation

SVX files referring to wallets and vice-versa

-

"json" is the survex filename stated in the 2018#03/content.json file in surveyscans/2018/ . @@ -27,7 +27,7 @@ But doing it outside troggle means that we get feedback on errors before going t

-Go to the drawings/survex data links validaiton page +Go to the drawings/survex data links validation page
\ No newline at end of file From f8a256a1b121f7dde84372cbfb5584637065dabd Mon Sep 17 00:00:00 2001 From: "Philip Sargent (muscogee)" Date: Thu, 16 Apr 2020 12:23:54 +0100 Subject: [PATCH 4/4] another script found - to be documented and then either included or junked --- scripts/summarizecave.sh | 89 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 scripts/summarizecave.sh diff --git a/scripts/summarizecave.sh b/scripts/summarizecave.sh new file mode 100644 index 000000000..95053a317 --- /dev/null +++ b/scripts/summarizecave.sh @@ -0,0 +1,89 @@ +#get .3d file contents using survex parser +>&2 echo "Processing: $1" + +summary=$(cavern "./$1/$1.svx" -o "./$1/$1.3d") +contents=`dump3d -d ./$1/$1.3d` + +if [[ "$2" = "--verbose" ]]; then + echo "Processing file: ./$1/$1.3d" +fi + +#find most recent leg +lastdate=$(echo "$contents" | grep ^LINE | rev | cut -f1 -d " " | rev | grep [1234567890.-] | sort | tail -n1) + +if [[ "$2" = "--verbose" ]]; then + echo "Cave last visited on: $lastdate" +fi + +#find all legs done most recently +lastlegs=$(echo "$contents" | grep ^LINE | grep "$lastdate") + +#find last survey full name +lastsurvey=$(echo "$lastlegs" | grep -o '\[.*\]' | sort | uniq | tr -d "[" | tr -d "]" | tail -n1) + +#find last survey name +lastsurvey=$(echo "$lastsurvey" | rev | cut -f1 -d "." | rev) + +#find deepest point of most revent survey +lastdepth=$(echo "$lastlegs" | cut -f4 -d " " | tr -d "m" | sort -n | tail -n1) + +#find file containing last survey +lastfile="./"$(grep -ril "begin ****$lastsurvey" "$1" | tail -n1) + +#display results +if [[ "$2" = "--verbose" ]]; then + echo "Last visit on survey name:" + echo "$lastsurvey" + echo "Located in the file:" + echo "$lastfile" +fi + +#find team members of last survey +visitors=$(cat "$lastfile" | grep team | cut -f2- -d " " | tr "\n" "\t") + +#find total length from summary +leng=$(echo "$summary" | grep "Total length of survey legs" | tr -s " " |cut -f7 -d " ") + +#find vertical span from summary +vert=$(echo "$summary" | grep "Vertical range" | cut -f4 -d " ") + +#renaming +cavename="$1" +cavedepth="$vert" +cavelength="$leng" +lastdate="$lastdate" +lastdepth="$lastdepth" +lastpeople="$visitors" +lastfile="$lastfile" + + +#output +if [[ "$2" == "--table" ]]; then + echo "" + + echo "$cavename" + echo "$cavedepth" + echo "$cavelength" + echo "$lastdate" + echo "$lastpeople" + echo "$lastdepth" + echo "$lastfile" + + echo "" + +else + echo "Last surveyed leg on:" + echo "Date, Survex file, Depth" + echo "$lastdate $lastdepth $lastfile" + + echo "Last visited by:" + echo "$lastpeople" + + echo "Total length:" + echo "$cavelength" + + echo "Total depth:" + echo "$cavedepth" + echo "" + echo "" +fi