Changeset 12776 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3

Timestamp:

07/17/15 16:57:22 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive-3.3:

• HiveStatisticsGenerator.cs: Jobs that are deleted are now automatically marked as completed in the hive statistics tables. This was added because when a job got paused and deleted afterwards, it would still show up as ongoing job in the hive statistics.
• Minor changes in NewHiveService.cs

HeuristicLab.Services.WebApp.Statistics-3.3:

• Expired slaves are now shown as offline (previously the last known state was shown)
• Adjusted dialog height

HeuristicLab.Services.WebApp-3.3:

• Changed string.Format to Path.Combine to concate directory paths

Location:

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3

Files:

• Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• WebApi/ClientController.cs (modified) (3 diffs)
• WebApp/clients/details/clientTaskDetailsDialog.cshtml (modified) (1 diff)
• WebApp/jobs/details/jobTaskDetailsDialog.cshtml (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/Properties/AssemblyInfo.cs.frame

@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Services.WebApp")]
-[assembly: AssemblyDescription("HeuristicLab Services Application Container")]
+[assembly: AssemblyTitle("HeuristicLab.Services.WebApp.Statistics")]
+[assembly: AssemblyDescription("HeuristicLab WebApp Statistics plugin")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApi/ClientController.cs

@@ -83 +83 @@
                     UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                     CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                    State = clientInfo.SlaveState.ToString(),
+                    State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                     LastUpdate = clientInfo.Time,
                     GroupId = client.ResourceGroupId,
@@ -132 +132 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,
@@ -218 +218 @@
                          UsedMemory = offline ? 0 : clientInfo.UsedMemory,
                          CpuUtilization = offline ? 0 : clientInfo.CpuUtilization,
-                         State = clientInfo.SlaveState.ToString(),
+                         State = offline ? SlaveState.Offline.ToString() : clientInfo.SlaveState.ToString(),
                          GroupId = client.ResourceGroupId,
                          GroupName = client.GroupName,

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialog.cshtml

@@ -5 +5 @@
     <h4 class="modal-title">Task #{{taskNo}} - {{task.Id}}</h4>
 </div>
-<div class="modal-body" style="height: 430px">
+<div class="modal-body" style="height: 440px">
     <tabset>
         <tab heading="Details">
-            <div style="height: 330px" class="center-block">
+            <div style="height: 340px" class="center-block">
                 <div class="row" style="padding-top: 30px">
                     <div class="col-md-6">

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml

@@ -3 +3 @@
     <h4 class="modal-title">Task #{{taskNo}} - {{task.Id}}</h4>
 </div>
-<div class="modal-body" style="height: 430px">
+<div class="modal-body" style="height: 440px">
     <tabset>
         <tab heading="Details">
-            <div style="height: 330px" class="center-block">
+            <div style="height: 340px" class="center-block">
                 <div class="row" style="padding-top: 30px">
                     <div class="col-md-12">