Workaround for #19

Research-IT-Swiss-TPH · Mar 6, 2024 · 7486dd0 · 7486dd0
1 parent fe913f8
commit 7486dd0
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 8,075 deletions.
diff --git a/config.json b/config.json
@@ -34,7 +34,13 @@
             "type": "project-id",
             "name": "<b>Devices Project</b><br>Project that manages device data",
             "required": true
-        }
+        },
+        {
+            "key": "timeout",
+            "type": "text",
+            "name": "<b>Custom Timout</b><br>Duration in ms to load between tracking instances on same page. Default: 1500, Minimum: 500",
+            "required": false
+        }        
     ],
 
     "project-settings": [

diff --git a/deviceTracker.php b/deviceTracker.php
@@ -897,6 +897,12 @@ private function renderAlertInvalidTracking() {
      * @since 1.0.0
      */
     private function getDataFromBackend() {
+
+        $timeout = $this->getSystemSetting("timeout") ?? 1500;
+        //  Validate Timout Setting
+        if(!is_numeric($timeout) || $timeout < 500) {
+            $timeout = 1500;
+        }
 
         //  Initialize
         $data = [];
@@ -911,7 +917,8 @@ private function getDataFromBackend() {
             "project_id" => PROJECT_ID,
             "record_id"  => $this->tracking_record,
             "name"       => $this->tracking_page,
-            "event_id"   => $this->tracking_event
+            "event_id"   => $this->tracking_event,
+            "timeout"    => $timeout
 
         ];
 

diff --git a/dist/appMonitor.js b/dist/appMonitor.js
diff --git a/dist/appMonitor.js.LICENSE.txt b/dist/appMonitor.js.LICENSE.txt
@@ -1,16 +1,7 @@
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <http://feross.org>
- * @license  MIT
- */
-
 /*!
  * Vue.js v2.7.14
  * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
 
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/dist/appMonitor.js.map b/dist/appMonitor.js.map
diff --git a/dist/appTracker.js b/dist/appTracker.js
diff --git a/dist/appTracker.js.LICENSE.txt b/dist/appTracker.js.LICENSE.txt
@@ -1,10 +1,3 @@
-/*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <http://feross.org>
- * @license  MIT
- */
-
 /*!
  * Vue.js v2.7.14
  * (c) 2014-2022 Evan You
@@ -18,6 +11,4 @@
  * Licensed MIT © Zeno Rocha
  */
 
-/*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/dist/appTracker.js.map b/dist/appTracker.js.map
diff --git a/src/tracker/App.vue b/src/tracker/App.vue
@@ -1,6 +1,5 @@
 <template>
-    <div class="tracking-wrapper">
-
+    <div v-if="!isError" class="tracking-wrapper">
       <tracking-header :state="tracking.session_device_state" />
 
       <b-form-group class="tracking-actions">
@@ -68,7 +67,7 @@
         :record="page.record_id"
         :event_id="page.event_id"
       />
-      
+
       <tracking-delete
       v-if="tracking.session_tracking_id"
         :tracking="tracking"
@@ -94,8 +93,10 @@
       </b-alert>
 
     </div>
+    <div v-else-if="isError" class="tracking-error">
+      {{ errorMessage }}
+    </div>
   </template>
-
   <script>
   import TrackingHeader from './components/TrackingHeader'
   import TrackingState from './components/TrackingState'
@@ -116,6 +117,8 @@
       return {
         tracking: {},
         isLoading: true,
+        isError: false,
+        errorMessage: '',
         alertText: "",
         showAlertTop: false,
         dismissSecs: 3,
@@ -125,7 +128,8 @@
     props: {
         page: Object,
         field: String,
-        module: Object
+        module: Object,
+        idx: Number
     },
     methods: {
       countDownChanged(dismissCountDown) {
@@ -144,21 +148,31 @@
           event_id: this.page.event_id
         }
 
-        this.$module
+        setTimeout(()=>{
+
+          this.$module
           .ajax('get-tracking-data', data)
           .then( response => {                 
             if(response.session_tracking_id !== undefined) {
               this.tracking = response
+              console.log("Successfully fetched data.", response)
             } else {
               console.log("No tracking.")
             }
           })
           .catch(e => {
-              console.log(e.message)
+              this.isError = true
+              this.errorMessage = e.Message
+              console.log(e)
           })
           .finally( () => {
             this.isLoading = false
-          })        
+          })
+
+
+        }, this.idx*this.page.timeout + 500)
+
+
       },
 
       getMessage: function() {

diff --git a/src/tracker/appTracker.js b/src/tracker/appTracker.js
@@ -25,7 +25,8 @@ stph_dt_backend.fields.forEach(function(field, idx){
     render: h => h(App, {
       props: {
         page: stph_dt_backend.page,
-        field: field
+        field: field,
+        idx:idx
       }
     }),
   }).$mount("#STPH_DT_FIELD_"+field)