git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Somewhat done control page
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
static
/
mctx.gui.js
diff --git
a/testing/MCTXWeb/public_html/static/mctx.gui.js
b/testing/MCTXWeb/public_html/static/mctx.gui.js
index
48737b5
..
3df2bac
100644
(file)
--- a/
testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/
testing/MCTXWeb/public_html/static/mctx.gui.js
@@
-25,8
+25,12
@@
mctx.menu = [
{'text' : 'Help', href : mctx.location + 'help.html'}
];
{'text' : 'Help', href : mctx.location + 'help.html'}
];
-mctx.statusCodes = {
- STATUS_OK : 1
+mctx.status = {
+ OK : 1,
+ ERROR : -1,
+ UNAUTHORIZED : -2,
+ NOTRUNNING : -3,
+ ALREADYEXISTS : -4
};
mctx.statusCodesDescription = {
};
mctx.statusCodesDescription = {
@@
-54,6
+58,9
@@
mctx.actuators = {
3 : {name : "Pressure regulator"}
};
3 : {name : "Pressure regulator"}
};
+mctx.actuator = {};
+mctx.actuator.pressure_regulator = 0;
+
mctx.strain_gauges = {};
mctx.strain_gauges.ids = [0, 1, 2, 3];
mctx.strain_gauges.time_limit = 20;
mctx.strain_gauges = {};
mctx.strain_gauges.ids = [0, 1, 2, 3];
mctx.strain_gauges.time_limit = 20;
@@
-71,7
+78,14
@@
function debugLog () {
alert(arguments[i]);
}
} else {
alert(arguments[i]);
}
} else {
- console.log.apply(this, arguments);
+ try {
+ console.log.apply(this, arguments);
+ } catch (e) {
+ //Chromie
+ for (var i = 0; i < arguments.length; i++) {
+ console.log(arguments[i]);
+ }
+ }
}
}
}
}
}
}
@@
-265,11
+279,16
@@
$.fn.setErrorLog = function () {
var url = mctx.api + "errorlog";
var outdiv = this;
var url = mctx.api + "errorlog";
var outdiv = this;
+ if ($(this).length <= 0) {
+ //No error log, so do nothing.
+ return;
+ }
+
var updater = function () {
$.ajax({url : url}).done(function (data) {
outdiv.text(data);
outdiv.scrollTop(
var updater = function () {
$.ajax({url : url}).done(function (data) {
outdiv.text(data);
outdiv.scrollTop(
- outdiv[0].scrollHeight - outdiv.height()
+
outdiv[0].scrollHeight - outdiv.height()
);
setTimeout(updater, 3000);
}).fail(function (jqXHR) {
);
setTimeout(updater, 3000);
}).fail(function (jqXHR) {
@@
-284,6
+303,14
@@
$.fn.setErrorLog = function () {
return this;
};
return this;
};
+$.fn.checkStatus = function(data) {
+ if (data.status !== mctx.status.OK) {
+ $(this).text(data.description).removeClass("pass").addClass("fail");
+ return false;
+ }
+ return true;
+};
+
$(document).ready(function () {
//Show the content!
$("#content").css("display", "block");
$(document).ready(function () {
//Show the content!
$("#content").css("display", "block");
UCC
git Repository :: git.ucc.asn.au