Merge branch 'master' of https://tree.clementinecomputing.com/clementinecomputing/popufare

.gitignore

@@ -56,3 +56,4 @@ experiment/**/*.ps
 .legacy/busunit/DIU/diuhttpd
 
 server/diu_packager/site*
+server/diu_packager/package/*

busunit/DIUv2/diu_kiosk.capacitive

@@ -54,6 +54,8 @@ mv $tmpfn $BASEDIR/.config/chromium/Preferences
   --disable-infobars \
   --aggressive-cache-discard \
   --incognito \
+  --disable-pinch \
+  --overscroll-history-navigation=0 \
   --kiosk \
   'http://localhost:60535'
 

busunit/DIUv2/diu_kiosk.resistive

@@ -58,6 +58,8 @@ mv $tmpfn $BASEDIR/.config/chromium/Preferences
   --disable-infobars \
   --aggressive-cache-discard \
   --incognito \
+  --disable-pinch \
+  --overscroll-history-navigation=0 \
   --kiosk \
   'http://localhost:60535'
 

busunit/DIUv2/html/css/diustyles.css

@@ -88,7 +88,8 @@ p:focus {
 
 .textrow.reject {
   background: #cc4444;
-  color: #333333;
+  /* color: #333333; */
+  color: #dddddd;
 }
 
 .textrow.error {

busunit/DIUv2/html/js/diu_ui-ORG.js

@@ -1049,7 +1049,7 @@ function init() {
                    "BULK-OVR-SCHOOLA", "BULK-OVR-SCHOOLB", "BULK-OVR-SCHOOLC",
                    "BULK-OVR-ORGA", "BULK-OVR-ORGB", "BULK-OVR-ORGC"];
   var bulk_pass_name = ["Adult Cash", "Youth Cash", "Half Cash", "Special Event", "Transfer", "Interline",
-                        "School A", "Sschool B", "School C", "Org A", "Org B", "Org C"];
+                        "School A", "School B", "School C", "Org A", "Org B", "Org C"];
 
   // use site specific values if available, otherwise default to the above
   //
@@ -1121,6 +1121,8 @@ function init() {
       _switch_ui("ui_login");
     }
 
+  // default values for override passes
+  //
   var override_pass = [ "adult", "youth", "half",
                         "bike", "wheelchair", "transfer",
                         "event", "interline",
@@ -1131,6 +1133,17 @@ function init() {
                         "MISC-EVENT", "MISC-INTERLINE",
                         "OVR-SCHOOLA", "OVR-SCHOOLB", "OVR-SCHOOLC",
                         "OVR-ORGA", "OVR-ORGB", "OVR-ORGC" ];
+
+  // use site specific values if available, otherwise default to the above
+  //
+  if ((typeof OVERRIDE_PASS !== "undefined") && (OVERRIDE_PASS.length > 0)) {
+    override_pass = OVERRIDE_PASS;
+  }
+
+  if ((typeof OVERRIDE_RULE !== "undefined") && (OVERRIDE_RULE.length > 0)) {
+    override_rule= OVERRIDE_RULE;
+  }
+
   for (var i=0; i<override_pass.length; i++) {
     var p = override_pass[i];
     var r = override_rule[i];

busunit/DIUv2/html/js/diu_ui_site_specific.js

@@ -10,17 +10,53 @@
 // work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //
 
+// This file contains 'site specific' information about pass types and
+// how they're displayed in the driver facing UI.
+//
+// BULK_PASS and OVERRIDE_PASS are tied to the HTML elements being displayed.
+// The `ui_bulk_...` and `ui_fareoverride_...` are the IDs of the HTML elements
+// that can be altered depending on need.
+//
+// The BULK_RULE and OVERRIDE_RULE are what gets passed to the underlying
+// Popufare system and should reflect the rules present both in the installation
+// database and in the `rules.scm` file local to the DIU.
+//
+
+//--
 
 // Populate these values with your site specific information
+// for both bulk passes and 'override' pass types.
 //
-var BULK_PASS =  ["adult", "youth", "half", "event", "transfer", "interline",
-                  "schoola", "schoolb", "schoolc", "orga", "orgb", "orgc"];
+var BULK_PASS =  ["adult", "youth", "half",
+                  "event", "transfer", "interline",
+                  "schoola", "schoolb", "schoolc",
+                  "orga", "orgb", "orgc"];
 var BULK_RULE = ["BULK-CASH-ADULT", "BULK-CASH-YOUTH", "BULK-CASH-HALF",
                  "BULK-MISC-EVENT", "BULK-MISC-TRANSFER", "BULK-MISC-INTERLINE",
                  "BULK-OVR-SCHOOLA", "BULK-OVR-SCHOOLB", "BULK-OVR-SCHOOLC",
                  "BULK-OVR-ORGA", "BULK-OVR-ORGB", "BULK-OVR-ORGC"];
-var BULK_PASS_NAME = ["Adult Cash", "Youth Cash", "Half Cash", "Special Event", "Transfer", "Interline",
-                      "School A", "Sschool B", "School C", "Org A", "Org B", "Org C"];
+
+// Text to be diplayed in the 'bulk accept' screen
+//
+var BULK_PASS_NAME = ["Adult Cash", "Youth Cash", "Half Cash",
+                      "Special Event", "Transfer", "Interline",
+                      "School A", "School B", "School C",
+                      "Org A", "Org B", "Org C"];
+
+//--
+
+var OVERRIDE_PASS =  [ "adult", "youth", "half",
+                       "bike", "wheelchair", "transfer",
+                       "event", "interline",
+                       "schoola", "schoolb", "schoolc",
+                       "orga", "orgb", "orgc" ];
+var OVERRIDE_RULE = [ "CASH-ADULT", "CASH-YOUTH", "CASH-HALF",
+                      "MISC-BIKE", "MISC-WHEELCHAIR", "MISC-TRANSFER",
+                      "MISC-EVENT", "MISC-INTERLINE",
+                      "OVR-SCHOOLA", "OVR-SCHOOLB", "OVR-SCHOOLC",
+                      "OVR-ORGA", "OVR-ORGB", "OVR-ORGC" ];
+
+//--
 
 // This function can be used after the Popufare UI has been initialized to do
 // any work that couldn't be done otherwise.
@@ -29,42 +65,42 @@ function PopufareSiteInit(data) {
   var ele = {};
 
   var ele = document.getElementById("ui_bulk_schoola");
-  if (ele) { ele.innerHTML = "Uni A"; }
+  if (ele) { ele.innerHTML = "School A"; }
 
   var ele = document.getElementById("ui_bulk_schoolb");
-  if (ele) { ele.innerHTML = "Uni B"; }
+  if (ele) { ele.innerHTML = "School B"; }
 
   var ele = document.getElementById("ui_bulk_schoolc");
-  if (ele) { ele.innerHTML = "Uni C"; }
+  if (ele) { ele.innerHTML = "School C"; }
 
   var ele = document.getElementById("ui_bulk_orga");
-  if (ele) { ele.innerHTML = "Orga A"; }
+  if (ele) { ele.innerHTML = "Org A"; }
 
   var ele = document.getElementById("ui_bulk_orgb");
-  if (ele) { ele.innerHTML = "Orga B"; }
+  if (ele) { ele.innerHTML = "Org B"; }
 
   var ele = document.getElementById("ui_bulk_orgc");
-  if (ele) { ele.innerHTML = "Orga C"; }
+  if (ele) { ele.innerHTML = "Org C"; }
 
   //--
 
   var ele = document.getElementById("ui_fareoverride_schoola");
-  if (ele) { ele.innerHTML = "Univ A"; }
+  if (ele) { ele.innerHTML = "School A"; }
 
   var ele = document.getElementById("ui_fareoverride_schoolb");
-  if (ele) { ele.innerHTML = "Univ B"; }
+  if (ele) { ele.innerHTML = "School B"; }
 
   var ele = document.getElementById("ui_fareoverride_schoolc");
-  if (ele) { ele.innerHTML = "Univ C"; }
+  if (ele) { ele.innerHTML = "School C"; }
 
   var ele = document.getElementById("ui_fareoverride_orga");
-  if (ele) { ele.innerHTML = "Orgi A"; }
+  if (ele) { ele.innerHTML = "Org A"; }
 
   var ele = document.getElementById("ui_fareoverride_orgb");
-  if (ele) { ele.innerHTML = "Orgi B"; }
+  if (ele) { ele.innerHTML = "Org B"; }
 
   var ele = document.getElementById("ui_fareoverride_orgc");
-  if (ele) { ele.innerHTML = "Orgi C"; }
+  if (ele) { ele.innerHTML = "Org C"; }
 
 }
 

busunit/scripts/connection_tether-ppp.sh

@@ -18,6 +18,15 @@
 # along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+#
+# This script establishes and maintains the SSH tunnel connection to the central
+# server. The SSH tunnel is the transport method all communication the local
+# services use to communicate to the central server's complementary services.
+#
+# This script is the PPP VERSION, meant for production.
+#
+
+
 export BASEDIR='/home/bus/'
 
 echo "## connection_tether-ppp $BASEDIR"

busunit/scripts/connection_tether-ssh.sh

@@ -18,6 +18,15 @@
 # along with PopuFare.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+#
+# This script establishes and maintains the SSH tunnel connection to the central
+# server. The SSH tunnel is the transport method all communication the local
+# services use to communicate to the central server's complementary services.
+#
+# This script is the WIRED VERSION, meant for testing and debugging.
+# For the production version, see the PPP version.
+#
+
 export BASEDIR="/home/bus"
 
 . $BASEDIR/bin/common_values.sh

server/diu_packager/create_popufare_package.sh

@@ -45,7 +45,7 @@ pushd stage/$pkgdir > /dev/null
   # copy over site specific files that overwrite default
   # files.
   #
-  cp -R ../../site .
+  cp -L -R ../../site .
 
   tar -czf ../$pkgfile *