fix deriveDeviceProgress

doomsquadairsoft · Jan 31, 2019 · 7281cf2 · 7281cf2
1 parent 24788b1
commit 7281cf2
Show file tree

Hide file tree

Showing 23 changed files with 400 additions and 229 deletions.
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/fixtures/noCaptureRateMetadata.js b/fixtures/noCaptureRateMetadata.js
@@ -9,6 +9,6 @@ module.exports = { gameStatus: { msg: 'running', code: 0 },
    [ { red: 0,
        blu: 0,
        targetId: 'hG9RdwPn1HH4bZLk',
-       redIncomplete: 0,
-       bluIncomplete: 1546133945459 } ],
+       redPressTime: 0,
+       bluPressTime: 1546133945459 } ],
   gameLength: 7200000 };
diff --git a/fixtures/pressedMetadata.js b/fixtures/pressedMetadata.js
@@ -7,7 +7,7 @@ module.exports = {
     gameRunningDuration: 0,
     gameEndTime: 0,
     devicesProgress: [
-      { targetId: 'hG9RdwPn1HH4bZLk', redIncomplete: 1546277128992, red: 0, blu: 0 }
+      { targetId: 'hG9RdwPn1HH4bZLk', redPressTime: 1546277128992, red: 0, blu: 0 }
     ],
     devices: ['hG9RdwPn1HH4bZLk'],
     metadataTimestamp: 1547072420007,

diff --git a/fixtures/releasedMetadata.js b/fixtures/releasedMetadata.js
@@ -12,8 +12,8 @@ module.exports = {
   devicesProgress: [{
     red: 43,
     blu: 0,
-    redIncomplete: null,
-    bluIncomplete: null,
+    redPressTime: null,
+    bluPressTime: null,
     targetId: 'hG9RdwPn1HH4bZLk'
   }],
   gameLength: 7200000,

diff --git a/fixtures/uncMetadata.js b/fixtures/uncMetadata.js
@@ -10,6 +10,6 @@ module.exports = { gameStatus: { msg: 'running', code: 0 },
    [ { red: 0,
        blu: 0,
        targetId: 'hG9RdwPn1HH4bZLk',
-       redIncomplete: 0,
-       bluIncomplete: 1546133945459 } ],
+       redPressTime: 0,
+       bluPressTime: 1546133945459 } ],
   gameLength: 7200000 };
diff --git a/fixtures/yoloMetadata.js b/fixtures/yoloMetadata.js
@@ -12,8 +12,8 @@ module.exports = {
   devicesProgress: [{
     red: 43,
     blu: 0,
-    redIncomplete: null,
-    bluIncomplete: null,
+    redPressTime: null,
+    bluPressTime: null,
     targetId: 'hG9RdwPn1HH4bZLk'
   }],
   gameLength: 7200000,

diff --git a/src_client/Controlpointer.vue b/src_client/Controlpointer.vue
@@ -161,11 +161,6 @@ export default {
         text: 'D3VICES',
         path: '/device'
       },
-      {
-        icon: 'all_out',
-        text: 'Virtual Controlpoint',
-        path: '/controlpoint'
-      },
       {
         icon: 'build',
         text: 'Utilities',