diff --git a/handbook/survey/onlinewallet.html b/handbook/survey/onlinewallet.html index b9d125296..8d968e970 100644 --- a/handbook/survey/onlinewallet.html +++ b/handbook/survey/onlinewallet.html @@ -116,6 +116,10 @@ looks like this: Yes, this is a programming format (standardised in 2013) and every comma is critical. +

When entering people's names it is important not to use any funny characters (such as "?") because +peoples names here are used by the software to construct filenames for the surveying to-do lists. And "?" (for instance) is illegal +in filenames on Windows computers. +

"To do" lists for every caver

The folder containing all the wallets for the year, e.g. 

diff --git a/noinfo/wallets.py b/noinfo/wallets.py
old mode 100755
new mode 100644
index 1a7dbb9bf..a664e7ef6
--- a/noinfo/wallets.py
+++ b/noinfo/wallets.py
@@ -12,23 +12,23 @@ if len(sys.argv) > 1 :
 	if sys.argv[1] != "":
 		loser_dir = sys.argv[1]
 
-print loser_dir
+print "Loser repo is assumed to be in: " + loser_dir
 
-html_base = "%(body)s"
-html_year_index = html_base % {"body": "
%(year)s surveys: wallets status
Persons
Wallets
%(wallets)s
Needing Scanning
Website (Guidebook description) needing updating
"}
-html_year_person = "
  • %(person)s
    • "
-html_year_wallet_entry = "%(walletname)s %(cave)s %(name)s %(complaints)s"
-html_person_wallet_entry = "
  • %(walletname)s 
    • "
-html_year_scanning_entry = "
  • %(walletname)s %(cave)s %(name)s
    • "
-html_wallet_file_entry = "
  • %(filename)s
    • "
-html_wallet_index = html_base % {"body": "
    %(title)s : %(cave)s : %(name)s
    Date: %(date)s
    People: %(people)s
    Cave Guidebook description - %(description_needed)s 
    Survex file:
      Local (Windows): %(loser_dirw)s%(survex)s
      Local (Linux): %(loser_dir)s%(survex)s
      Server:            %(survex)s
    Wallet index for this year 
    Issues
    %(complaints)s
    Files
    "}
+html_base = "%(body)s"
+html_year_index = html_base % {"body": "
    %(year)s surveys: wallets status
    \n
    List of trips: expedition/2019 - data taken from.svx files and logbook entries on server
    \n
    Persons
    \n\n
    Wallets
    \n%(wallets)s
    \n
    Needing Scanning
    \n\n
    Website (Guidebook description) needing updating\n
    \n\n"}
+html_year_person = "
  • %(person)s
    • \n"
+html_year_wallet_entry = "%(walletname)s %(cave)s %(name)s %(complaints)s\n"
+html_person_wallet_entry = "
  • %(walletname)s 
    • \n"
+html_year_scanning_entry = "
  • %(walletname)s %(cave)s %(name)s
    • \n"
+html_wallet_file_entry = "
  • %(filename)s
    • \n"
+html_wallet_index = html_base % {"body": "
    %(title)s : %(cave)s : %(name)s
    \n
    Date: %(date)s
    People: %(people)s
    \n
    Cave Guidebook description - %(description_needed)s \n
    Survex file:
      Local (Windows): %(loser_dirw)s%(survex)s
      Local (Linux): %(loser_dir)s%(survex)s
      Server:            %(survex)s
    Wallet index for this year 
    \n
    Issues
    \n%(complaints)s\n
    Files
    \n\n"}
 html_survex_required = {True: "Survex ", False: ""}
 html_plan_scanned = {True: "", False: "Plan "}
 html_elev_scanned = {True: "", False: "Elev "}
 html_description_written = {True: "", False: "Desc "}
 html_qms_written = {True: "", False: "QMs "}
 html_status = {True: "Issues: ", False: ""}
-html_person = html_base % {"body": "
    %(person)s
    Outstanding Wallets
    "}
+html_person = html_base % {"body": "
    %(person)s
    Outstanding Wallets
    "}
 html_complaint_items = "
  • %(count)i %(complaint)s
    • "
 html_items = "
  • %s
    • "
 
@@ -77,6 +77,10 @@ for item in sorted(os.listdir(".")):
         json_file = open(contents_path)
         #print json_file
         data = json.load(json_file)
+	if not data["people"]:
+		data["people"]=["NOBODY"]
+
+
         json_file.close()
         write_required = False
         try: