Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(registration): show sensors regardless of the selected hardware #444

Merged
merged 5 commits into from
Sep 14, 2022
Merged

feat(registration): show sensors regardless of the selected hardware #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7437069
feat(registration): show sensors regardless of the selected hardware
mpfeil Mar 23, 2022
4031ffb
Merge branch 'master' into registration-374
mpfeil Mar 25, 2022
d5c0a0b
Merge branch 'master' into registration-374
mpfeil Apr 6, 2022
8d48de6
Merge branch 'master' into registration-374
mpfeil May 2, 2022
a4f7c9d
Merge branch 'master' into registration-374
mpfeil Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions app/scripts/controllers/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,35 @@
vm.sensorSetup = '';
vm.extensions.feinstaub.id = '';
vm.newModel.connection = null;
vm.newModel.sensors = {
temp: false,
pressure: false,
light: false,
pollution: false,
bme680: false,
co2: false,
};
vm.modelSelected.name = 'Custom';

vm.invalidHardware = false;

return;
}

if (newValue === 'edu') {
vm.sensorSetup = '';
vm.sensors = [];
vm.extensions.feinstaub.id = '';
vm.newModel.connection = null;
vm.newModel.sensors = {
temp: false,
pressure: false,
light: false,
pollution: false,
bme680: false,
co2: false,
};
vm.modelSelected.name = 'senseBox Edu';

vm.invalidHardware = false;

Expand Down
8 changes: 4 additions & 4 deletions app/views/account.box.register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ <h1><small>{{ 'STEP2_SUB4' | translate }}</small></h1>
</div>
<div uib-alert ng-repeat="alert in register.alerts" ng-class="'alert-' + (alert.type)">{{alert.msg}}</div>

<h3>senseBox</h3>
<h3>senseBox</h3> <!-- TODO: Later {{'DEVICE'|translate}} -->
<div class="well">
<table class="table table-striped table-bordered">
<tbody>
Expand All @@ -1423,13 +1423,13 @@ <h3>senseBox</h3>
<td style="width: 50%;"><strong>{{register.newModel.connection}}</strong></td>
</tr>
<tr ng-hide="register.isSenseBoxModel() === 'homeV2' || register.isSenseBoxModel() ===''">
<td style="width: 50%;">senseBox {{'EDIT_EXTENSIONS'|translate}}</td>
<td style="width: 50%;">{{'EDIT_EXTENSIONS'|translate}}</td>
<td style="width: 50%;"><strong
ng-if="register.extensions.feinstaub.id !== ''">{{'EXTENSIONS_FINE_PARTICULATE_MATTER'|translate}}</strong>
</td>
</tr>
<tr>
<td style="width: 50%;">senseBox Name</td>
<td style="width: 50%;">Name</td>
<td style="width: 50%;"><strong>{{register.newSenseBox.name}}</strong></td>
</tr>
<tr>
Expand All @@ -1443,7 +1443,7 @@ <h3>senseBox</h3>
</tbody>
</table>
</div>
<div ng-show="register.modelSelected.id == 'custom'">
<div>
<h3>{{'SENSORS' | translate}}</h3>
<div class="well">
<ul>
Expand Down