diff --git a/Controllers/OpsController.cs b/Controllers/OpsController.cs index 1c409e2..9ddbc16 100644 --- a/Controllers/OpsController.cs +++ b/Controllers/OpsController.cs @@ -31,31 +31,33 @@ namespace rockfishCore.Controllers { dtoOpsStatus Ret = new dtoOpsStatus(); + Ret.OpsCheckError="Fake error message\r\nwith more fake text\r\neot"; + try { Ret.MailMirrorOK = RfMail.MailIsMirroringProperly(); } catch (Exception ex) { - Ret.OpsCheckMessage += $"Mail mirror: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Mail mirror: {ex.Message}\r\n"; } try { - Ret.AyaNovaWebsiteOK = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc."); + Ret.AyaNovaSiteOK = OpsDiagnostics.CheckWebsite("https://www.ayanova.com/", "Ground Zero Tech-Works Inc."); } catch (Exception ex) { - Ret.OpsCheckMessage += $"AyaNova site: {ex.Message}\r\n"; + Ret.OpsCheckError += $"AyaNova site: {ex.Message}\r\n"; } try { - Ret.APIWebsiteOK = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); + Ret.APISiteOK = OpsDiagnostics.CheckWebsite("https://api.ayanova.com/", "WorkorderTypes Enumeration"); } catch (Exception ex) { - Ret.OpsCheckMessage += $"API site: {ex.Message}\r\n"; + Ret.OpsCheckError += $"API site: {ex.Message}\r\n"; } try @@ -64,7 +66,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"Contact form: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Contact form: {ex.Message}\r\n"; } try @@ -73,7 +75,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"Request form: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Request form: {ex.Message}\r\n"; } try @@ -82,7 +84,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"RequestLite form: {ex.Message}\r\n"; + Ret.OpsCheckError += $"RequestLite form: {ex.Message}\r\n"; } try @@ -91,7 +93,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"Subversion: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Subversion: {ex.Message}\r\n"; } try @@ -100,7 +102,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"Forum: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Forum: {ex.Message}\r\n"; } try @@ -109,7 +111,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"DevOps: {ex.Message}\r\n"; + Ret.OpsCheckError += $"DevOps: {ex.Message}\r\n"; } try @@ -118,7 +120,7 @@ namespace rockfishCore.Controllers } catch (Exception ex) { - Ret.OpsCheckMessage += $"Backup: {ex.Message}\r\n"; + Ret.OpsCheckError += $"Backup: {ex.Message}\r\n"; } @@ -148,29 +150,29 @@ namespace rockfishCore.Controllers { public bool MailMirrorOK; public bool ForumOK; - public bool AyaNovaWebsiteOK; - public bool APIWebsiteOK; + public bool AyaNovaSiteOK; + public bool APISiteOK; public bool ContactFormOK; public bool RequestFormOK; public bool RequestLiteFormOK; public bool SubversionOK; public bool DevOpsOK; public bool BackupOK; - public string OpsCheckMessage; + public string OpsCheckError; public dtoOpsStatus() { MailMirrorOK = false; ForumOK = false; - AyaNovaWebsiteOK = false; - APIWebsiteOK = false; + AyaNovaSiteOK = false; + APISiteOK = false; ContactFormOK = false; RequestFormOK = false; RequestLiteFormOK = false; SubversionOK = false; DevOpsOK = false; BackupOK = false; - OpsCheckMessage = string.Empty; + OpsCheckError = string.Empty; } } diff --git a/wwwroot/js/app.ops.js b/wwwroot/js/app.ops.js index 0db3831..de41757 100644 --- a/wwwroot/js/app.ops.js +++ b/wwwroot/js/app.ops.js @@ -24,30 +24,30 @@ app.ops = (function() { /////////////////////////////// //ONUPDATE // -// onChangePassword = function(event) { -// event.preventDefault(); -// $.gevent.publish("app-clear-error"); -// //get form data -// var formData = $("form").serializeArray({ -// checkboxesAsBools: true -// }); + // onChangePassword = function(event) { + // event.preventDefault(); + // $.gevent.publish("app-clear-error"); + // //get form data + // var formData = $("form").serializeArray({ + // checkboxesAsBools: true + // }); -// var submitData = app.utilB.objectifyFormDataArray(formData); + // var submitData = app.utilB.objectifyFormDataArray(formData); -// app.api.create( -// "user/" + app.shell.stateMap.user.id + "/changepassword", -// submitData, -// function(res) { -// if (res.error) { -// $.gevent.publish("app-show-error", res.msg); -// } else { -// page("#!/logout"); -// } -// } -// ); + // app.api.create( + // "user/" + app.shell.stateMap.user.id + "/changepassword", + // submitData, + // function(res) { + // if (res.error) { + // $.gevent.publish("app-show-error", res.msg); + // } else { + // page("#!/logout"); + // } + // } + // ); -// return false; //prevent default? -// }; + // return false; //prevent default? + // }; //-------------------- END EVENT HANDLERS -------------------- //------------------- BEGIN PUBLIC METHODS ------------------- @@ -69,7 +69,7 @@ app.ops = (function() { $container.html(Handlebars.templates["app.ops"]({})); // bind actions - // $("#btn-change-password").bind("click", onChangePassword); + // $("#btn-change-password").bind("click", onChangePassword); //Context menu app.nav.contextClear(); @@ -78,18 +78,18 @@ app.ops = (function() { if (res.error) { $.gevent.publish("app-show-error", res.msg); } else { - $("#about").append( - "

Ops status response: " + - res + - "

" - ); + if (res.opsCheckMessage) { + $("#about").append("

Ops status response: " + res.opsCheckMessage + "

"); + } + + //set classes + + } }); - -//{"mailMirrorOK":true,"forumOK":true,"ayaNovaWebsiteOK":true,"apiWebsiteOK":true,"contactFormOK":true,"requestFormOK":true,"requestLiteFormOK":true,"subversionOK":true,"devOpsOK":true,"backupOK":true,"opsCheckMessage":""} - - ////app.nav.setContextTitle("Search"); + //{"mailMirrorOK":true,"forumOK":true,"ayaNovaWebsiteOK":true,"apiWebsiteOK":true,"contactFormOK":true,"requestFormOK":true,"requestLiteFormOK":true,"subversionOK":true,"devOpsOK":true,"backupOK":true,"opsCheckMessage":""} + //icons: alert for bad, check-circle for good }; //PUBLIC METHODS diff --git a/wwwroot/js/templates/app.ops.handlebars b/wwwroot/js/templates/app.ops.handlebars index 3b42508..bb8e6bd 100644 --- a/wwwroot/js/templates/app.ops.handlebars +++ b/wwwroot/js/templates/app.ops.handlebars @@ -1,16 +1,18 @@

OPS

+
-
+

+ AyaNova site +

-
- - - -
- -
-
-
+

+ + API site +

+ + +
\ No newline at end of file diff --git a/wwwroot/js/templates/templates.js b/wwwroot/js/templates/templates.js index dbc7ff1..8965dbe 100644 --- a/wwwroot/js/templates/templates.js +++ b/wwwroot/js/templates/templates.js @@ -1,2 +1,2 @@ -!function(){var n=Handlebars.template,e=Handlebars.templates=Handlebars.templates||{};e["app.authenticate"]=n({compiler:[7,">= 4.0.0"],main:function(n,e,a,l,t){return'
\n Rockfish logo\n

Login

\n
\n

\n

\n

\n
\n
'},useData:!0}),e["app.customerEdit"]=n({compiler:[7,">= 4.0.0"],main:function(n,e,a,l,t){return'
\n
\n\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n \n
\n\n
\n \n
\n\n\n
\n \n
\n\n\n\n
\n \n