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.

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

GSM Changes to OSeM #412

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b0df32a
added radio buttons for gsm in homev2
Thiemann96 Nov 17, 2020
9c075ea
added inputs for imsi and secret code provided by tingg
Thiemann96 Nov 17, 2020
6d6b749
added ui controllers and input control
Thiemann96 Nov 17, 2020
19d21fd
fixed lora accordion not opening
Thiemann96 Nov 17, 2020
b4a59d3
remove logs
Thiemann96 Nov 17, 2020
efa17b0
added edit tingg panel
Thiemann96 Nov 18, 2020
ebfec60
add imsi and secret code to register overview
Thiemann96 Nov 30, 2020
9c4b1f0
form validation for imsi and secret code
Thiemann96 Nov 30, 2020
6678494
hotifx
Thiemann96 Nov 30, 2020
9251150
added tingg service and complementing functions
Thiemann96 Nov 30, 2020
7e62176
added provider to html
Thiemann96 Dec 1, 2020
f218b37
added login and refresh token methods
Thiemann96 Dec 1, 2020
0a02d5b
added authorization for tingg and interceptor logic
Thiemann96 Dec 1, 2020
8e58dad
creating things & types at tingg api
Thiemann96 Dec 1, 2020
befa1c5
fix typo in resources
Thiemann96 Dec 1, 2020
2b02c31
removed logs; functions standalone
Thiemann96 Dec 1, 2020
37c2d68
names in tingg now according to boxId, name
Thiemann96 Dec 1, 2020
c067363
added verification button for imsi and secret code
Thiemann96 Dec 8, 2020
e47dce5
added styling and interaction tyo the button
Thiemann96 Dec 8, 2020
1ac2c86
removed tingg auth
Thiemann96 Dec 9, 2020
612fec0
added deactivation for tingg
Thiemann96 Dec 14, 2020
e527c32
verification at registration
Thiemann96 Dec 18, 2020
911c5f1
verification error messages
Thiemann96 Dec 21, 2020
68ec679
show errors on deactivate
Thiemann96 Dec 21, 2020
d544ac1
fix
Thiemann96 Dec 21, 2020
d09a93f
fix ?
Thiemann96 Dec 21, 2020
b41fc30
edit tingg service
Thiemann96 Dec 21, 2020
c58d92f
now its hopefully working
Thiemann96 Dec 21, 2020
1112ad8
fix again
Thiemann96 Dec 21, 2020
4a86d6d
translations
Thiemann96 Dec 28, 2020
6cdc8f6
fixed display issue in edit
Thiemann96 Dec 28, 2020
74fb707
remove logs and fix transmission error
Thiemann96 Jul 7, 2021
303f663
changed endpoint of tingg
Thiemann96 Jul 7, 2021
c4d7b74
Merge remote-tracking branch 'origin/master' into feature-GSM-Eric
Thiemann96 Jul 7, 2021
d39d488
commit register
Thiemann96 Jul 7, 2021
9ee3987
fixed lint warnings
Thiemann96 Jul 7, 2021
09510b7
fixed lint errors, endpoint now variable
Thiemann96 Jul 7, 2021
8ae8863
fixed all lint errors
Thiemann96 Jul 9, 2021
6334890
added to gh actions for testing
Thiemann96 Jul 9, 2021
81a8dfd
updated build.yaml
Thiemann96 Jul 9, 2021
df5c5ad
change to build on dockerhub
Thiemann96 Jul 9, 2021
8a3ba90
changed gruntfile endpoint
Thiemann96 Jul 9, 2021
3ecb13c
updated build.yaml to include tingg microadapter
Thiemann96 Jul 9, 2021
a96ad43
chnage to production endpoint
Thiemann96 Aug 2, 2021
c7f505a
Merge branch 'master' into feature-GSM-Eric
Thiemann96 Feb 8, 2022
4de5107
delete unneeded files and lines
Thiemann96 Feb 8, 2022
87620f5
Merge branch 'feature-GSM-Eric' of https://github.com/sensebox/openSe…
Thiemann96 Feb 8, 2022
87eed98
added service html to index
Thiemann96 Feb 8, 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
6 changes: 5 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function (grunt) {

env: {
dev: {
OPENSENSEMAP_API_URL: 'https://api.testing.opensensemap.org',
OPENSENSEMAP_API_URL: 'http://0.0.0.0:8000',
Thiemann96 marked this conversation as resolved.
Show resolved Hide resolved
OPENSENSEMAP_MAPTILES_URL: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
}
},
Expand Down Expand Up @@ -55,6 +55,10 @@ module.exports = function (grunt) {
match: 'OPENSENSEMAP_MAPTILES_URL',
replacement: '<%= OPENSENSEMAP_MAPTILES_URL %>'
},
{
match: 'MICROADAPTER_TINGG',
replacement: '<%= MICROADAPTER_TINGG %>'
},
{
match: 'VERSION',
replacement: '<%= pkg.version %>'
Expand Down
3 changes: 3 additions & 0 deletions app/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,10 @@
<script src="scripts/controllers/account.box.edit.script.js"></script>
<script src="scripts/controllers/account.box.edit.mqtt.js"></script>
<script src="scripts/controllers/account.box.edit.ttn.js"></script>
<script src="scripts/controllers/account.box.edit.tingg.js"></script>
<script src="scripts/controllers/account.box.dataupload.js"></script>
<script src="scripts/services/account.js"></script>
<script src="scripts/services/tingg.js"></script>
<script src="scripts/services/language.js"></script>
<script src="scripts/services/opensensemapapi.js"></script>
<script src="scripts/services/osemdata.js"></script>
Expand All @@ -422,6 +424,7 @@
<script src="scripts/filters/group.js"></script>
<script src="scripts/filters/phenomenon.js"></script>
<script src="scripts/filters/phenomenons.js"></script>

<!-- endbuild -->

<style>
Expand Down
10 changes: 10 additions & 0 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,16 @@
}
}
})
.state('account.edit.tingg', {
url: '/tingg',
views: {
'edit': {
controller: 'EditBoxTinggController',
controllerAs: 'tingg',
templateUrl: 'views/account.box.edit.tingg.html'
}
}
})
.state('account.dashboard', {
url: '',
views: {
Expand Down
6 changes: 5 additions & 1 deletion app/scripts/controllers/account.box.edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
security: false,
script: false,
mqtt: false,
ttn: false
ttn: false,
tingg:false
};
vm.alerts = [];
vm.custom = false;
Expand Down Expand Up @@ -66,6 +67,9 @@
case 'ttn':
vm.tabActive.ttn = true;
break;
case 'tingg':
vm.tabActive.tingg = true;
break;
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions app/scripts/controllers/account.box.edit.tingg.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
(function () {
'use strict';

angular
.module('openSenseMapApp')
.controller('EditBoxTinggController', EditBoxTinggController);

EditBoxTinggController.$inject = ['$scope', 'boxData', 'notifications', 'TinggService'];

function EditBoxTinggController ($scope, boxData, notifications, TinggService) {
var vm = this;
vm.deactivateModem = deactivateModem;
vm.gsmverified = 'init' ;
vm.errorText = '';
activate();

function activate () {


}

function deactivateModem(){
TinggService.deactivateModem(boxData).then(function(res){vm.gsmverified = 'true'})
.catch(function(error){
vm.gsmverified = 'false';
vm.errorText = error.code;

} )
}

}
})();
Loading