smartpager
/
dispatcher
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimized api call path

Browse Source
master
cheetah 2 years ago
parent cac8efe042
commit 2faefbbd3e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

6
html_config/index.html
Unescape Escape View File

@ -381,7 +381,7 @@
}, },
methods: { methods: {
loadConfig() { loadConfig() {
this.$http.get('/config').then(response => { this.$http.get('config').then(response => {
const newConfig = response.body const newConfig = response.body
Object.keys(newConfig.deliveryPresets) Object.keys(newConfig.deliveryPresets)
.map(_key => { .map(_key => {
@ -407,9 +407,9 @@
return total return total
}, {}) }, {})
this.$http.post('/config', storeConfig).then(response => { this.$http.post('config', storeConfig).then(response => {
}) })
.then(this.$http.post('/restart')) .then(this.$http.post('restart'))
.then(() => { .then(() => {
document.body.style = 'display:none' document.body.style = 'display:none'
setTimeout(() => window.location.reload(), 1e3) setTimeout(() => window.location.reload(), 1e3)

13
html_main/index.html
Unescape Escape View File

@ -257,7 +257,7 @@ Last LoRaWAN Packet:
this.refreshMessages() this.refreshMessages()
setInterval(this.refreshMessages, 1e3) setInterval(this.refreshMessages, 1e3)
this.$http.get('/api/deliveryPresets') this.$http.get('api/deliveryPresets')
.then(response => { .then(response => {
console.log(response.body) console.log(response.body)
this.presetSearchItems = response.body.map(x => { return { this.presetSearchItems = response.body.map(x => { return {
@ -270,7 +270,7 @@ Last LoRaWAN Packet:
}, },
methods: { methods: {
refreshDevices() { refreshDevices() {
this.$http.get('/api/devices').then(response => { this.$http.get('api/devices').then(response => {
this.deviceListData = Object.keys(response.body).map(key => { this.deviceListData = Object.keys(response.body).map(key => {
const item = response.body[ key ] const item = response.body[ key ]
const keyData = key.split(':') const keyData = key.split(':')
@ -286,7 +286,7 @@ Last LoRaWAN Packet:
}) })
}, },
refreshMessages() { refreshMessages() {
this.$http.get('/api/message/recent').then(response => { this.$http.get('api/message/recent').then(response => {
this.recentMessageListData = response.body.map(msg => { this.recentMessageListData = response.body.map(msg => {
const stateArray = [msg._routerData.recvAck, msg._routerData.readAck, msg._routerData.response] const stateArray = [msg._routerData.recvAck, msg._routerData.readAck, msg._routerData.response]
// msg.state = [ msg.type, stateArray.filter(x=>x!==false).length, ...stateArray ] // msg.state = [ msg.type, stateArray.filter(x=>x!==false).length, ...stateArray ]
@ -299,6 +299,7 @@ Last LoRaWAN Packet:
case 3: msg.state = '💬 Responded'; break; case 3: msg.state = '💬 Responded'; break;
} }
} }
if (msg._routerData.failed === true) msg.state = '❌ Failed'
msg.date = new Date(msg.date).toLocaleString('de') msg.date = new Date(msg.date).toLocaleString('de')
return msg return msg
}) })
@ -308,7 +309,7 @@ Last LoRaWAN Packet:
}, },
apiACKMessage(id, ackType) { apiACKMessage(id, ackType) {
this.$http.get( this.$http.get(
'/api/message/ack/'+[ackType, id].join('/') 'api/message/ack/'+[ackType, id].join('/')
).then(x=>{}) ).then(x=>{})
}, },
testMsg_addDeliveryTarget() { testMsg_addDeliveryTarget() {
@ -316,14 +317,14 @@ Last LoRaWAN Packet:
}, },
testMsg_send() { testMsg_send() {
if (this.EXPERTMODE) { if (this.EXPERTMODE) {
this.$http.post('/api/message/advanced/', this.$http.post('api/message/advanced/',
Object.assign({ ...this.newMSGData.pager.params }, { payload: this.newMSGData.pager.payload }) Object.assign({ ...this.newMSGData.pager.params }, { payload: this.newMSGData.pager.payload })
).then(x=>{ ).then(x=>{
this.dialogNewMessage = false this.dialogNewMessage = false
}) })
} else { } else {
console.log(this.newMSGData.preset) console.log(this.newMSGData.preset)
this.$http.post('/api/message/preset/', this.$http.post('api/message/preset/',
Object.assign({ preset: this.newMSGData.preset }, { payload: this.newMSGData.pager.payload }) Object.assign({ preset: this.newMSGData.preset }, { payload: this.newMSGData.pager.payload })
).then(x=>{ ).then(x=>{
this.dialogNewMessage = false this.dialogNewMessage = false

Write Preview
Loading…
Cancel
Save