X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Fstatic%2Fmctx.gui.js;h=c64f3c43a0bcff8e030f0f308efbc051e9c0a9fc;hb=c0f2a81316e9135c85e0d9aaf46aeea4e851e156;hp=3130a185be152e4ad42504da3d0fbdd5a7d2015e;hpb=8c9214a60db100a206496d1c417c08a20ea2693e;p=matches%2FMCTX3420.git diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js index 3130a18..c64f3c4 100644 --- a/testing/MCTXWeb/public_html/static/mctx.gui.js +++ b/testing/MCTXWeb/public_html/static/mctx.gui.js @@ -58,6 +58,9 @@ mctx.actuators = { 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; @@ -120,7 +123,7 @@ function runBeforeLoad(isLoginPage) { window.location = mctx.location + "login.html"; } } else { - mctx.friendlyName = data.friendly_name; + mctx.friendlyName = data.user_name; } }).fail(function (jqHXR) { if (mctx.debug) { @@ -302,7 +305,7 @@ $.fn.setErrorLog = function () { $.fn.checkStatus = function(data) { if (data.status !== mctx.status.OK) { - $(this).text(data.description).addClass("fail"); + $(this).text(data.description).removeClass("pass").addClass("fail"); return false; } return true;