Merge pull request #49 from neuromotion/develop

provocation toggle

app/routes/settings.js

@@ -10,10 +10,13 @@ export default Route.extend({
 
   actions: {
     updateName(val) {
-      this.settings.set('userName', val)
+      this.settings.set('userName', val);
     },
     toggleMode() {
       this.settings.toggleProperty('isDark');
+    },
+    toggleProvocation() {
+      this.settings.toggleProperty('showProvocation');
     }
   }
 });

app/routes/tasks.js

@@ -1,4 +1,11 @@
 import Route from '@ember/routing/route';
+import {storageFor} from 'ember-local-storage';
 
 export default Route.extend({
+    settings: storageFor('settings'),
+
+    setupController(controller) {
+        this._super(...arguments);
+        controller.set('settings', this.settings.content);
+      }
 });

app/storages/settings.js

@@ -7,7 +7,8 @@ Storage.reopenClass({
     return {
       isDark: true,
       userName: 'Fer',
-      fontSize: 1
+      fontSize: 1,
+      showProvocation: false
     };
   }
 });

app/styles/components/_settings.scss

@@ -5,3 +5,11 @@ input[type=checkbox] {
 input {
   @extend .text-dark;
 }
+
+.on-label {
+  margin-left: 1rem;
+}
+
+.x-toggle-component {
+  justify-content: flex-start;
+}

app/templates/settings.hbs

@@ -11,10 +11,31 @@
   <div>
     <label class="p-4">
       <p class="h4">{{t "content.settings.set-theme"}}</p>
-      {{input type="checkbox" checked=model.isDark change=(action (route-action "toggleMode"))}}
-      {{t "content.settings.dark-mode"}}
+      <XToggle
+        @onLabel='Dark'
+        @offLabel='Light'
+        @showLabels={{true}}
+        @theme='material'
+        @value={{model.isDark}}
+        @onToggle={{action (route-action "toggleMode")}}
+      />
     </label>
   </div>
+  <div>
+    <label class="p-4">
+      <p class="h4">{{t "content.settings.show-provocation"}}</p>
+      <XToggle
+        @onLabel='Show'
+        @offLabel='Hide'
+        @showLabels={{true}}
+        @theme='material'
+        @value={{model.showProvocation}}
+        @onToggle={{action (route-action "toggleProvocation")}}
+      />
+    </label>
+  </div>
+
+
 </Content>
 
 {{outlet}}

app/templates/tasks.hbs

@@ -4,7 +4,9 @@
         <LaunchTask @taskName="beads" />
         <LaunchTask @taskName="msit" />
         <LaunchTask @taskName="resting" />
-        <LaunchTask @taskName="provocation" />
+        {{#if settings.showProvocation}}
+          <LaunchTask @taskName="provocation" />
+        {{/if}}
     </div>
 
 </Content>

config/environment.js

@@ -39,6 +39,11 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
+    ENV['ember-a11y-testing'] = {
+      componentOptions: {
+        turnAuditOff: true
+      }
+    }
   }
 
   if (environment === 'test') {

electron-app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rcps-ember",
   "productName": "rcps-ember",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "App to check status of INS, and turn recording on/off",
   "main": "src/index.js",
   "scripts": {

electron-app/src/index.js

@@ -39,7 +39,7 @@ app.on('ready', () => {
   mainWindow = new BrowserWindow({
     width: 1000,
     height: 900,
-    frame: false,
+    frame: true,
     webPreferences: {
       nodeIntegration: true
     }

package.json

@@ -2,7 +2,7 @@
   "name": "rcps-ember",
   "procuctName": "My RC+S",
   "description": "App to check status of INS, and turn recording on/off",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "private": true,
   "author": {
     "name": "Brown CCV",

public/locales/en-se/translation.json

@@ -35,7 +35,8 @@
       "dark-mode": "Dark mode",
       "set-theme": "Set theme",
       "language": "Change language",
-      "set-user": "Set user name"
+      "set-user": "Set user name",
+      "show-provocation": "Provocation Task Launcher"
     },
     "record": {
       "on-demand-recording": "On demand recording",