Skip to content

Commit 681ac68

Browse files
authored
feat(registration): show sensors regardless of the selected hardware (#444)
Show sensors regardless of the selected hardware and not only on custom configured devices. closes #374
1 parent 6a28baf commit 681ac68

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

app/scripts/controllers/register.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,35 @@
854854
vm.sensorSetup = '';
855855
vm.extensions.feinstaub.id = '';
856856
vm.newModel.connection = null;
857+
vm.newModel.sensors = {
858+
temp: false,
859+
pressure: false,
860+
light: false,
861+
pollution: false,
862+
bme680: false,
863+
co2: false,
864+
};
865+
vm.modelSelected.name = 'Custom';
866+
867+
vm.invalidHardware = false;
868+
869+
return;
870+
}
871+
872+
if (newValue === 'edu') {
873+
vm.sensorSetup = '';
874+
vm.sensors = [];
875+
vm.extensions.feinstaub.id = '';
876+
vm.newModel.connection = null;
877+
vm.newModel.sensors = {
878+
temp: false,
879+
pressure: false,
880+
light: false,
881+
pollution: false,
882+
bme680: false,
883+
co2: false,
884+
};
885+
vm.modelSelected.name = 'senseBox Edu';
857886

858887
vm.invalidHardware = false;
859888

app/views/account.box.register.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ <h1><small>{{ 'STEP2_SUB4' | translate }}</small></h1>
14101410
</div>
14111411
<div uib-alert ng-repeat="alert in register.alerts" ng-class="'alert-' + (alert.type)">{{alert.msg}}</div>
14121412

1413-
<h3>senseBox</h3>
1413+
<h3>senseBox</h3> <!-- TODO: Later {{'DEVICE'|translate}} -->
14141414
<div class="well">
14151415
<table class="table table-striped table-bordered">
14161416
<tbody>
@@ -1423,13 +1423,13 @@ <h3>senseBox</h3>
14231423
<td style="width: 50%;"><strong>{{register.newModel.connection}}</strong></td>
14241424
</tr>
14251425
<tr ng-hide="register.isSenseBoxModel() === 'homeV2' || register.isSenseBoxModel() ===''">
1426-
<td style="width: 50%;">senseBox {{'EDIT_EXTENSIONS'|translate}}</td>
1426+
<td style="width: 50%;">{{'EDIT_EXTENSIONS'|translate}}</td>
14271427
<td style="width: 50%;"><strong
14281428
ng-if="register.extensions.feinstaub.id !== ''">{{'EXTENSIONS_FINE_PARTICULATE_MATTER'|translate}}</strong>
14291429
</td>
14301430
</tr>
14311431
<tr>
1432-
<td style="width: 50%;">senseBox Name</td>
1432+
<td style="width: 50%;">Name</td>
14331433
<td style="width: 50%;"><strong>{{register.newSenseBox.name}}</strong></td>
14341434
</tr>
14351435
<tr>
@@ -1443,7 +1443,7 @@ <h3>senseBox</h3>
14431443
</tbody>
14441444
</table>
14451445
</div>
1446-
<div ng-show="register.modelSelected.id == 'custom'">
1446+
<div>
14471447
<h3>{{'SENSORS' | translate}}</h3>
14481448
<div class="well">
14491449
<ul>

0 commit comments

Comments
 (0)