diff --git a/raspberry-backend/static/css/notifications.css b/raspberry-backend/static/css/notifications.css
new file mode 100644
index 0000000000000000000000000000000000000000..90d9e61dd24376c19e085e69846b931c45db7d7c
--- /dev/null
+++ b/raspberry-backend/static/css/notifications.css
@@ -0,0 +1 @@
+.ncf-container{font-size:14px;box-sizing:border-box;position:fixed;z-index:999999}.ncf-container.nfc-top-left{top:12px;left:12px}.ncf-container.nfc-top-right{top:12px;right:12px}.ncf-container.nfc-bottom-right{bottom:12px;right:12px}.ncf-container.nfc-bottom-left{bottom:12px;left:12px}@media (max-width:767px){.ncf-container{left:0;right:0}}.ncf-container .ncf{background:#fff;transition:.3s ease;position:relative;pointer-events:auto;overflow:hidden;margin:0 0 6px;padding:30px;width:300px;border-radius:3px 3px 3px 3px;box-shadow:0 0 12px #999;color:#000;opacity:.9;-ms-filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=90);filter:alpha(opacity=90);background-position:15px!important;background-repeat:no-repeat!important;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.ncf-container .ncf:hover{box-shadow:0 0 12px #000;opacity:1;cursor:pointer}.ncf-container .ncf .ncf-title{font-weight:700;font-size:16px;text-align:left;margin-top:0;margin-bottom:6px;word-wrap:break-word}.ncf-container .ncf .nfc-message{margin:0;text-align:left;word-wrap:break-word}.ncf-container .success{background:#51a351;color:#fff;padding:15px 15px 15px 50px;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADsSURBVEhLY2AYBfQMgf///3P8+/evAIgvA/FsIF+BavYDDWMBGroaSMMBiE8VC7AZDrIFaMFnii3AZTjUgsUUWUDA8OdAH6iQbQEhw4HyGsPEcKBXBIC4ARhex4G4BsjmweU1soIFaGg/WtoFZRIZdEvIMhxkCCjXIVsATV6gFGACs4Rsw0EGgIIH3QJYJgHSARQZDrWAB+jawzgs+Q2UO49D7jnRSRGoEFRILcdmEMWGI0cm0JJ2QpYA1RDvcmzJEWhABhD/pqrL0S0CWuABKgnRki9lLseS7g2AlqwHWQSKH4oKLrILpRGhEQCw2LiRUIa4lwAAAABJRU5ErkJggg==")}.ncf-container .info{background:#2f96b4;color:#fff;padding:15px 15px 15px 50px;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGwSURBVEhLtZa9SgNBEMc9sUxxRcoUKSzSWIhXpFMhhYWFhaBg4yPYiWCXZxBLERsLRS3EQkEfwCKdjWJAwSKCgoKCcudv4O5YLrt7EzgXhiU3/4+b2ckmwVjJSpKkQ6wAi4gwhT+z3wRBcEz0yjSseUTrcRyfsHsXmD0AmbHOC9Ii8VImnuXBPglHpQ5wwSVM7sNnTG7Za4JwDdCjxyAiH3nyA2mtaTJufiDZ5dCaqlItILh1NHatfN5skvjx9Z38m69CgzuXmZgVrPIGE763Jx9qKsRozWYw6xOHdER+nn2KkO+Bb+UV5CBN6WC6QtBgbRVozrahAbmm6HtUsgtPC19tFdxXZYBOfkbmFJ1VaHA1VAHjd0pp70oTZzvR+EVrx2Ygfdsq6eu55BHYR8hlcki+n+kERUFG8BrA0BwjeAv2M8WLQBtcy+SD6fNsmnB3AlBLrgTtVW1c2QN4bVWLATaIS60J2Du5y1TiJgjSBvFVZgTmwCU+dAZFoPxGEEs8nyHC9Bwe2GvEJv2WXZb0vjdyFT4Cxk3e/kIqlOGoVLwwPevpYHT+00T+hWwXDf4AJAOUqWcDhbwAAAAASUVORK5CYII=")}.ncf-container .warning{background:#f87400;color:#fff;padding:15px 15px 15px 50px;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVEhL5ZSvTsNQFMbXZGICMYGYmJhAQIJAICYQPAACiSDB8AiICQQJT4CqQEwgJvYASAQCiZiYmJhAIBATCARJy+9rTsldd8sKu1M0+dLb057v6/lbq/2rK0mS/TRNj9cWNAKPYIJII7gIxCcQ51cvqID+GIEX8ASG4B1bK5gIZFeQfoJdEXOfgX4QAQg7kH2A65yQ87lyxb27sggkAzAuFhbbg1K2kgCkB1bVwyIR9m2L7PRPIhDUIXgGtyKw575yz3lTNs6X4JXnjV+LKM/m3MydnTbtOKIjtz6VhCBq4vSm3ncdrD2lk0VgUXSVKjVDJXJzijW1RQdsU7F77He8u68koNZTz8Oz5yGa6J3H3lZ0xYgXBK2QymlWWA+RWnYhskLBv2vmE+hBMCtbA7KX5drWyRT/2JsqZ2IvfB9Y4bWDNMFbJRFmC9E74SoS0CqulwjkC0+5bpcV1CZ8NMej4pjy0U+doDQsGyo1hzVJttIjhQ7GnBtRFN1UarUlH8F3xict+HY07rEzoUGPlWcjRFRr4/gChZgc3ZL2d8oAAAAASUVORK5CYII=")}.ncf-container .error{background:#bd362f;color:#fff;padding:15px 15px 15px 50px;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHOSURBVEhLrZa/SgNBEMZzh0WKCClSCKaIYOED+AAKeQQLG8HWztLCImBrYadgIdY+gIKNYkBFSwu7CAoqCgkkoGBI/E28PdbLZmeDLgzZzcx83/zZ2SSXC1j9fr+I1Hq93g2yxH4iwM1vkoBWAdxCmpzTxfkN2RcyZNaHFIkSo10+8kgxkXIURV5HGxTmFuc75B2RfQkpxHG8aAgaAFa0tAHqYFfQ7Iwe2yhODk8+J4C7yAoRTWI3w/4klGRgR4lO7Rpn9+gvMyWp+uxFh8+H+ARlgN1nJuJuQAYvNkEnwGFck18Er4q3egEc/oO+mhLdKgRyhdNFiacC0rlOCbhNVz4H9FnAYgDBvU3QIioZlJFLJtsoHYRDfiZoUyIxqCtRpVlANq0EU4dApjrtgezPFad5S19Wgjkc0hNVnuF4HjVA6C7QrSIbylB+oZe3aHgBsqlNqKYH48jXyJKMuAbiyVJ8KzaB3eRc0pg9VwQ4niFryI68qiOi3AbjwdsfnAtk0bCjTLJKr6mrD9g8iq/S/B81hguOMlQTnVyG40wAcjnmgsCNESDrjme7wfftP4P7SP4N3CJZdvzoNyGq2c/HWOXJGsvVg+RA/k2MC/wN6I2YA2Pt8GkAAAAASUVORK5CYII=")!important}.ncf-container button{position:relative;right:-.3em;top:-.3em;float:right;font-weight:700;color:#fff;text-shadow:0 1px 0 #fff;opacity:.8;line-height:1;font-size:16px;padding:0;cursor:pointer;background:transparent;border:0}.ncf-container button:hover{opacity:1}
\ No newline at end of file
diff --git a/raspberry-backend/static/css/style_v3.css b/raspberry-backend/static/css/style_v3.css
index 252439dcbd32f87f3e381407e644455c8264d048..a6a42176503f4f951abac90e566466cec204a2b4 100644
--- a/raspberry-backend/static/css/style_v3.css
+++ b/raspberry-backend/static/css/style_v3.css
@@ -6023,3 +6023,25 @@ div.active{
position: absolute;
bottom: 0;
}
+.pickout{
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ text-indent: 1px;
+ text-overflow: '';
+}
+.pk-input.-MySelector{
+ //-webkit-appearance: none;
+ //-moz-appearance: none;
+ //min-width:6em;
+ //padding:0;
+ //text-indent: 1px;
+ //text-overflow: '';
+}
+.pk-arrow.-MySelector{
+ //-webkit-appearance: none;
+ //-moz-appearance: none;
+ //text-indent: 1px;
+ //text-overflow: '';
+
+}
+.app-none{appearance:none;}
\ No newline at end of file
diff --git a/raspberry-backend/static/js/easy-numpad.js b/raspberry-backend/static/js/easy-numpad.js
index 01c5f48930e38d4db1cf7de12bf95abcd286793a..6ecbeecda500f4191bdbf82a335919a52637d87f 100644
--- a/raspberry-backend/static/js/easy-numpad.js
+++ b/raspberry-backend/static/js/easy-numpad.js
@@ -169,8 +169,9 @@ function easy_numpad_done()
{
easy_numpad_output_val = easy_numpad_output_val.substring(0,easy_numpad_output_val.length - 1);
}
-
- document.getElementById(_outputID).value = easy_numpad_output_val;
+ var element = document.getElementById(_outputID);
+ var success = confirm('Are you sure you want to change the ' + element.name + " from" + element.value + " to " + easy_numpad_output_val);
+ if(success) document.getElementById(_outputID).value = easy_numpad_output_val;
easy_numpad_close();
}
}
@@ -229,4 +230,4 @@ function easy_numpad_check_range(value)
outputElement.style.color = "black";
_isInRange = true;
}
-}
\ No newline at end of file
+}
diff --git a/raspberry-backend/static/js/notifications.js b/raspberry-backend/static/js/notifications.js
new file mode 100644
index 0000000000000000000000000000000000000000..34b339e61dbeaaffce2732422ee0ef32e8a4348f
--- /dev/null
+++ b/raspberry-backend/static/js/notifications.js
@@ -0,0 +1 @@
+!function(t){function n(i){if(e[i])return e[i].exports;var o=e[i]={i:i,l:!1,exports:{}};return t[i].call(o.exports,o,o.exports,n),o.l=!0,o.exports}var e={};n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:i})},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},n.p="",n(n.s=0)}([function(t,n,e){e(1),t.exports=e(4)},function(t,n,e){"use strict";var i=Object.assign||function(t){for(var n=1;n<arguments.length;n++){var e=arguments[n];for(var i in e)Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i])}return t};e(2);var o=e(3);!function(t){function n(t){return t=i({},c,t),function(t){return["nfc-top-left","nfc-top-right","nfc-bottom-left","nfc-bottom-right"].indexOf(t)>-1}(t.positionClass)||(console.warn("An invalid notification position class has been specified."),t.positionClass=c.positionClass),t.onclick&&"function"!=typeof t.onclick&&(console.warn("Notification on click must be a function."),t.onclick=c.onclick),"number"!=typeof t.showDuration&&(t.showDuration=c.showDuration),(0,o.isString)(t.theme)&&0!==t.theme.length||(console.warn("Notification theme must be a string with length"),t.theme=c.theme),t}function e(t){return t=n(t),function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=n.title,i=n.message,c=r(t.positionClass);if(!e&&!i)return console.warn("Notification must contain a title or a message!");var a=(0,o.createElement)("div","ncf",t.theme);if(!0===t.closeOnClick&&a.addEventListener("click",function(){return c.removeChild(a)}),t.onclick&&a.addEventListener("click",function(n){return t.onclick(n)}),t.displayCloseButton){var s=(0,o.createElement)("button");s.innerText="X",!1===t.closeOnClick&&s.addEventListener("click",function(){return c.removeChild(a)}),(0,o.append)(a,s)}if((0,o.isString)(e)&&e.length&&(0,o.append)(a,(0,o.createParagraph)("ncf-title")(e)),(0,o.isString)(i)&&i.length&&(0,o.append)(a,(0,o.createParagraph)("nfc-message")(i)),(0,o.append)(c,a),t.showDuration&&t.showDuration>0){var l=setTimeout(function(){c.removeChild(a),0===c.querySelectorAll(".ncf").length&&document.body.removeChild(c)},t.showDuration);(t.closeOnClick||t.displayCloseButton)&&a.addEventListener("click",function(){return clearTimeout(l)})}}}function r(t){var n=document.querySelector("."+t);return n||(n=(0,o.createElement)("div","ncf-container",t),(0,o.append)(document.body,n)),n}var c={closeOnClick:!0,displayCloseButton:!1,positionClass:"nfc-top-right",onclick:!1,showDuration:3500,theme:"success"};t.createNotification?console.warn("Window already contains a create notification function. Have you included the script twice?"):t.createNotification=e}(window)},function(t,n,e){"use strict";!function(){function t(t){this.el=t;for(var n=t.className.replace(/^\s+|\s+$/g,"").split(/\s+/),i=0;i<n.length;i++)e.call(this,n[i])}if(!(void 0===window.Element||"classList"in document.documentElement)){var n=Array.prototype,e=n.push,i=n.splice,o=n.join;t.prototype={add:function(t){this.contains(t)||(e.call(this,t),this.el.className=this.toString())},contains:function(t){return-1!=this.el.className.indexOf(t)},item:function(t){return this[t]||null},remove:function(t){if(this.contains(t)){for(var n=0;n<this.length&&this[n]!=t;n++);i.call(this,n,1),this.el.className=this.toString()}},toString:function(){return o.call(this," ")},toggle:function(t){return this.contains(t)?this.remove(t):this.add(t),this.contains(t)}},window.DOMTokenList=t,function(t,n,e){Object.defineProperty?Object.defineProperty(t,n,{get:e}):t.__defineGetter__(n,e)}(Element.prototype,"classList",function(){return new t(this)})}}()},function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i=n.partial=function(t){for(var n=arguments.length,e=Array(n>1?n-1:0),i=1;i<n;i++)e[i-1]=arguments[i];return function(){for(var n=arguments.length,i=Array(n),o=0;o<n;o++)i[o]=arguments[o];return t.apply(void 0,e.concat(i))}},o=(n.append=function(t){for(var n=arguments.length,e=Array(n>1?n-1:0),i=1;i<n;i++)e[i-1]=arguments[i];return e.forEach(function(n){return t.appendChild(n)})},n.isString=function(t){return"string"==typeof t},n.createElement=function(t){for(var n=arguments.length,e=Array(n>1?n-1:0),i=1;i<n;i++)e[i-1]=arguments[i];var o=document.createElement(t);return e.length&&e.forEach(function(t){return o.classList.add(t)}),o}),r=function(t,n){return t.innerText=n,t},c=function(t){for(var n=arguments.length,e=Array(n>1?n-1:0),c=1;c<n;c++)e[c-1]=arguments[c];return i(r,o.apply(void 0,[t].concat(e)))};n.createParagraph=function(){for(var t=arguments.length,n=Array(t),e=0;e<t;e++)n[e]=arguments[e];return c.apply(void 0,["p"].concat(n))}},function(t,n){}]);
\ No newline at end of file
diff --git a/raspberry-backend/templates/base.html b/raspberry-backend/templates/base.html
index 2c61de6b8986dde16fa197f433f39162489c932b..63cd95d65b4b83f739a09cd43ccf24492f33a11e 100644
--- a/raspberry-backend/templates/base.html
+++ b/raspberry-backend/templates/base.html
@@ -11,10 +11,13 @@
<link href="{{ url_for('static', filename='css/multiselect.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/easy-numpad.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/pickout.css') }}" rel="stylesheet">
+ <link href="{{ url_for('static', filename='css/notifications.css') }}" rel="stylesheet">
+
<script src="{{ url_for('static', filename='js/all.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/multiselect.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/easy-numpad.js') }}"></script>
<script src="{{ url_for('static', filename='js/pickout.js') }}"></script>
+ <script src="{{ url_for('static', filename='js/notifications.js') }}"></script>
{% block scripts %}
{% endblock %}
</head>
@@ -110,6 +113,23 @@
{% block body_scripts %}
{% endblock %}
<script>
+ var lockTimer;
+ var unlocked = Boolean(false);
+
+ function timeOutLock(){
+ window.createNotification({
+ closeOnClick: 1,
+ displayCloseButton: 0,
+ positionClass: "nfc-bottom-right",
+ showDuration: false,
+ theme: "info"
+ })({
+ title: "Screen Lock",
+ message: "Screen has locked due to timeout"
+ });
+ lock();
+ }
+
function startTime() {
var today = new Date();
var h = today.getHours();
@@ -162,18 +182,20 @@
el.classList.add("transparent");
var el2 = document.getElementById("path-unlocked-main");
el2.classList.remove("transparent");
-
- //setTimeout(lock(),1000);
+ unlocked = 1;
+ clearTimeout(lockTimer);
+ lockTimer = setTimeout('timeOutLock()', 10000);
}
- function lock() {
+ function lock() {
+
var x = document.getElementsByClassName("input-editable");
for (i = 0; i < x.length; i++) {x[i].readOnly=true;x[i].disabled = true;}
var el = document.getElementById("path-locked-main");
el.classList.remove("transparent");
var el2 = document.getElementById("path-unlocked-main");
el2.classList.add("transparent");
-
+ unlocked = 0;
}
function toggle_lock() {
setTimeout(function(){
@@ -183,7 +205,22 @@
},500);
}
+
+
+ $(this).mousemove(function (e) {
+ if (unlocked) {
+ clearTimeout(lockTimer);
+ lockTimer = setTimeout('timeOutLock()', 10000);
+ }
+ })
+ $(this).keypress(function (e) {
+ if (unlocked) {
+ clearTimeout(lockTimer);
+ lockTimer = setTimeout('timeOutLock()', 10000);}
+ })
+
+
var battery = 100;
function update_battery() {
// set all transparent
diff --git a/raspberry-backend/templates/index.html b/raspberry-backend/templates/index.html
index dd334b7d4423083a638cc828e862bb5253b57c21..4afcaf9aeffa01c19b787058ba9dcd4d042df488 100644
--- a/raspberry-backend/templates/index.html
+++ b/raspberry-backend/templates/index.html
@@ -12,8 +12,8 @@
<div class = "row">
<div class = "col-md-7 py-0">
<div class="row col-center pb-1">
- <div class = "col-md-12">
- <select id='chart_variables2' multiple class="form-control pickout tiny" placeholder = "Select Plots">
+ <div class = "col-md-8 px-0 py-0">
+ <select id='chart_variables' multiple placeholder = "Select Plots">
<option value='pressure_air_supply' selected>Air (supply)</option>
<option value='pressure_air_regulated' selected>Air (regulated)</option>
<option value='pressure_o2_supply' selected>O2 (supply)</option>
@@ -28,7 +28,9 @@
<option value='pressure_inhale' selected>Flow</option>
<option value='temperature_buffer' selected>Volume</option>
</select>
- <!-- <input class="form-button" type="button" value="Submit" onclick="updateChartType()">-->
+ </div>
+ <div class = "col-md-3">
+ <input class="form-button" type="button" value="Submit" onclick="updateChartType()">
</div>
</div>
<!-- chart on left -->
@@ -52,7 +54,7 @@
<span class="small text-dark col-center" href="#">Mode</span>
</div>
<div class="card-body px-1 py-1 ml-auto mr-auto">
- <select class = "input-reading input-editable" name="VentilatorMode" id="vent_mode" placeholder = "PC-A/C" disabled readOnly>
+ <select class = "input-reading input-editable br-red" name="VentilatorMode" id="vent_mode" placeholder = "PC-A/C" disabled readOnly>
<optgroup label = "Pressure Control Modes">
<option value="opt1" selected>PC-A/C</option>
<option value="opt2">PC-A/C-PRVC</option>
@@ -110,7 +112,7 @@
<div class="card-header d-flex align-items-center justify-content-between py-1 min-height-1b">
<a class="small text-dark col-center" href="#">PEEP</a>
</div>
- <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading input-editable" onclick="show_easy_numpad_wrapper(this);" id = "pressure_buffer" value=5 readOnly disabled>cmH2O</div>
+ <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading input-editable" onclick="show_easy_numpad_wrapper(this);lock();" id = "pressure_buffer" value=5 readOnly disabled>cmH2O</div>
</div>
</div>
@@ -164,7 +166,7 @@
<div class="card-header d-flex align-items-center justify-content-between py-1 min-height-1b">
<a class="small text-dark col-center" href="#">I:E Ratio</a>
</div>
- <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading input-editable" id = "ie_ratio" value=1.3 readOnly disabled> </div>
+ <div class="card-body px-1 py-1 tiny ml-auto mr-auto"><input class = "input-reading input-editable" id = "ie_ratio" value=1.3 readOnly disabled onclick="show_easy_numpad_wrapper(this);lock();"> </div>
</div>
</div>
@@ -246,6 +248,7 @@ lock();
<script>
pickout.to({
el:'.pickout',
+theme:'MySelector'
});
</script>