expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-01-18 08:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

extracting logbook update process into a separate file

Browse Source
This commit is contained in:
Philip Sargent 2018-07-13 23:55:38 +02:00
parent 67f06c09f0
commit 2974b8067d
4 changed files with 78 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
handbook/logbooks.html Normal file
View File

@ -0,0 +1,46 @@
<html>
<head>
<title>CUCC Expedition Handbook: The Website</title>
<link rel="stylesheet" type="text/css" href="../css/main2.css" />
</head>
<body>
<h2 id="tophead">CUCC Expedition Handbook</h2>
<h1>Logbooks</h1>
<p>As soon as possible after a trip finishes, a hand-written write-up of the trip is made in the nearest logbook:
the base camp logbook or the top camp logbook. All these logbook entries are then typed into a laptop (often the expo laptop)
which is then synchronised the version control system.
<h3>Where the logbook file is kept</h3>
<p>Logbooks are typed up and put under the [expoweb]/years/nnnn/ directory as 'logbook.html'.</p>
<h3>Format of the online logbooks</a></h3>
<p>Do whatever you like to try and represent the logbook in html. The only rigid structure is the markup to allow troggle to parse the files into 'trips':</p>
<pre>
&lt;div class="tripdate" id="t2007-07-12B"&gt;2007-07-12&lt;/div&gt;
&lt;div class="trippeople"&gt;&lt;u&gt;Jenny Black&lt;/u&gt;, Olly Betts&lt;/div&gt;
&lt;div class="triptitle"&gt;Top Camp - Setting up 76 bivi&lt;/div&gt;
&lt;div class="timeug"&gt;T/U 10 mins&lt;/div&gt;
</pre>
<p>Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc when there is more than one trip on a day.</p>
<hr>
<p>Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.</p>
<p>The formatting was largely freeform, with a bit of markup ('===' around header, bars separating date, <place> - <description>, and who) which allows the troggle import script to read it correctly. The underlines show who wrote the entry. There is also a format for time-underground info so it can be automagically tabulated.</p>
<p>So the format should be:</p>
<pre>
===2009-07-21|204 - Rigging entrance series| Becka Lawson, Emma Wilson, Jess Stirrups, Tony Rooke===
&lt;Text of logbook entry&gt;
T/U: Jess 1 hr, Emma 0.5 hr
</pre>
<p>
<hr />
</body>
</html>

27
handbook/paperwork.html
View File

@ -22,7 +22,7 @@ if it seems more reasonable (but make sure it is definitely legit). The policy o
Some have complete
exclusions for, say "potholing and climbing which normally requires guides or ropes", some are less explicit.
<h3>Local cave club membership</h3>
<p>If you are a member of the local cave club then some of your rescue expenses could be covered by that club.
<p>If you are a member of the local cave club then some of your rescue expenses would be covered by that club.
<p>Here's the form to fill in for VfH&Ouml; membership:
<a href="https://www.dropbox.com/s/2wk00itu8y2hx1l/Beitrittserkl%C3%A4rung.doc?dl=0">download</a>
Found here
@ -31,7 +31,32 @@ and needs to be emailed to <em>hoehle (at) tele2.at </em> which goes to Robert T
<p>Cost of membership is &euro;30. There are details of how to do the bank transfer on their website
but generally Robert rocks up at the dinner and cash is handed over.
<p>Accident Insurance of the V&Ouml;H:
The Austrian Speleological Association (V&Ouml;H) offers insurance for leisure time activities to their
members in cooperation with the Allianz-Elementar insurance company. All members of caving clubs within
the V&Ouml;H organisation (except Caving Club Ebensee) are automatically assured to the following conditions.
To choose a club to become a member, please visit:
<a href="http://hoehle.org/mitgliedsvereine">hoehle.org/mitgliedsvereine</a>.
<p>
Insurance sum:
<ul>
<li>Invalidity: 20.000 &euro; (for 100 % Inv.; benefit graded from 25 % invalidity)
<li>Death: 2.500 &euro;
<li>Accident costs: 40.000 &euro; (exkl. private hospitals and physicians)
<li>Search- and rescue costs: 40.000 &euro;
</ul>
<p>
The insurance is valid for all leisure time accidents, except accidents in residental areas and households. The insurance is valid world wide. The insurance sum is subsidiary with other insurances.
<p>
Invalitidy: Invalidity will be paid from 25 - 100 % (no benefit below 25 %).
<p>
Exclusion of liability: Reasons for exclusion of liability are influences from alcohol or drugs, using aircrafts, air- and motorsports, explosives, war, diving (pressure chambers are not covered), expeditions in glaciated areas outside of Europe and participation at competitions.
<p>
All statements without guarantee.
<p>
Contact person for questions (also responsible for forwarding claims to the insurance company):
Thomas Exel versicherung@hoehle.org Tel: 0699/ 18 21 91 17
<h2>Medical Form</h2>
<p>At the start of expo we have asked people to fill in an anonymous form
for their health and medical details that will be kept secure in the tattie hut and only accessed

32
handbook/update.htm
View File

@ -12,7 +12,7 @@
<ul>
<li><a href="#photos">Uploading your photos and GPS tracks</a></li>
<li><a href="#logbooks">Uploading typed logbooks</a></li>
<li><a href="logbooks.html">Uploading typed logbooks</a></li>
<li><a href="#update">Updating the website</a></li>
<li><a href="#manual">Expo Website manual</a></li>
</ul>
@ -81,7 +81,7 @@ processes that a maintainer would want to do.</p>
<li><a href="#expowebupdate">The expoweb-update script</a></li>
<li><a href="#cavepages">Updating cave pages</a></li>
<li><a href="#updatingyears">Updating expo year pages</a></li>
<li><a href="#logbooks">Adding typed logbooks</a></li>
<li><a href="logbooks.html">Adding typed logbooks</a></li>
<li><a href="#photos">Uploading photos</a></li>
<li><a href="#tickingoff">Ticking off QMs</a></li>
<li><a href="#surveystatus">Maintaining the survey status table</a></li>
@ -285,34 +285,6 @@ superseded in 2012).</p>
<p> Once you have pushed your changes to the repository you need to update the server's local copies, by ssh into the server and running hg update in the expoweb folder. </p>
<h3><a id="logbooks">Adding typed logbooks</a></h3>
<p>Logbooks are typed up and put under the years/nnnn/ directory as 'logbook.html'.</p>
<p>Do whatever you like to try and represent the logbook in html. The only rigid structure is the markup to allow troggle to parse the files into 'trips':</p>
<pre>
&lt;div class="tripdate" id="t2007-07-12B"&gt;2007-07-12&lt;/div&gt;
&lt;div class="trippeople"&gt;&lt;u&gt;Jenny Black&lt;/u&gt;, Olly Betts&lt;/div&gt;
&lt;div class="triptitle"&gt;Top Camp - Setting up 76 bivi&lt;/div&gt;
&lt;div class="timeug"&gt;T/U 10 mins&lt;/div&gt;
</pre>
<p>Note that the ID's must be unique, so are generated from 't' plus the trip date plus a,b,c etc when there is more than one trip on a day.</p>
<hr>
<p>Older logbooks (prior to 2007) were stored as logbook.txt with just a bit of consistent markup to allow troggle parsing.</p>
<p>The formatting was largely freeform, with a bit of markup ('===' around header, bars separating date, <place> - <description>, and who) which allows the troggle import script to read it correctly. The underlines show who wrote the entry. There is also a format for time-underground info so it can be automagically tabulated.</p>
<p>So the format should be:</p>
<pre>
===2009-07-21|204 - Rigging entrance series| Becka Lawson, Emma Wilson, Jess Stirrups, Tony Rooke===
&lt;Text of logbook entry&gt;
T/U: Jess 1 hr, Emma 0.5 hr
</pre>
<hr>
<h3>Adding a new year</h3>
<p>Edit noinfo/folk.csv, adding the new year to the end of the header
line, a new column, with just a comma (blank

4
years/2018/index.html
View File

@ -18,6 +18,10 @@
<li><a href="stuffbought.html">Things bought 2018</a></li>
<li><a href="sponsors.html">Sponsors 2018</a></li>
</ul>
<h2>During Expo data entry</h2>
<ul>
<li><a href="logbooks.html">2018 Logbook</a></li>
</ul>
<h2>Post-Expo Completion</h2>
(see template as HTML comment)
<!--