Changeset 11053 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views

Timestamp:

06/27/14 16:39:43 (11 years ago)

Author:

mroscoe

Message:

 

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views

Files:

• Home/About.cshtml (modified) (1 diff)
• Home/Contact.cshtml (deleted)
• Home/Index.cshtml (modified) (4 diffs)
• LoginRequired/Admin.cshtml (modified) (10 diffs)
• LoginRequired/UserTask.cshtml (modified) (1 diff)
• Shared/_Layout.cshtml (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/About.cshtml

@@ -1 @@
-@{
-    ViewBag.Title = "About";
-}
+@using HeuristicLab.Services.Hive.Statistics.Helper
+@{ViewBag.Title = "About";}
 
-<hgroup class="title">
-    <h1>@ViewBag.Title.</h1>
-    <h2>@ViewBag.Message</h2>
-</hgroup>
+<h1>@ViewBag.Title</h1>
 
-<article>
-    <p>
-        Use this area to provide additional information.
-    </p>
-
-    <p>
-        Use this area to provide additional information.
-    </p>
-
-    <p>
-        Use this area to provide additional information.
-    </p>
+<article class="aboutMain">
+  <h2>Welcome to the HeuristicLab Hive status monitor.</h2>
+  <p>From this monitor you can view the status of your hive in different ways.
+  </p>
+  <p>The @Html.MenuItem("Home", "Index", "Home") page offers a general overview of both current and historic hive status.
+  </p>
+  <p>The @Html.MenuItem("User", "UserTask", "LoginRequired") page, which requires logging in as a user, gives an overview of tasks 
+    belonging to the user, the Task Information tab, as well as the resources utilized by the user, the Task Overview tab.
+  </p>
+  <p>The @Html.MenuItem("Admin", "Admin", "LoginRequired") page requires logging in as a user with administrative priveleges and 
+    offers many different options. The User Overview tab allows the administrator to view tasks belonging to any user. The Task 
+    Overview tab offers a view of the resources utilized by any user. The Slave Overview tab provides a view of resource usage by on 
+    individual slaves. The Exception Overview tab offers a view of exceptions which occured and the slave on which they occured.
+  </p>
+  <p>HeuristicLab development site: <a href="http://dev.heuristiclab.com/trac/hl/core">HeuristicLab Development</a>
+  </p>
+  <p>Support is available here: <a href="http://dev.heuristiclab.com/trac/hl/core/wiki/UsersSupport">HeuristicLab Support</a>
+  </p>
 </article>
-
-<aside>
-    <h3>Aside Title</h3>
-    <p>
-        Use this area to provide additional information.
-    </p>
-    <ul>
-        <li>@Html.ActionLink("Home", "Index", "Home")</li>
-        <li>@Html.ActionLink("About", "About", "Home")</li>
-        <li>@Html.ActionLink("Contact", "Contact", "Home")</li>
-    </ul>
-</aside>

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Home/Index.cshtml

@@ -6 +6 @@
 
 <h1>Current Status</h1>
-
-@*
-Original code
-<section>
-  <table>
-    <tr>
-      <td>Overall Available Cores</td>
-      <td>@Model.OverallCurrentlyAvailableCores</td>
-    </tr>
-    <tr>
-      <td>Availabe Cores (real)</td>
-      <td>@Model.CurrentlyAvailableCores</td>
-    </tr>
-    <tr>
-      <td>Used Cores</td>
-      <td>@Model.CurrentlyUsedCores</td>
-    </tr>
-    <tr>
-      <td>System-Wide Waiting Tasks</td>
-      <td>@Model.CurrentlyJobsWaiting</td>
-    </tr>
-    <tr>
-      <td>Overall Avg. CPU Utilization</td>
-      <td>@Model.OverallCpuUtilization</td>
-    </tr>
-    <tr>
-      <td>Available Avg. CPU Utilization</td>
-      <td>@Model.AvailableCpuUtilization</td>
-    </tr>
-  </table>
-</section>*@
-
 <section class="chartContainer">
   <h1 class="title">Current Hive Status</h1>
   <button class="collapse">-</button>
-@*  <label id="lblCurrentCPUUtilization" class="smoothieLabel">Current CPU Utilization</label>
-  <div class="smoothieHolder">
-    <canvas id="CurrentCPUUtilization" class="smoothieChart"></canvas>
-  </div>
-  <label id="lblCurrentTotalUsedCores" class="smoothieLabel">Current Total and Used Cores</label>
-  <div class="smoothieHolder">
-    <canvas id="CurrentTotalUsedCores" class="smoothieChart"></canvas>
-  </div>
-  <label id="lblCurrentTotalUsedMemory" class="smoothieLabel">Current Total and Used Memory</label>
-  <div class="smoothieHolder">
-    <canvas id="CurrentTotalUsedMemory" class="smoothieChart"></canvas>
-  </div>*@
   <div id="CurrentCPUUtilization"></div>
   <div id="CurrentTotalUsedCores"></div>
@@ -118 +74 @@
       $(".date").datepicker({
         dateFormat: "yy-mm-dd",
-        onSelect: function () { refreshCharts(); }
+        onSelect: function () { RefreshCharts(); }
       });
 
       $("#Refresh").click(function () {
-        refreshCharts();
+        RefreshCharts();
       });
-
-      //resizeSmoothie();
-      //createSmoothie();
     });
 
-    function refreshCharts() {
+    function RefreshCharts() {
       var startDate = $('#Start').val();
       var endDate = $('#End').val();
@@ -138 +91 @@
     }
 
-@*    function createSmoothie() {
-      //Create new SmoothieChart(s)
-      @ChartHelper.CreateSmoothieChart("CurrentCPUUtilization","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
-      @ChartHelper.CreateSmoothieChart("CurrentTotalUsedCores","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
-      @ChartHelper.CreateSmoothieChart("CurrentTotalUsedMemory","rgb(179, 179, 179)","rgb(242, 242, 242)","rgb(0, 22, 84)")
-
-      //Second argument is delay in chart display, used to make drawing smooth,
-      //Should be matched to interval time below
-      @ChartHelper.SetSmoothieCanvas("CurrentCPUUtilization","5000")
-      @ChartHelper.SetSmoothieCanvas("CurrentTotalUsedCores","5000")
-      @ChartHelper.SetSmoothieCanvas("CurrentTotalUsedMemory","5000")
-
-      //Set interval to run ajax and get new values
-      @ChartHelper.AssignTimeSeries("averageUsage", "CurrentCPUUtilization", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
-      @ChartHelper.AssignTimeSeries("overallCore", "CurrentTotalUsedCores", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
-      @ChartHelper.AssignTimeSeries("usedCore", "CurrentTotalUsedCores", "rgb(242, 182, 70)", "rgba(255, 199, 94, 0.4)")
-      @ChartHelper.AssignTimeSeries("overallMemory", "CurrentTotalUsedMemory", "rgb(0, 255, 0)", "rgba(0, 255, 0, 0.4)")
-      @ChartHelper.AssignTimeSeries("usedMemory", "CurrentTotalUsedMemory", "rgb(242, 182, 70)", "rgba(255, 199, 94, 0.4)")
-
-      setInterval(function () { getChartUpdate() }, 5000);
-
-      //Hit by interval, jQuery ajax request to get new data from db
-      function getChartUpdate() {
-        @ChartHelper.UpdateChartData("CurrentCPUUtilization", Url.Action("CurrentCpuUtilization","ChartData"))
-        @ChartHelper.UpdateChartData("CurrentTotalUsedCores", Url.Action("CurrentCores","ChartData"))
-        @ChartHelper.UpdateChartData("CurrentTotalUsedMemory", Url.Action("CurrentMemory","ChartData"))
-      }
-    }*@
-
     $(document).ready(function () {
       @ChartHelper.SetStreamingProperties(1000,20,10)
@@ -174 +98 @@
       @ChartHelper.CreateStreamChart("CurrentMemory", "CurrentTotalUsedMemory",Url.Action("CurrentMemory","ChartData"),"Current Total vs. Used Memory")
 
-      function doUpdate() {
+      function DoUpdate() {
         @ChartHelper.UpdateStreamChart("CurrentCPU","CurrentCPUUtilization", Url.Action("CurrentCpuUtilization","ChartData"),"FixedY")
         @ChartHelper.UpdateStreamChart("CurrentCores","CurrentTotalUsedCores", Url.Action("CurrentCores","ChartData"))
         @ChartHelper.UpdateStreamChart("CurrentMemory","CurrentTotalUsedMemory", Url.Action("CurrentMemory","ChartData"))
-        setTimeout(doUpdate, refreshRate);
+        setTimeout(DoUpdate, refreshRate);
       }
 
-      doUpdate();
+      DoUpdate();
 
     });

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/Admin.cshtml

@@ -63 +63 @@
       <button id="UserApply">Apply</button>
     </fieldset>
-    <button id="ScrollTop">^</button>
     <section id="TasksContainer" class="tabDataContainer"></section>
   </section>
@@ -113 +112 @@
     <section id="SlavesContainer" class="tabDataContainer"></section>
   </section>
-  //Slave overview
+  //Exception overview
   <section id="ExceptionOverviewTab" class="tabSection">
     <fieldset class="filterChoices">
@@ -119 +118 @@
       <label>Date</label>
       <input type="checkbox" name="filterChoice" value="ExceptionDate" checked="checked">
-      <label>Users</label>
-      <input type="checkbox" name="filterChoice" value="ExceptionUser">
+      <label>Slave</label>
+      <input type="checkbox" name="filterChoice" value="ExceptionSlave">
       <label>Limit</label>
       <select id="ExceptionLimit">
@@ -138 +137 @@
         @Html.TextBox("ExceptionEnd", (DateTime.Now + new TimeSpan(1, 0, 0, 0)).ToString("yyyy-MM-dd"), new { @class = "date" })
       </fieldset>
-      <fieldset id="FilterExceptionUser" class="filterContainer">
-        <legend>User</legend>
-        <select id="ExceptionUserList">
-        </select>
-      </fieldset>
-      <button id="ExcpetionApply">Apply</button>
+      <fieldset id="FilterExceptionSlave" class="filterContainer">
+        <legend>Slave</legend>
+        @Html.DropDownList("Slaves")
+      </fieldset>
+      <button id="ExceptionApply">Apply</button>
     </fieldset>
     <section id="ExceptionContainer" class="tabDataContainer"></section>
   </section>
+  <button id="ScrollTop">^</button>
 }
 
@@ -171 +170 @@
     var endDate;
     var selectedUser;
+    var selectedSlave;
     var limit;
     var pageNumber;
     var userId;
-    var numberTasks = 0;
 
     $(document).ready(function () {
@@ -218 +217 @@
     });
 
+    $(".tabButton").click(function () {
+      var sender = $(this).attr('id');
+      $(".tabButton").css({ 'border-bottom': '1px solid #8297F5', 'background': 'none' });
+      $(this).css({ 'border-bottom': '1px solid #E0E6FF', 'background-color': '#E0E6FF' });
+      $(".tabSection").css('display', 'none');
+      $("#" + sender.slice(0, -6) + "Tab").css('display', 'block');
+    })
+
+    //User Overview
     function RefreshUser() {
       selectedUser = $("#UserList").val();
@@ -235 +243 @@
         taskState = $('#TaskState').val();
       }
-      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState")
+      @ExceptionHelper.UserExceptions("TasksContainer", Url.Action("TaskExceptions", "ExceptionData"), "limit", "selectedUser", "startDate", "endDate", "jobId", "taskState")
       @ChartHelper.TasksForUser("TasksContainer", "Task", Url.Action("UserTask", "ChartData"), "RefreshUser", "selectedUser", "limit", "startDate", "endDate", "jobId", "taskState", "pageNumber")
       pageNumber = null;
@@ -243 +251 @@
     @ExceptionHelper.ScrollToException()
 
+    //Task Overview
     $("#TaskUserList").change(function () {
       RefreshTask();
@@ -254 +263 @@
     }
 
-    $("#SlaveList").change(function () {
-      RefreshSlave();
-    });
-
+    //Slave Overview
     function RefreshSlave() {
       selectedUser = null;
@@ -270 +276 @@
         selectedUser = $('#SlaveUserList').val();
       }
-      @ChartHelper.SlaveInfoChart("SlavesContainer",Url.Action("SlaveInfo","ChartData"),"limit","startDate","endDate","selectedUser","RefreshSlave","pageNumber")
+      @ChartHelper.SlaveInfoChart("SlavesContainer", Url.Action("SlaveInfo", "ChartData"), "limit", "startDate", "endDate", "selectedUser", "RefreshSlave", "pageNumber")
       pageNumber = null;
     }
 
-    $(".tabButton").click(function () {
-      var sender = $(this).attr('id');
-      $(".tabButton").css({'border-bottom' : '1px solid #8297F5', 'background' : 'none' });
-      $(this).css({ 'border-bottom': '1px solid #E0E6FF', 'background-color': '#E0E6FF' });
-      $(".tabSection").css('display', 'none');
-      $("#" + sender.slice(0, -6) + "Tab").css('display', 'block');
-    })
+    @ChartHelper.ResizeSlaves()
+
+    //Exceptions Overview
+    $("#ExceptionSlaveList").change(function () {
+      RefreshException();
+    });
+
+    function RefreshException() {
+      selectedSlave = null;
+      limit = $("#ExceptionLimit").val();
+      startDate = null;
+      endDate = null;
+      if ($("[value='ExceptionDate']").is(":checked")) {
+        startDate = $('#ExceptionStart').val();
+        endDate = $('#ExceptionEnd').val();
+      }
+      if ($("[value='ExceptionSlave']").is(':checked')) {
+        selectedSlave = $('#Slaves').val();
+      }
+      @ExceptionHelper.UserExceptions("ExceptionContainer", Url.Action("TaskExceptions", "ExceptionData"), "limit", null, "startDate", "endDate", null, null)
+      @ExceptionHelper.ShowErrors("ExceptionContainer")
+      @ExceptionHelper.ErrorsOnSlaves("ExceptionContainer",Url.Action("SlaveExceptions", "ExceptionData"),"limit","startDate", "endDate","selectedSlave")
+    }
+    @*@ExceptionHelper.ShowSlaveInfo(Url.Action("SlaveInfo", "ChartData"),"limit","startDate","endDate")*@
   </script>
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/LoginRequired/UserTask.cshtml

@@ -129 +129 @@
         taskState = $('#TaskState').val();
       }
-      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"userName","limit","startDate","endDate","jobId","taskState")
+      @ExceptionHelper.UserExceptions("TasksContainer",Url.Action("TaskExceptions", "ExceptionData"),"limit","userName","startDate","endDate","jobId","taskState")
       @ChartHelper.TasksForUser("TasksContainer","Task",Url.Action("UserTask", "ChartData"),"TaskInformation","userName","limit","startDate","endDate","jobId","taskState","pageNumber")
       pageNumber = null;

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Views/Shared/_Layout.cshtml

@@ -25 +25 @@
                 <li>@Html.MenuItem("Admin", "Admin", "LoginRequired")</li>
                 <li>@Html.MenuItem("About", "About", "Home")</li>
-                <li>@Html.MenuItem("Contact", "Contact", "Home")</li>
             </ul>
         </nav>