Changeset 12551 for branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp
- Timestamp:
- 06/30/15 13:12:07 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 17 edited
-
. (modified) (1 prop)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml (modified) (7 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetails.cshtml (modified) (9 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetailsCtrl.js (modified) (4 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialog.cshtml (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetails.cshtml (modified) (7 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetailsCtrl.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/groups.cshtml (modified) (4 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetails.cshtml (modified) (5 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetailsCtrl.js (modified) (2 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml (modified) (6 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/clientService.js (modified) (1 diff)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml (modified) (5 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js (modified) (3 diffs)
-
HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/clients.cshtml
r12525 r12551 3 3 <header class="view-header"> 4 4 <ul class="nav nav-list nav-list-topbar pull-left"> 5 <li>6 <a ng-href="#/statistics/jobs">Jobs</a>7 </li>8 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator))9 {10 5 <li> 11 <a ng-href="#/statistics/ users">Users</a>6 <a ng-href="#/statistics/jobs">Jobs</a> 12 7 </li> 13 } 14 <li class="active"> 15 <a ng-href="#/statistics/clients">Clients</a> 16 </li> 17 <li> 18 <a ng-href="#/statistics/groups">Groups</a> 19 </li> 8 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) 9 { 10 <li> 11 <a ng-href="#/statistics/users">Users</a> 12 </li> 13 } 14 <li class="active"> 15 <a ng-href="#/statistics/clients">Clients</a> 16 </li> 17 <li> 18 <a ng-href="#/statistics/groups">Groups</a> 19 </li> 20 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 21 <li> 22 <a ng-href="#/statistics/exceptions">Exceptions</a> 23 </li> 24 } 20 25 </ul> 21 26 </header> … … 37 42 <th>Cores</th> 38 43 <th>Cpu Utilization</th> 44 <th>Memory</th> 39 45 <th>State</th> 40 46 <th></th> … … 50 56 <td>{{client.UsedCores}} / {{client.TotalCores}}</td> 51 57 <td>{{client.CpuUtilization | number: 2}} %</td> 58 <td>{{client.UsedMemory | kbToGB}} / {{client.TotalMemory | kbToGB}} GB</td> 52 59 <td>{{client.State}}</td> 53 60 <td> … … 56 63 </tr> 57 64 <tr ng-hide="clientPage.Clients.length"> 58 <td colspan=" 6" class="text-center">No clients found!</td>65 <td colspan="7" class="text-center">No clients found!</td> 59 66 </tr> 60 67 </table> … … 82 89 <th>Cores</th> 83 90 <th>Cpu Utilization</th> 91 <th>Memory</th> 84 92 <th>State</th> 85 93 <th></th> … … 91 99 <td>{{client.UsedCores}} / {{client.TotalCores}}</td> 92 100 <td>{{client.CpuUtilization | number: 2}} %</td> 101 <td>{{client.UsedMemory | kbToGB}} / {{client.TotalMemory | kbToGB}} GB</td> 93 102 <td>{{client.State}}</td> 94 103 <td> … … 97 106 </tr> 98 107 <tr ng-hide="expiredClientPage.Clients.length"> 99 <td colspan=" 6" class="text-center">No expired clients found!</td>108 <td colspan="7" class="text-center">No expired clients found!</td> 100 109 </tr> 101 110 </table> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetails.cshtml
r12525 r12551 17 17 <a ng-href="#/statistics/groups">Groups</a> 18 18 </li> 19 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 20 <li> 21 <a ng-href="#/statistics/exceptions">Exceptions</a> 22 </li> 23 } 19 24 </ul> 20 25 </header> … … 46 51 <tr> 47 52 <td class="text-left">Up Time:</td> 48 <td>{{client.UpTime }}</td>53 <td>{{client.UpTime | toTimespan}}</td> 49 54 </tr> 50 55 <tr> 51 56 <td class="text-left">Last Update:</td> 52 <td>{{client.LastUpdate }}</td>57 <td>{{client.LastUpdate | toDate}}</td> 53 58 </tr> 54 59 </table> … … 58 63 <tr> 59 64 <td class="text-left">Total Unavailable Time:</td> 60 <td class="text-right">{{client.TotalUnavailableTime }}</td>65 <td class="text-right">{{client.TotalUnavailableTime | toTimespan}}</td> 61 66 </tr> 62 67 <tr> 63 68 <td class="text-left">Total Calculating Time:</td> 64 <td class="text-right">{{client.TotalCalculatingTime }}</td>69 <td class="text-right">{{client.TotalCalculatingTime | toTimespan}}</td> 65 70 </tr> 66 71 <tr> 67 72 <td class="text-left">Total Idle Time:</td> 68 <td class="text-right">{{client.TotalIdleTime }}</td>73 <td class="text-right">{{client.TotalIdleTime | toTimespan}}</td> 69 74 </tr> 70 75 <tr> 71 76 <td class="text-left">Total Transferring Time:</td> 72 <td class="text-right">{{client.TotalTransferringTime }}</td>77 <td class="text-right">{{client.TotalTransferringTime | toTimespan}}</td> 73 78 </tr> 74 79 <tr> 75 80 <td class="text-left">Total Offline Time:</td> 76 <td class="text-right">{{client.TotalOfflineTime }}</td>81 <td class="text-right">{{client.TotalOfflineTime | toTimespan}}</td> 77 82 </tr> 78 83 </table> … … 137 142 <knob knob-data="knobData.cpu" knob-options="knobOptions"></knob> 138 143 </div> 144 <table class="table table-no-border table-condensed table-auto-width table-content"> 145 <tr> 146 <td class="text-left"> </td> 147 <td class="text-right"> </td> 148 </tr> 149 <tr> 150 <td class="text-left"> </td> 151 <td class="text-right"> </td> 152 </tr> 153 </table> 139 154 </div> 140 155 </div> … … 153 168 <tr> 154 169 <td class="text-left">Total:</td> 155 <td class="text-right">{{client.TotalMemory | number}} GB</td>170 <td class="text-right">{{client.TotalMemory | kbToGB}} GB</td> 156 171 </tr> 157 172 <tr> 158 173 <td class="text-left">Used:</td> 159 <td class="text-right">{{client.UsedMemory | number}} GB</td>174 <td class="text-right">{{client.UsedMemory | kbToGB}} GB</td> 160 175 </tr> 161 176 </table> … … 163 178 </div> 164 179 </div> 165 166 180 </div> 167 181 </div> … … 169 183 <div id="tasks-filter" class="default-filter-header text-center"> 170 184 <form class="form-inline"> 171 <div class="form-group" >185 <div class="form-group" style="margin-left: 5px; margin-right: 5px;"> 172 186 <div class="btn-group" data-toggle="buttons"> 173 187 <label class="btn btn-default" ng-class="{active: state.Selected}" ng-repeat="state in states" … … 175 189 <input type="checkbox" autocomplete="off" checked> {{state.State}} 176 190 </label> 191 </div> 192 </div> 193 <div class="form-group" style="margin-left: 5px; margin-right: 5px;"> 194 <div class="btn-group" dropdown dropdown-append-to-body> 195 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle> 196 {{curUserName}} <span class="caret"></span> 197 </button> 198 <ul class="dropdown-menu" role="menu"> 199 <li> 200 <a ng-href="#/statistics/clients/{{client.Id}}" 201 ng-click="userChanged('00000000-0000-0000-0000-000000000000', 'All Users')">All Users</a> 202 </li> 203 <li class="divider"></li> 204 <li ng-repeat="user in client.Users"> 205 <a ng-href="#/statistics/clients/{{client.Id}}" 206 ng-click="userChanged(user.Id, user.Name)">{{user.Name}}</a> 207 </li> 208 </ul> 177 209 </div> 178 210 </div> … … 210 242 </tr> 211 243 } 212 <tr> 213 <td>Start Time:</td> 214 <td class="text-right">{{task.StartTime}}</td> 215 </tr> 216 <tr> 217 <td>End Time:</td> 218 <td class="text-right">{{task.EndTime}}</td> 219 </tr> 244 <tr> 245 <td>Start Time:</td> 246 <td ng-show="task.StartTime" class="text-right">{{task.StartTime | toDate}}</td> 247 <td ng-hide="task.StartTime" class="text-right">Not started</td> 248 </tr> 249 <tr> 250 <td>End Time:</td> 251 <td ng-show="task.EndTime" class="text-right">{{task.EndTime | toDate}}</td> 252 <td ng-hide="task.EndTime" class="text-right">Not finished</td> 253 </tr> 220 254 <tr> 221 255 <td>Calculating Time:</td> 222 <td class="text-right">{{task.CalculatingTime }}</td>256 <td class="text-right">{{task.CalculatingTime | toTimespan}}</td> 223 257 </tr> 224 258 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientDetailsCtrl.js
r12516 r12551 4 4 ['$scope', '$stateParams', '$interval', 'app.statistics.clientService', 'app.statistics.taskService', '$modal', 5 5 function ($scope, $stateParams, $interval, clientService, taskService, $modal) { 6 $scope.curUserId = '00000000-0000-0000-0000-000000000000'; 7 $scope.curUserName = 'All Users'; 6 8 $scope.interval = defaultPageUpdateInterval; 7 9 $scope.curTaskPage = 1; … … 33 35 clientService.getClientDetails({ id: $stateParams.id }, function (client) { 34 36 $scope.client = client; 35 $scope.client.TotalMemory = Math.round($scope.client.TotalMemory / 1024);36 $scope.client.UsedMemory = Math.round($scope.client.UsedMemory / 1024);37 37 $scope.knobData.cores = (client.UsedCores / client.TotalCores) * 100; 38 38 $scope.knobData.cpu = client.CpuUtilization; 39 39 $scope.knobData.memory = (client.UsedMemory / client.TotalMemory) * 100; 40 $scope.client.LastUpdate = CSharpDateToString($scope.client.LastUpdate);41 $scope.client.UpTime = $scope.client.UpTime.toHHMMSS();42 $scope.client.TotalUnavailableTime = $scope.client.TotalUnavailableTime.toHHMMSS();43 $scope.client.TotalCalculatingTime = $scope.client.TotalCalculatingTime.toHHMMSS();44 $scope.client.TotalIdleTime = $scope.client.TotalIdleTime.toHHMMSS();45 $scope.client.TotalOfflineTime = $scope.client.TotalOfflineTime.toHHMMSS();46 $scope.client.TotalTransferringTime = $scope.client.TotalTransferringTime.toHHMMSS();47 40 48 41 var length = client.TasksStates.length; … … 84 77 } 85 78 86 taskService.getTasksByClientId({ id: $stateParams.id, page: $scope.curTaskPage, size: $scope.taskPageSize }, states,79 taskService.getTasksByClientId({ id: $stateParams.id, page: $scope.curTaskPage, size: $scope.taskPageSize, userId: $scope.curUserId }, states, 87 80 function (taskPage) { 88 81 $scope.taskPage = taskPage; 89 var length = $scope.taskPage.Tasks.length;90 for (var i = 0; i < length; ++i) {91 $scope.taskPage.Tasks[i].TotalTime = $scope.taskPage.Tasks[i].TotalTime.toHHMMSS();92 $scope.taskPage.Tasks[i].InitialWaitingTime = $scope.taskPage.Tasks[i].InitialWaitingTime.toHHMMSS();93 $scope.taskPage.Tasks[i].WaitingTime = $scope.taskPage.Tasks[i].WaitingTime.toHHMMSS();94 $scope.taskPage.Tasks[i].CalculatingTime = $scope.taskPage.Tasks[i].CalculatingTime.toHHMMSS();95 $scope.taskPage.Tasks[i].TransferTime = $scope.taskPage.Tasks[i].TransferTime.toHHMMSS();96 var startTime = $scope.taskPage.Tasks[i].StartTime;97 if (isDefined(startTime)) {98 $scope.taskPage.Tasks[i].StartTime = CSharpDateToString(startTime);99 } else {100 $scope.taskPage.Tasks[i].StartTime = 'Not started';101 }102 var endTime = $scope.taskPage.Tasks[i].EndTime;103 if (isDefined(endTime)) {104 $scope.taskPage.Tasks[i].EndTime = CSharpDateToString(endTime);105 } else {106 $scope.taskPage.Tasks[i].EndTime = 'Not finished';107 }108 }109 82 } 110 83 ); … … 121 94 state.Selected = !state.Selected; 122 95 $scope.curTaskPage = 1; 96 getClientDetails(); 97 }; 98 99 $scope.userChanged = function(id, name) { 100 $scope.curUserId = id; 101 $scope.curUserName = name; 123 102 getClientDetails(); 124 103 }; -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/clients/details/clientTaskDetailsDialog.cshtml
r12516 r12551 14 14 <tr> 15 15 <td>Start Time:</td> 16 <td class="text-right">{{task.StartTime}}</td> 16 <td ng-show="task.StartTime" class="text-left">{{task.StartTime | toDate}}</td> 17 <td ng-hide="task.StartTime" class="text-left">Not started</td> 17 18 </tr> 18 19 <tr> 19 20 <td>End Time:</td> 20 <td class="text-right">{{task.EndTime}}</td> 21 <td ng-show="task.EndTime" class="text-left">{{task.EndTime | toDate}}</td> 22 <td ng-hide="task.EndTime" class="text-left">Not finished</td> 21 23 </tr> 22 24 <tr> … … 58 60 <tr> 59 61 <td>Total Time:</td> 60 <td>{{task.TotalTime }}</td>62 <td>{{task.TotalTime | toTimespan}}</td> 61 63 </tr> 62 64 <tr> 63 65 <td>Initial Waiting Time:</td> 64 <td>{{task.InitialWaitingTime }}</td>66 <td>{{task.InitialWaitingTime | toTimespan}}</td> 65 67 </tr> 66 68 <tr> 67 69 <td>Waiting Time:</td> 68 <td>{{task.WaitingTime }}</td>70 <td>{{task.WaitingTime | toTimespan}}</td> 69 71 </tr> 70 72 <tr> 71 73 <td>Calculating Time:</td> 72 <td>{{task.CalculatingTime }}</td>74 <td>{{task.CalculatingTime | toTimespan}}</td> 73 75 </tr> 74 76 <tr> 75 77 <td>Transfer Time:</td> 76 <td>{{task.TransferTime }}</td>78 <td>{{task.TransferTime | toTimespan}}</td> 77 79 </tr> 78 80 </table> … … 82 84 <tr> 83 85 <td>Calculation Runs:</td> 84 <td >{{task.NumCalculationRuns}}</td>86 <td class="text-right">{{task.NumCalculationRuns}}</td> 85 87 </tr> 86 88 <tr> 87 89 <td>Retries Runs:</td> 88 <td >{{task.NumRetries}}</td>90 <td class="text-right">{{task.NumRetries}}</td> 89 91 </tr> 90 92 <tr> 91 93 <td>Cores Required:</td> 92 <td >{{task.CoresRequired}}</td>94 <td class="text-right">{{task.CoresRequired}}</td> 93 95 </tr> 94 96 <tr> 95 97 <td>Memory Required:</td> 96 <td >{{task.MemoryRequired}}</td>98 <td class="text-right">{{task.MemoryRequired}} MB</td> 97 99 </tr> 98 100 <tr> 99 101 <td>Priority:</td> 100 <td >{{task.Priority}}</td>102 <td class="text-right">{{task.Priority}}</td> 101 103 </tr> 102 104 </table> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetails.cshtml
r12525 r12551 16 16 <li class="active"> 17 17 <a ng-href="#/statistics/groups">Groups</a> 18 </li> 18 </li> 19 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 20 <li> 21 <a ng-href="#/statistics/exceptions">Exceptions</a> 22 </li> 23 } 19 24 </ul> 20 25 </header> … … 22 27 <div class="default-view-container"> 23 28 <div class="row"> 24 <div class="col-lg- 12">29 <div class="col-lg-9"> 25 30 <div class="panel panel-default"> 26 31 <div class="panel-heading"> … … 29 34 <div class="panel-body"> 30 35 <div class="row"> 31 <div class="col-md- 5">36 <div class="col-md-6"> 32 37 <table class="table table-no-border table-condensed table-auto-width table-content"> 33 38 <tr> … … 37 42 <tr> 38 43 <td class="text-left">Clients:</td> 39 <td class="text-right">{{group.Clients}}</td> 40 </tr> 41 <tr> 42 <td class="text-left">Cpu Utilization:</td> 43 <td class="text-right">{{group.CpuUtilization | number: 2}} %</td> 44 <td class="text-right">{{group.OnlineClients}} / {{group.TotalClients}}</td> 44 45 </tr> 45 46 </table> 46 47 </div> 47 <div class="col-md- 5">48 <div class="col-md-6"> 48 49 <table class="table table-no-border table-condensed table-auto-width table-content"> 49 50 <tr> 50 <td class="text-left">TotalCores:</td> 51 <td class="text-right">{{group.TotalCores}}</td> 52 </tr> 53 <tr> 54 <td class="text-left">UsedCores:</td> 55 <td class="text-right">{{group.UsedCores}}</td> 56 </tr> 57 <tr> 58 <td class="text-left">Total Memory:</td> 59 <td class="text-right">{{group.TotalMemory}}</td> 60 </tr> 61 <tr> 62 <td class="text-left">Used Memory:</td> 63 <td class="text-right">{{group.UsedMemory}}</td> 51 <td class="text-left">Total Unavailable Time:</td> 52 <td class="text-right">{{group.TotalUnavailableTime | toTimespan}}</td> 53 </tr> 54 <tr> 55 <td class="text-left">Total Calculating Time:</td> 56 <td class="text-right">{{group.TotalCalculatingTime | toTimespan}}</td> 57 </tr> 58 <tr> 59 <td class="text-left">Total Idle Time:</td> 60 <td class="text-right">{{group.TotalIdleTime | toTimespan}}</td> 61 </tr> 62 <tr> 63 <td class="text-left">Total Transferring Time:</td> 64 <td class="text-right">{{group.TotalTransferringTime | toTimespan}}</td> 65 </tr> 66 <tr> 67 <td class="text-left">Total Offline Time:</td> 68 <td class="text-right">{{group.TotalOfflineTime | toTimespan}}</td> 64 69 </tr> 65 70 </table> 66 71 </div> 67 68 <div class="col-md-2"></div> 69 </div> 72 </div> 73 </div> 74 </div> 75 </div> 76 <div class="col-lg-3 col-md-6"> 77 <div class="panel panel-default"> 78 <div class="panel-heading"> 79 <h3 class="panel-title">Tasks Overview</h3> 80 </div> 81 <div class="panel-body"> 82 <table class="table table-no-border table-condensed table-auto-width table-content"> 83 <tr> 84 <td class="text-left">Total:</td> 85 <td class="text-right">{{totalGroupTasks}}</td> 86 </tr> 87 <tr ng-repeat="state in group.TasksStates"> 88 <td class="text-left">{{state.State}}:</td> 89 <td class="text-right">{{state.Count}}</td> 90 </tr> 91 </table> 70 92 </div> 71 93 </div> 72 94 </div> 73 95 </div> 96 97 <div class="row"> 98 <div class="col-lg-3 col-md-6"> 99 <div class="panel panel-default"> 100 <div class="panel-heading"> 101 <h3 class="panel-title">Cores</h3> 102 </div> 103 <div class="panel-body"> 104 <div class="text-center"> 105 <knob knob-data="knobData.cores" knob-options="knobOptions"></knob> 106 </div> 107 <table class="table table-no-border table-condensed table-auto-width table-content"> 108 <tr> 109 <td class="text-left">Total:</td> 110 <td class="text-right">{{group.TotalCores | number}}</td> 111 </tr> 112 <tr> 113 <td class="text-left">Used:</td> 114 <td class="text-right">{{group.UsedCores | number}}</td> 115 </tr> 116 </table> 117 </div> 118 </div> 119 </div> 120 121 <div class="col-lg-3 col-md-6"> 122 <div class="panel panel-default"> 123 <div class="panel-heading"> 124 <h3 class="panel-title">CPU Utilization</h3> 125 </div> 126 <div class="panel-body"> 127 <div class="text-center"> 128 <knob knob-data="knobData.cpu" knob-options="knobOptions"></knob> 129 </div> 130 <table class="table table-no-border table-condensed table-auto-width table-content"> 131 <tr> 132 <td class="text-left">Total:</td> 133 <td class="text-right">{{group.TotalCpuUtilization | number: 2}} %</td> 134 </tr> 135 <tr> 136 <td class="text-left">Active:</td> 137 <td class="text-right">{{group.ActiveCpuUtilization | number: 2}} %</td> 138 </tr> 139 </table> 140 </div> 141 </div> 142 </div> 143 144 <div class="col-lg-3 col-md-6"> 145 <div class="panel panel-default"> 146 <div class="panel-heading"> 147 <h3 class="panel-title">Memory</h3> 148 </div> 149 <div class="panel-body"> 150 <div class="text-center"> 151 <knob knob-data="knobData.memory" knob-options="knobOptions"></knob> 152 </div> 153 <table class="table table-no-border table-condensed table-auto-width table-content"> 154 <tr> 155 <td class="text-left">Total:</td> 156 <td class="text-right">{{group.TotalMemory | kbToGB}} GB</td> 157 </tr> 158 <tr> 159 <td class="text-left">Used:</td> 160 <td class="text-right">{{group.UsedMemory | kbToGB}} GB</td> 161 </tr> 162 </table> 163 </div> 164 </div> 165 </div> 166 </div> 167 74 168 <div class="row"> 75 169 <div class="col-lg-12"> … … 86 180 <th>Cores</th> 87 181 <th>Cpu Utilization</th> 182 <th>Memory</th> 88 183 <th>State</th> 89 184 <th></th> … … 95 190 <td>{{client.UsedCores}} / {{client.TotalCores}}</td> 96 191 <td>{{client.CpuUtilization | number: 2}} %</td> 192 <td>{{client.UsedMemory | kbToGB}} / {{client.TotalMemory | kbToGB}}</td> 97 193 <td>{{client.State}}</td> 98 194 <td> … … 101 197 </tr> 102 198 <tr ng-hide="clientPage.Clients.length"> 103 <td colspan=" 6" class="text-center">No clients found!</td>199 <td colspan="7" class="text-center">No clients found!</td> 104 200 </tr> 105 201 </table> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/details/groupDetailsCtrl.js
r12525 r12551 8 8 $scope.clientsPageSize = 20; 9 9 10 11 // details 12 $scope.knobOptions = { 13 'fgColor': "#f7921d", 14 'angleOffset': -125, 15 'angleArc': 250, 16 'readOnly': true, 17 'width': "80%", 18 'targetvalue': "100", 19 'format': function (value) { 20 return value; 21 }, 22 draw: function () { 23 $(this.i).val(this.cv + '%'); 24 } 25 }; 26 27 $scope.knobData = { 28 cores: 0, 29 cpu: 0, 30 memory: 0 31 }; 32 10 33 var getGroupDetails = function() { 11 34 groupService.getGroupDetails({ id: $stateParams.id }, function (group) { 12 35 $scope.group = group; 36 $scope.knobData.cores = (group.UsedCores / group.TotalCores) * 100; 37 $scope.knobData.cpu = group.ActiveCpuUtilization; 38 $scope.knobData.memory = (group.UsedMemory / group.TotalMemory) * 100; 39 40 var length = group.TasksStates.length; 41 var total = 0; 42 for (var i = 0; i < length; ++i) { 43 total += group.TasksStates[i].Count; 44 } 45 $scope.totalGroupTasks = total; 13 46 }); 14 47 }; -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/groups/groups.cshtml
r12525 r12551 16 16 <li class="active"> 17 17 <a ng-href="#/statistics/groups">Groups</a> 18 </li> 18 </li> 19 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 20 <li> 21 <a ng-href="#/statistics/exceptions">Exceptions</a> 22 </li> 23 } 19 24 </ul> 20 25 </header> … … 35 40 <th>Cores</th> 36 41 <th>Cpu Utilization</th> 42 <th>Memory</th> 37 43 <th>Clients</th> 38 44 <th></th> … … 44 50 <td>{{group.UsedCores}} / {{group.TotalCores}}</td> 45 51 <td>{{group.CpuUtilization | number: 2}} %</td> 46 <td>{{group.Clients}}</td> 52 <td>{{group.UsedMemory | kbToGB}} / {{group.TotalMemory | kbToGB}} GB</td> 53 <td>{{group.OnlineClients}} / {{group.TotalClients}}</td> 47 54 <td> 48 55 <a ng-href="#/statistics/groups/{{group.Id}}">Details</a> … … 50 57 </tr> 51 58 <tr ng-hide="groupPage.Groups.length"> 52 <td colspan=" 6" class="text-center">No groups found!</td>59 <td colspan="7" class="text-center">No groups found!</td> 53 60 </tr> 54 61 </table> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetails.cshtml
r12525 r12551 17 17 <a ng-href="#/statistics/groups">Groups</a> 18 18 </li> 19 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 20 <li> 21 <a ng-href="#/statistics/exceptions">Exceptions</a> 22 </li> 23 } 19 24 </ul> 20 25 </header> … … 37 42 <tr> 38 43 <td class="text-left">Created at:</td> 39 <td>{{job.DateCreated }}</td>44 <td>{{job.DateCreated | toDate}}</td> 40 45 </tr> 41 46 <tr> 42 47 <td class="text-left">Completed at:</td> 43 <td>{{job.DateCompleted}}</td> 48 <td ng-show="job.DateCompleted">{{job.DateCompleted | toDate}}</td> 49 <td ng-hide="job.DateCompleted">Not completed yet</td> 44 50 </tr> 45 51 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { … … 61 67 <tr> 62 68 <td class="text-left">Total Time:</td> 63 <td class="text-right">{{job.TotalTime }}</td>69 <td class="text-right">{{job.TotalTime | toTimespan}}</td> 64 70 </tr> 65 71 <tr> 66 72 <td class="text-left">Total Calculating Time:</td> 67 <td class="text-right">{{job.TotalCalculatingTime }}</td>73 <td class="text-right">{{job.TotalCalculatingTime | toTimespan}}</td> 68 74 </tr> 69 75 <tr> 70 76 <td class="text-left">Total Waiting Time:</td> 71 <td class="text-right">{{job.TotalWaitingTime }}</td>77 <td class="text-right">{{job.TotalWaitingTime | toTimespan}}</td> 72 78 </tr> 73 79 <tr> … … 81 87 <tr> 82 88 <td class="text-left">Min Calculating Time:</td> 83 <td class="text-right">{{job.MinCalculatingTime }}</td>89 <td class="text-right">{{job.MinCalculatingTime | toTimespan}}</td> 84 90 </tr> 85 91 <tr> 86 92 <td class="text-left">Max Calculating Time:</td> 87 <td class="text-right">{{job.MaxCalculatingTime }}</td>93 <td class="text-right">{{job.MaxCalculatingTime | toTimespan}}</td> 88 94 </tr> 89 95 <tr> 90 96 <td class="text-left">Avg. Calculating Time:</td> 91 <td class="text-right">{{job.AvgCalculatingTime }}</td>97 <td class="text-right">{{job.AvgCalculatingTime | toTimespan}}</td> 92 98 </tr> 93 99 <tr> 94 100 <td class="text-left">Avg. Transferring Time:</td> 95 <td class="text-right">{{job.AvgTransferringTime }}</td>101 <td class="text-right">{{job.AvgTransferringTime | toTimespan}}</td> 96 102 </tr> 97 103 </table> … … 158 164 <tr> 159 165 <td>Start Time:</td> 160 <td class="text-right">{{task.StartTime}}</td> 166 <td ng-show="task.StartTime" class="text-right">{{task.StartTime | toDate}}</td> 167 <td ng-hide="task.StartTime" class="text-right">Not started</td> 161 168 </tr> 162 169 <tr> 163 170 <td>End Time:</td> 164 <td class="text-right">{{task.EndTime}}</td> 171 <td ng-show="task.EndTime" class="text-right">{{task.EndTime | toDate}}</td> 172 <td ng-hide="task.EndTime" class="text-right">Not finished</td> 165 173 </tr> 166 174 <tr> 167 175 <td>Calculating Time:</td> 168 <td class="text-right">{{task.CalculatingTime }}</td>176 <td class="text-right">{{task.CalculatingTime | toTimespan}}</td> 169 177 </tr> 170 178 <tr> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetailsCtrl.js
r12525 r12551 11 11 jobService.getJobDetails({ id: $stateParams.id }, function (job) { 12 12 $scope.job = job; 13 $scope.job.DateCreated = CSharpDateToString($scope.job.DateCreated);14 if (isDefined($scope.job.DateCompleted)) {15 $scope.job.DateCompleted = CSharpDateToString($scope.job.DateCompleted);16 } else {17 $scope.job.DateCompleted = 'Not completed yet';18 }19 13 $scope.job.CalculatingWaitingRatio = ($scope.job.TotalCalculatingTime / $scope.job.TotalWaitingTime); 20 $scope.job.AvgTransferringTime = $scope.job.AvgTransferringTime.toHHMMSS();21 $scope.job.AvgCalculatingTime = $scope.job.AvgCalculatingTime.toHHMMSS();22 $scope.job.MinCalculatingTime = $scope.job.MinCalculatingTime.toHHMMSS();23 $scope.job.MaxCalculatingTime = $scope.job.MaxCalculatingTime.toHHMMSS();24 $scope.job.TotalCalculatingTime = $scope.job.TotalCalculatingTime.toHHMMSS();25 $scope.job.TotalWaitingTime = $scope.job.TotalWaitingTime.toHHMMSS();26 $scope.job.TotalTime = $scope.job.TotalTime.toHHMMSS();27 14 28 15 var length = job.TasksStates.length; … … 66 53 function (taskPage) { 67 54 $scope.taskPage = taskPage; 68 var length = $scope.taskPage.Tasks.length;69 for (var i = 0; i < length; ++i) {70 $scope.taskPage.Tasks[i].TotalTime = $scope.taskPage.Tasks[i].TotalTime.toHHMMSS();71 $scope.taskPage.Tasks[i].InitialWaitingTime = $scope.taskPage.Tasks[i].InitialWaitingTime.toHHMMSS();72 $scope.taskPage.Tasks[i].WaitingTime = $scope.taskPage.Tasks[i].WaitingTime.toHHMMSS();73 $scope.taskPage.Tasks[i].CalculatingTime = $scope.taskPage.Tasks[i].CalculatingTime.toHHMMSS();74 $scope.taskPage.Tasks[i].TransferTime = $scope.taskPage.Tasks[i].TransferTime.toHHMMSS();75 var startTime = $scope.taskPage.Tasks[i].StartTime;76 if (isDefined(startTime)) {77 $scope.taskPage.Tasks[i].StartTime = CSharpDateToString(startTime);78 } else {79 $scope.taskPage.Tasks[i].StartTime = 'Not started';80 }81 var endTime = $scope.taskPage.Tasks[i].EndTime;82 if (isDefined(endTime)) {83 $scope.taskPage.Tasks[i].EndTime = CSharpDateToString(endTime);84 } else {85 $scope.taskPage.Tasks[i].EndTime = 'Not finished';86 }87 }88 55 } 89 56 ); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml
r12516 r12551 12 12 <tr> 13 13 <td>Start Time:</td> 14 <td class="text-right">{{task.StartTime}}</td> 14 <td ng-show="task.StartTime" class="text-left">{{task.StartTime | toDate}}</td> 15 <td ng-hide="task.StartTime" class="text-left">Not started</td> 15 16 </tr> 16 17 <tr> 17 18 <td>End Time:</td> 18 <td class="text-right">{{task.EndTime}}</td> 19 <td ng-show="task.EndTime" class="text-left">{{task.EndTime | toDate}}</td> 20 <td ng-hide="task.EndTime" class="text-left">Not finished</td> 19 21 </tr> 20 22 <tr> … … 37 39 <tr> 38 40 <td>Total Time:</td> 39 <td>{{task.TotalTime }}</td>41 <td>{{task.TotalTime | toTimespan}}</td> 40 42 </tr> 41 43 <tr> 42 44 <td>Initial Waiting Time:</td> 43 <td>{{task.InitialWaitingTime }}</td>45 <td>{{task.InitialWaitingTime | toTimespan}}</td> 44 46 </tr> 45 47 <tr> 46 48 <td>Waiting Time:</td> 47 <td>{{task.WaitingTime }}</td>49 <td>{{task.WaitingTime | toTimespan}}</td> 48 50 </tr> 49 51 <tr> 50 52 <td>Calculating Time:</td> 51 <td>{{task.CalculatingTime }}</td>53 <td>{{task.CalculatingTime | toTimespan}}</td> 52 54 </tr> 53 55 <tr> 54 56 <td>Transfer Time:</td> 55 <td>{{task.TransferTime }}</td>57 <td>{{task.TransferTime | toTimespan}}</td> 56 58 </tr> 57 59 </table> … … 61 63 <tr> 62 64 <td>Calculation Runs:</td> 63 <td >{{task.NumCalculationRuns}}</td>65 <td class="text-right">{{task.NumCalculationRuns}}</td> 64 66 </tr> 65 67 <tr> 66 68 <td>Retries Runs:</td> 67 <td >{{task.NumRetries}}</td>69 <td class="text-right">{{task.NumRetries}}</td> 68 70 </tr> 69 71 <tr> 70 72 <td>Cores Required:</td> 71 <td >{{task.CoresRequired}}</td>73 <td class="text-right">{{task.CoresRequired}}</td> 72 74 </tr> 73 75 <tr> 74 76 <td>Memory Required:</td> 75 <td >{{task.MemoryRequired}}</td>77 <td class="text-right">{{task.MemoryRequired}} MB</td> 76 78 </tr> 77 79 <tr> 78 80 <td>Priority:</td> 79 <td >{{task.Priority}}</td>81 <td class="text-right">{{task.Priority}}</td> 80 82 </tr> 81 83 </table> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml
r12525 r12551 17 17 <a ng-href="#/statistics/groups">Groups</a> 18 18 </li> 19 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 20 <li> 21 <a ng-href="#/statistics/exceptions">Exceptions</a> 22 </li> 23 } 19 24 </ul> 20 25 </header> … … 33 38 <th>#</th> 34 39 <th>Job Name</th> 40 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 41 <th>User Name</th> 42 } 35 43 <th>Date Created</th> 36 44 <th>Progress</th> … … 38 46 </tr> 39 47 </thead> 40 <tr ng-repeat="job in jobs"> 41 <td>{{$index + 1}}</td> 42 <td>{{job.Name}}</td> 43 <td>{{job.DateCreated}}</td> 44 <td> 45 <progressbar class="progress active" max="job.TotalTasks" value="job.CompletedTasks" type="success"><i style="color:black; white-space:nowrap;">{{job.CompletedTasks}} / {{job.TotalTasks}}</i></progressbar> 46 </td> 47 <td> 48 <a ng-href="#/statistics/jobs/{{job.Id}}">Details</a> 49 </td> 50 </tr> 51 <tr ng-hide="jobs.length"> 52 <td colspan="5" class="text-center">No active jobs found!</td> 53 </tr> 54 </table> 55 </div> 56 </div> 57 </div> 58 </div> 59 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 60 <div class="row"> 61 <div class="col-lg-12"> 62 <div class="panel panel-default"> 63 <div class="panel-heading"> 64 <h3 class="panel-title">Current Active Jobs</h3> 65 </div> 66 <div class="panel-body"> 67 <table class="table table-hover table-condensed"> 68 <thead> 69 <tr> 70 <th>#</th> 71 <th>Job Name</th> 72 <th>User Name</th> 73 <th>Date Created</th> 74 <th>Progress</th> 75 <th></th> 76 </tr> 77 </thead> 48 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 78 49 <tr ng-repeat="job in allUsersJobs"> 79 50 <td>{{$index + 1}}</td> … … 82 53 <a ng-href="#/statistics/users/{{job.UserId}}" ng-show="job.UserName">{{job.UserName}}</a> 83 54 </td> 84 <td>{{job.DateCreated }}</td>55 <td>{{job.DateCreated | toDate}}</td> 85 56 <td> 86 57 <progressbar class="progress active" max="job.TotalTasks" value="job.CompletedTasks" type="success"><i style="color:black; white-space:nowrap;">{{job.CompletedTasks}} / {{job.TotalTasks}}</i></progressbar> … … 93 64 <td colspan="6" class="text-center">No active jobs found!</td> 94 65 </tr> 95 </table> 96 </div> 66 } else { 67 <tr ng-repeat="job in jobs"> 68 <td>{{$index + 1}}</td> 69 <td>{{job.Name}}</td> 70 <td>{{job.DateCreated | toDate}}</td> 71 <td> 72 <progressbar class="progress active" max="job.TotalTasks" value="job.CompletedTasks" type="success"><i style="color: black; white-space: nowrap;">{{job.CompletedTasks}} / {{job.TotalTasks}}</i></progressbar> 73 </td> 74 <td> 75 <a ng-href="#/statistics/jobs/{{job.Id}}">Details</a> 76 </td> 77 </tr> 78 <tr ng-hide="jobs.length"> 79 <td colspan="5" class="text-center">No active jobs found!</td> 80 </tr> 81 } 82 </table> 97 83 </div> 98 84 </div> 99 85 </div> 100 } 86 </div> 87 101 88 <div class="row"> 102 89 <div class="col-lg-12"> … … 120 107 <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td> 121 108 <td>{{job.Name}}</td> 122 <td>{{job.DateCreated }}</td>123 <td>{{job.DateCompleted }}</td>109 <td>{{job.DateCreated | toDate}}</td> 110 <td>{{job.DateCompleted | toDate}}</td> 124 111 <td>{{job.TotalTasks}}</td> 125 112 <td><a ng-href="#/statistics/jobs/{{job.Id}}">Details</a></td> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js
r12525 r12551 12 12 jobService.getAllJobs({ completed: false }, function(jobs) { 13 13 $scope.jobs = jobs; 14 var length = $scope.jobs.length;15 for (var i = 0; i < length; ++i) {16 $scope.jobs[i].DateCreated = CSharpDateToString($scope.jobs[i].DateCreated);17 }18 14 }); 19 15 }; … … 23 19 function (jobPage) { 24 20 $scope.completedJobPage = jobPage; 25 var length = $scope.completedJobPage.Jobs.length;26 for (var i = 0; i < length; ++i) {27 $scope.completedJobPage.Jobs[i].DateCreated = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCreated);28 $scope.completedJobPage.Jobs[i].DateCompleted = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCompleted);29 }30 21 } 31 22 ); … … 36 27 $scope.isAdministrator = true; 37 28 $scope.allUsersJobs = jobs; 38 var length = $scope.allUsersJobs.length;39 for (var i = 0; i < length; ++i) {40 $scope.allUsersJobs[i].DateCreated = CSharpDateToString($scope.allUsersJobs[i].DateCreated);41 }42 29 }); 43 30 }; -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/services/clientService.js
r12525 r12551 4 4 module.factory('app.statistics.clientService', 5 5 ['$resource', function ($resource) { 6 return $resource(apiUrl + ':action', { id: '@id', page: '@page', size: '@size', states: '@states', expired: '@expired', start: '@start', end: '@end' }, {6 return $resource(apiUrl + ':action', { id: '@id', page: '@page', size: '@size', states: '@states', expired: '@expired', start: '@start', end: '@end', userId: '@userId' }, { 7 7 getClientDetails: { method: 'GET', params: { action: 'GetClientDetails' } }, 8 8 getClients: { method: 'GET', params: { action: 'GetClients' } }, -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetails.cshtml
r12525 r12551 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 23 </ul> 19 24 </header> … … 46 51 <tr> 47 52 <td class="text-left">Total:</td> 48 <td class="text-right">{{total JobTasks}}</td>53 <td class="text-right">{{totalUserTasks}}</td> 49 54 </tr> 50 <tr ng-repeat="state in states">55 <tr ng-repeat="state in user.TasksStates"> 51 56 <td class="text-left">{{state.State}}:</td> 52 57 <td class="text-right">{{state.Count}}</td> … … 78 83 <td>{{$index + 1}}</td> 79 84 <td>{{job.Name}}</td> 80 <td>{{job.DateCreated }}</td>85 <td>{{job.DateCreated | toDate}}</td> 81 86 <td> 82 87 <progressbar class="progress active" max="job.TotalTasks" value="job.CompletedTasks" type="success"><i style="color:black; white-space:nowrap;">{{job.CompletedTasks}} / {{job.TotalTasks}}</i></progressbar> … … 116 121 <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td> 117 122 <td>{{job.Name}}</td> 118 <td>{{job.DateCreated }}</td>119 <td>{{job.DateCompleted }}</td>123 <td>{{job.DateCreated | toDate}}</td> 124 <td>{{job.DateCompleted | toDate}}</td> 120 125 <td>{{job.TotalTasks}}</td> 121 126 <td><a ng-href="#/statistics/jobs/{{job.Id}}">Details</a></td> … … 135 140 </div> 136 141 </div> 137 138 142 </div> 139 143 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/details/userDetailsCtrl.js
r12516 r12551 12 12 userService.getUser({ id: $stateParams.id }, function(user) { 13 13 $scope.user = user; 14 15 var length = user.TasksStates.length; 16 var total = 0; 17 for (var i = 0; i < length; ++i) { 18 total += user.TasksStates[i].Count; 19 } 20 $scope.totalUserTasks = total; 14 21 }); 15 22 }; … … 18 25 jobService.getAllJobsByUserId({ id: $stateParams.id, completed: false }, function (jobs) { 19 26 $scope.jobs = jobs; 20 var length = $scope.jobs.length;21 for (var i = 0; i < length; ++i) {22 $scope.jobs[i].DateCreated = CSharpDateToString($scope.jobs[i].DateCreated);23 }24 27 }); 25 28 }; … … 29 32 function (jobPage) { 30 33 $scope.completedJobPage = jobPage; 31 var length = $scope.completedJobPage.Jobs.length;32 for (var i = 0; i < length; ++i) {33 $scope.completedJobPage.Jobs[i].DateCreated = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCreated);34 $scope.completedJobPage.Jobs[i].DateCompleted = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCompleted);35 }36 34 } 37 35 ); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/users/users.cshtml
r12525 r12551 16 16 <a ng-href="#/statistics/groups">Groups</a> 17 17 </li> 18 @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) { 19 <li> 20 <a ng-href="#/statistics/exceptions">Exceptions</a> 21 </li> 22 } 18 23 </ul> 19 24 </header>
Note: See TracChangeset
for help on using the changeset viewer.
