From f6f811d40419e8ff78509cda5ab0eda1ffe9e533 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Fri, 22 Nov 2019 19:21:28 -0700
Subject: [PATCH] Add refresh button on tracking info page (close #24), add
 scan sound

---
 www/assets/audio/scan.mp3           | Bin 0 -> 3540 bytes
 www/assets/js/audio.js              |   3 +-
 www/assets/js/platform.js           |   2 +-
 www/assets/js/toolbox_track.js      |  48 ++++++++++++++++++++--------
 www/pages/toolbox/trackinginfo.html |   5 +++
 5 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 www/assets/audio/scan.mp3

diff --git a/www/assets/audio/scan.mp3 b/www/assets/audio/scan.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..8ed86fa1aa7d7900b70e38f4c904a5135ca92a9e
GIT binary patch
literal 3540
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

literal 0
HcmV?d00001

diff --git a/www/assets/js/audio.js b/www/assets/js/audio.js
index cdb8f30..e8dbb9f 100644
--- a/www/assets/js/audio.js
+++ b/www/assets/js/audio.js
@@ -20,7 +20,8 @@ function initSFX() {
     sfx = {
         "alert": new Audio("assets/audio/" + alertNoiseFile),
         "ok": new Audio("assets/audio/ok.mp3"),
-        "error": new Audio("assets/audio/error.mp3")
+        "error": new Audio("assets/audio/error.mp3"),
+        "scan": new Audio("assets/audio/scan.mp3")
     };
 
     setVolume("alert", alertVolume);
diff --git a/www/assets/js/platform.js b/www/assets/js/platform.js
index 88f4e9f..826b8a5 100644
--- a/www/assets/js/platform.js
+++ b/www/assets/js/platform.js
@@ -113,7 +113,7 @@ function initCordova() {
                     showFlipCameraButton : true,
                     prompt: "Scan barcode",
                     resultDisplayDuration: 0,
-                    disableSuccessBeep: false,
+                    disableSuccessBeep: true,
                     formats: "QR_CODE,DATA_MATRIX,CODE_39,CODE_93,CODE_128,CODABAR,PDF_417,AZTEC,MAXICODE"
                 }
         );
diff --git a/www/assets/js/toolbox_track.js b/www/assets/js/toolbox_track.js
index ccdc5dd..5428bfc 100644
--- a/www/assets/js/toolbox_track.js
+++ b/www/assets/js/toolbox_track.js
@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+var lasttrackingcode = "";
+
 function locationArrayToString(location) {
     var locarray = [];
     if (location.street != "" && location.street != null) {
@@ -58,7 +60,15 @@ function trackingStatusToNiceString(status, icon) {
     }
 }
 
-function openTrackingHistory(trackingcode) {
+function openTrackingHistory(code) {
+    var refresh = false;
+    if (typeof code == "undefined") {
+        trackingcode = lasttrackingcode;
+        refresh = true;
+    } else {
+        trackingcode = code;
+    }
+    lasttrackingcode = trackingcode;
     var requestfinished = false;
     var trackingdialogopen = false;
     $.ajax({
@@ -89,11 +99,18 @@ function openTrackingHistory(trackingcode) {
                     infocontext.history[i].status = trackingStatusToNiceString(infocontext.history[i].status, true);
                 }
                 // TODO: format timestamps as local time
-                router.navigate("/toolbox/track/info", {
-                    context: infocontext
-                });
+
+                if (refresh) {
+                    router.navigate("/toolbox/track/info", {
+                        context: infocontext,
+                        reloadCurrent: true
+                    });
+                } else {
+                    router.navigate("/toolbox/track/info", {
+                        context: infocontext
+                    });
+                }
             } else {
-                playSound("error");
                 app.dialog.alert(resp.message, "Error");
             }
         },
@@ -103,22 +120,27 @@ function openTrackingHistory(trackingcode) {
                 trackingdialogopen = false;
             }
             requestfinished = true;
-            playSound("error");
             app.dialog.alert("There was a network issue while tracking the item.  Please try again.", "Error");
         }
     });
 
-    // Open a loading message if there's a delay
-    setTimeout(function () {
-        if (!requestfinished) {
-            app.dialog.preloader("Tracking...");
-            trackingdialogopen = true;
-        }
-    }, 750);
+    // Open a loading message if there's a delay or we're refreshing the page
+    if (refresh) {
+        app.dialog.preloader("Tracking...");
+        trackingdialogopen = true;
+    } else {
+        setTimeout(function () {
+            if (!requestfinished) {
+                app.dialog.preloader("Tracking...");
+                trackingdialogopen = true;
+            }
+        }, 750);
+    }
 }
 
 function scanTrackingBarcode() {
     scanBarcode(function (code) {
+        playSound("scan");
         if (code != "" && code.length > 5) {
             openTrackingHistory(code);
         } else {
diff --git a/www/pages/toolbox/trackinginfo.html b/www/pages/toolbox/trackinginfo.html
index 65ea824..f9bf259 100644
--- a/www/pages/toolbox/trackinginfo.html
+++ b/www/pages/toolbox/trackinginfo.html
@@ -13,6 +13,11 @@
                 </a>
             </div>
             <div class="title">Tracking Status</div>
+            <div class="right">
+                <a class="link" onclick="openTrackingHistory()">
+                    <i class="material-icons">refresh</i>
+                </a>
+            </div>
         </div>
     </div>