Skip to content

Commit 2d3eefe

Browse files
authored
added checkbox for debugging and slightly restructured script page (#466)
1 parent ed38ec5 commit 2d3eefe

File tree

4 files changed

+29
-18618
lines changed

4 files changed

+29
-18618
lines changed

app/scripts/controllers/account.box.edit.script.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
var vm = this;
1212
vm.box = boxData;
1313
vm.display_enabled = false;
14+
vm.enable_debug = false;
1415
vm.serialPort = 'Serial1';
1516
vm.boxScript = '';
1617
vm.showConfiguration = false;
@@ -99,7 +100,8 @@
99100
devEUI: vm.ttn.devEUI,
100101
appEUI: vm.ttn.appEUI,
101102
appKey: vm.ttn.appKey,
102-
display_enabled: vm.display_enabled
103+
display_enabled: vm.display_enabled,
104+
enable_debug: vm.enable_debug
103105
})
104106
.then(function (response) {
105107
vm.boxScript = response;

app/scripts/controllers/register.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
bmePhenomenon: 'tempHumiPress',
4747
};
4848
vm.display_enabled = false;
49+
vm.enable_debug = false;
4950
vm.wifi = {
5051
ssid: '',
5152
pasword: '',

app/views/account.box.edit.script.html

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,33 @@ <h2 style="margin-top: 0px; margin-bottom: 0px">{{'EDIT_SCRIPT'|translate}}</h2>
33

44
<div ng-if="script.showConfiguration">
55
<h3>{{'CONFIGURATION'|translate}}</h3>
6-
<form class="form-inline">
6+
<form class="form">
77
<!-- Firefox workaround https://github.com/sensebox/openSenseMap/issues/295-->
88
<input type="password" style="display:none;">
99
<!-- Firefox workaround end -->
10+
<div class="form-group break" ng-if="script.box.model === 'homeV2Wifi' || script.box.model === 'homeV2WifiFeinstaub' || script.box.model === 'homeV2Lora' || script.box.model === 'homeV2Ethernet' || script.box.model === 'homeV2EthernetFeinstaub'">
11+
<div style="text-align: left;">
12+
<div class="checkbox checkbox-success checkbox-inline"
13+
style="vertical-align: middle;" uib-tooltip="{{'DEBUG_ENABLED_WARNING' ||translate}}" tooltip-placement="top" tooltip-trigger="'mouseenter'">
14+
<input type="checkbox" id="enable_debug" ng-model="script.enable_debug" ng-change="script.generateScript()">
15+
<label for="enable_debug"> </label>
16+
</div>
17+
<span style="vertical-align: middle;">{{'ENABLE_DEBUG' | translate}}</span>
18+
</div>
19+
</div>
20+
<div class="form-group" ng-if="script.box.model === 'homeV2Wifi' || script.box.model === 'homeV2WifiFeinstaub' || script.box.model === 'homeV2Lora'">
21+
<div style="text-align: left;">
22+
<div class="checkbox checkbox-success checkbox-inline"
23+
style="vertical-align: middle;">
24+
<input type="checkbox" id="display_enabled" ng-model="script.display_enabled" ng-change="script.generateScript()">
25+
<label for="display_enabled"> </label>
26+
</div>
27+
<img
28+
src="https://sensebox.kaufen/api/public/uploads/1524084885676-oled_top.png"
29+
style="vertical-align: middle; height: 60px; width: 80px;" />
30+
<span style="vertical-align: middle;">{{'DISPLAY_ENABLED' | translate}}</span>
31+
</div>
32+
</div>
1033
<div class="form-group break" ng-if="script.showSerialPort">
1134
<label for="serialport">{{'PORT'|translate}}</label>
1235
<div class="input-group" uib-tooltip-template="'tooltip_serialports.html'" tooltip-placement="bottom"
@@ -63,19 +86,6 @@ <h3>{{'CONFIGURATION'|translate}}</h3>
6386
</div>
6487
</div>
6588
</div>
66-
<div class="form-group" ng-if="script.box.model === 'homeV2Wifi' || script.box.model === 'homeV2WifiFeinstaub' || script.box.model === 'homeV2Lora'">
67-
<div style="text-align: left;">
68-
<div class="checkbox checkbox-success checkbox-inline"
69-
style="vertical-align: middle;">
70-
<input type="checkbox" id="display_enabled" ng-model="script.display_enabled" ng-change="script.generateScript()">
71-
<label for="display_enabled"> </label>
72-
</div>
73-
<img
74-
src="https://sensebox.kaufen/api/public/uploads/1524084885676-oled_top.png"
75-
style="vertical-align: middle; height: 60px; width: 80px;" />
76-
<span style="vertical-align: middle;">{{'DISPLAY_ENABLED' | translate}}</span>
77-
</div>
78-
</div>
7989
<div class="form-group break" ng-if="script.showWifiConfiguration">
8090
<label for="ssid">WiFi SSID</label>
8191
<div class="input-group" uib-tooltip="{{'DATA_NOT_STORED'|translate}}" tooltip-placement="top"

0 commit comments

Comments
 (0)