Feat display eric (#394)

* added checkbox at end of registration to enable display * changed yaml to build image * display can be enabled in edit/script page too * removed branch from workflow and logs * added lora model * fix eslint error * build for dockerhub * remove branch from workflow, fix lora script page Co-authored-by: umut0 <umut08152@gmail.com>
sensebox · Jan 18, 2021 · 3c2141b · 3c2141b
1 parent c61cb53
commit 3c2141b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/app/scripts/controllers/account.box.edit.script.js b/app/scripts/controllers/account.box.edit.script.js
@@ -10,7 +10,7 @@
   function EditBoxScriptController (boxData, AccountService) {
     var vm = this;
     vm.box = boxData;
-
+    vm.display_enabled = false;
     vm.serialPort = 'Serial1';
     vm.boxScript = '';
     vm.showConfiguration = false;
@@ -94,7 +94,8 @@
         password: vm.wifi.password,
         devEUI: vm.ttn.devEUI,
         appEUI: vm.ttn.appEUI,
-        appKey: vm.ttn.appKey
+        appKey: vm.ttn.appKey,
+        display_enabled: vm.display_enabled
       })
         .then(function (response) {
           vm.boxScript = response;

diff --git a/app/scripts/controllers/register.js b/app/scripts/controllers/register.js
@@ -43,7 +43,7 @@
       windSpeedPort: 'C',
       bmePhenomenon: 'tempHumiPress'
     };
-
+    vm.display_enabled = false;
     vm.wifi = {
       ssid: '',
       pasword: ''
@@ -199,7 +199,8 @@
         password: vm.wifi.password,
         devEUI: vm.ttn.devEUI,
         appEUI: vm.ttn.appEUI,
-        appKey: vm.ttn.appKey
+        appKey: vm.ttn.appKey,
+        display_enabled: vm.display_enabled
       })
         .then(function (response) {
           vm.boxScript = response;

diff --git a/app/views/account.box.edit.script.html b/app/views/account.box.edit.script.html
@@ -63,6 +63,19 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
         </div>
       </div>
     </div>
+    <div class="form-group" ng-if="script.box.model === 'homeV2Wifi' || script.box.model === 'homeV2WifiFeinstaub' || script.box.model === 'homeV2Lora'">
+      <div style="text-align: left;">
+        <div class="checkbox checkbox-success checkbox-inline"
+          style="vertical-align: middle;">
+          <input type="checkbox" id="display_enabled" ng-model="script.display_enabled" ng-change="script.generateScript()">
+          <label for="display_enabled"> </label>
+        </div>
+        <img
+          src="https://sensebox.kaufen/api/public/uploads/1524084885676-oled_top.png"
+          style="vertical-align: middle; height: 60px; width: 80px;" />
+        <span style="vertical-align: middle;">{{'DISPLAY_ENABLED' | translate}}</span>
+      </div>
+    </div>
     <div class="form-group break" ng-if="script.showWifiConfiguration">
       <label for="ssid">WiFi SSID</label>
       <div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"

diff --git a/app/views/account.box.register.html b/app/views/account.box.register.html
@@ -1469,6 +1469,19 @@ <h3 ng-if="register.tag != 'edu'">Arduino Code</h3>
               ng-if="register.newSenseBox.model === 'homeV2WifiFeinstaub' || register.newSenseBox.model === 'homeV2Wifi' || register.newSenseBox.model === 'homeV2Lora'">
               <h5 ng-bind-html="'COMPILE_SKETCH'|translate"></h5>
               <div>
+                <div class="form-group" ng-if="register.newSenseBox.model === 'homeV2Wifi' || register.newSenseBox.model === 'homeV2WifiFeinstaub' || register.newSenseBox.model === 'homeV2Lora'">
+                  <div style="text-align: left;">
+                    <div class="checkbox checkbox-success checkbox-inline"
+                      style="vertical-align: middle;">
+                      <input type="checkbox" id="display_enabled" ng-model="register.display_enabled" ng-change="register.generateScript()">
+                      <label for="display_enabled"> </label>
+                    </div>
+                    <img
+                      src="https://sensebox.kaufen/api/public/uploads/1524084885676-oled_top.png"
+                      style="vertical-align: middle; height: 60px; width: 80px;" />
+                    <span style="vertical-align: middle;">{{'DISPLAY_ENABLED' | translate}}</span>
+                  </div>
+                </div>
                 <div class="form-group" ng-if="register.newSenseBox.sensorTemplates.includes('sds 011')">
                   <label for="serialport">{{'PORT'|translate}}</label>
                   <div class="input-group" uib-tooltip-template="'tooltip_serialports.html'" tooltip-placement="bottom"