wwwroot/js/app.api.js

@@ -27,7 +27,7 @@ app.api = (function() {
     generateFromRequest,
     licenseEmailResponse;
 
-  RockFishVersion = "6.5";
+  RockFishVersion = "6.6";
 
   //////////////////////////////////////////////////////////////////////////////////////
   //         NOT AUTHORIZED ERROR HANDLER

wwwroot/js/app.ops.js

@@ -12,7 +12,7 @@ app.ops = (function() {
   //---------------- BEGIN MODULE SCOPE VARIABLES --------------
   var stateMap = {},
     configModule,
-    generateItem,
+    checkService,
     initModule;
   //----------------- END MODULE SCOPE VARIABLES ---------------
 
@@ -20,19 +20,41 @@ app.ops = (function() {
   //////////////////
   //Generate list item
   //
-  generateItem = function(okStatus, label) {
+  checkService = function(service) {
+    // var okClassFragment = okStatus
+    //   ? "mdi-check-circle text-success"
+    //   : "mdi-alert text-danger";
 
-    var okClassFragment = okStatus
-      ? "mdi-check-circle text-success"
-      : "mdi-alert text-danger";
+    // return (
+    //   '<h4><i class="mdi mdi-36px ' +
+    //   okClassFragment +
+    //   '"></i> ' +
+    //   label +
+    //   "</h4>"
+    // );
 
-    return (
-      '<h4><i class="mdi mdi-36px ' +
-      okClassFragment +
-      '"></i> ' +
-      label +
-      "</h4>"
-    );
+    app.api.get("ops/status/" + service, function(res) {
+      if (res.error) {
+        $.gevent.publish("app-show-error", res.msg);
+      } else {
+        if (res.ServiceCheckError) {
+          var errorText = $("#rf-ops-error").text();
+          errorText += "\r\n";
+          errorText += res.ServiceCheckError;
+          $("#rf-ops-error").text(errorText);
+        }
+
+        var serviceElement = $("#" + service);
+        serviceElement.removeClass("mdi-help-circle-outline text-warning");
+        if (res.status == true) {
+          serviceElement.addClass("mdi-check-circle text-success");
+        } else {
+          serviceElement.addClass("mdi-alert text-danger");
+        }
+        //remove ? class and warning class
+        //add appropriate icon and text color class
+      }
+    });
   };
 
   //-------------------- END UTILITY METHODS -------------------
@@ -59,37 +81,17 @@ app.ops = (function() {
     }
     $container.html(Handlebars.templates["app.ops"]({}));
     $("#rf-ops-error").text("");
-    $("#rf-ops-status").html("<h4>Checking...</h4>");
+    // $("#rf-ops-status").html("<h4>Checking...</h4>");
 
     //Context menu
     app.nav.contextClear();
 
-    app.api.get("ops/status/", function(res) {
-      if (res.error) {
-        $.gevent.publish("app-show-error", res.msg);
-      } else {
-        if (res.opsCheckError) {
-          $("#rf-ops-error").text(res.opsCheckError);
-        }
-
-        var generatedHtml = "";
-        generatedHtml += generateItem(res.mailMirrorOK, "Mail & mirror");
-        generatedHtml += generateItem(res.ayaNovaSiteOK, "AyaNova site");
-        generatedHtml += generateItem(res.backupOK, "Backup");
-        generatedHtml += generateItem(res.contactFormOK, "Contact form");
-        generatedHtml += generateItem(res.requestFormOK, "Request form");
-        generatedHtml += generateItem(
-          res.requestLiteFormOK,
-          "Request lite form"
-        );
-        generatedHtml += generateItem(res.forumOK, "Forum");
-        generatedHtml += generateItem(res.subversionOK, "Subversion");
-        generatedHtml += generateItem(res.devOpsOK, "Devops site");
-        generatedHtml += generateItem(res.apiSiteOK, "API site");
-
-        $("#rf-ops-status").html(generatedHtml);
-      }
-    });
+    checkService("MailMirror");
+    checkService("AyaNovaSite");
+    checkService("APISite");
+    checkService("ContactForm");
+    checkService("RequestForm");
+    checkService("Backup");
   };
 
   //PUBLIC METHODS

wwwroot/js/templates/app.ops.handlebars

@@ -1,5 +1,46 @@
 <div>
     <pre id="rf-ops-error" class="text-danger"></pre>
     <div id="rf-ops-status">
+        <h4>
+            <i id="MailMirror" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Mail / mirror
+        </h4>
+        <h4>
+            <i id="AyaNovaSite" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            AyaNova site
+        </h4>
+        <h4>
+            <i id="Backup" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Backup
+        </h4>
+        <h4>
+            <i id="ContactForm" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Contact form
+        </h4>
+        <h4>
+            <i id="RequestForm" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Request form
+        </h4>
+        <h4>
+            <i id="RequestLiteForm" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Request lite form
+        </h4>
+        <h4>
+            <i id="Forum" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Forum
+        </h4>
+        <h4>
+            <i id="Subversion" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            Subversion
+        </h4>
+        <h4>
+            <i id="DevOps" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            DevOps server
+        </h4>
+        <h4>
+            <i id="APISite" class="mdi mdi-36px mdi-help-circle-outline text-warning"></i>
+            API site
+        </h4>
+
     </div>
-</div>
+</div>