From 798367bb5ef13bc74a6e76710cd3d2afae8b9e30 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 19 Dec 2020 08:52:42 +0100 Subject: [PATCH] adds checkboxes for TCP and SERIAL before opening a pipeline --- go.sum | 1 + static/scripts/websocket.js | 25 ++++++++++++++++++++++--- templates/index.html | 5 ++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/go.sum b/go.sum index 75e0d95..2c3debd 100644 --- a/go.sum +++ b/go.sum @@ -86,6 +86,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/creack/goselect v0.1.1 h1:tiSSgKE1eJtxs1h/VgGQWuXUP0YS4CDIFMp6vaI1ls0= github.com/creack/goselect v0.1.1/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/static/scripts/websocket.js b/static/scripts/websocket.js index 40c624e..5cadbfa 100644 --- a/static/scripts/websocket.js +++ b/static/scripts/websocket.js @@ -5,6 +5,8 @@ window.addEventListener("load", function(evt) { var multiplier = 180/Math.PI/15 var output = document.getElementById("output"); var input = document.getElementById("input"); + var checkBoxSmartphone = document.getElementById("checkbox1"); + var checkBoxUblox = document.getElementById("checkbox2"); var ws; var print = function(message) { var d = document.createElement("div"); @@ -122,9 +124,26 @@ window.addEventListener("load", function(evt) { document.getElementById("livetracking").onclick = function(evt) { if (ws) { print2("LIVETRACKING"); - fetch('http://localhost:3011/trackings?serial=false&tcp=true', { method: 'POST', body: 'some test data'}) - .then(results => results.json()) - .then(console.log); + if(checkBoxSmartphone.checked && checkBoxUblox.checked){ + fetch('http://localhost:3011/trackings?serial=true&tcp=true', { method: 'POST', body: 'some test data'}) + .then(results => results.json()) + .then(console.log); + } + else if(!(checkBoxSmartphone.checked) && checkBoxUblox.checked){ + fetch('http://localhost:3011/trackings?serial=true&tcp=false', { method: 'POST', body: 'some test data'}) + .then(results => results.json()) + .then(console.log); + } + else if(checkBoxSmartphone.checked && !(checkBoxUblox.checked)){ + fetch('http://localhost:3011/trackings?serial=false&tcp=true', { method: 'POST', body: 'some test data'}) + .then(results => results.json()) + .then(console.log); + } + else if(!(checkBoxSmartphone.checked) && !(checkBoxUblox.checked)){ + fetch('http://localhost:3011/trackings?serial=false&tcp=false', { method: 'POST', body: 'some test data'}) + .then(results => results.json()) + .then(console.log); + } } return false; }; diff --git a/templates/index.html b/templates/index.html index 05514ba..18dde89 100644 --- a/templates/index.html +++ b/templates/index.html @@ -113,6 +113,9 @@

+
+
+ @@ -131,7 +134,7 @@ - +