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

Timestamp:

06/26/15 18:02:03 (10 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.WebApp.Statistics-3.3:

• added groups page
• improved jobs, clients and users pages

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

Location:

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

Files:

• details/jobDetails.cshtml (modified) (2 diffs)
• details/jobDetailsCtrl.js (modified) (1 diff)
• jobs.cshtml (modified) (2 diffs)
• jobsCtrl.js (modified) (4 diffs)

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

@@ -13 +13 @@
         <li>
             <a ng-href="#/statistics/clients">Clients</a>
+        </li>
+        <li>
+            <a ng-href="#/statistics/groups">Groups</a>
         </li>
     </ul>
@@ -97 +100 @@
                         <div class="col-md-2"></div>
                         </div>
-                </div>
+                    </div>
 
             </div>

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetailsCtrl.js

@@ -14 +14 @@
                     if (isDefined($scope.job.DateCompleted)) {
                         $scope.job.DateCompleted = CSharpDateToString($scope.job.DateCompleted);
+                    } else {
+                        $scope.job.DateCompleted = 'Not completed yet';
                     }
                     $scope.job.CalculatingWaitingRatio = ($scope.job.TotalCalculatingTime / $scope.job.TotalWaitingTime);

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

@@ -13 +13 @@
         <li>
             <a ng-href="#/statistics/clients">Clients</a>
+        </li>
+        <li>
+            <a ng-href="#/statistics/groups">Groups</a>
         </li>
     </ul>
@@ -54 +57 @@
         </div>
     </div>
-
+    @if (Request.IsAuthenticated && User.IsInRole(HiveRoles.Administrator)) {
+        <div class="row">
+            <div class="col-lg-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h3 class="panel-title">Current Active Jobs</h3>
+                    </div>
+                    <div class="panel-body">
+                        <table class="table table-hover table-condensed">
+                            <thead>
+                                <tr>
+                                    <th>#</th>
+                                    <th>Job Name</th>
+                                    <th>User Name</th>
+                                    <th>Date Created</th>
+                                    <th>Progress</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tr ng-repeat="job in allUsersJobs">
+                                <td>{{$index + 1}}</td>
+                                <td>{{job.Name}}</td>
+                                <td>
+                                    <a ng-href="#/statistics/users/{{job.UserId}}" ng-show="job.UserName">{{job.UserName}}</a>
+                                </td>
+                                <td>{{job.DateCreated}}</td>
+                                <td>
+                                    <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>
+                                </td>
+                                <td>
+                                    <a ng-href="#/statistics/jobs/{{job.Id}}">Details</a>
+                                </td>
+                            </tr>
+                            <tr ng-hide="allUsersJobs.length">
+                                <td colspan="6" class="text-center">No active jobs found!</td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
     <div class="row">
         <div class="col-lg-12">

branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js

@@ -3 +3 @@
     module.controller('app.statistics.jobsCtrl',
         ['$scope', '$interval', 'app.statistics.jobService', function ($scope, $interval, jobService) {
+            var first = true;
+            $scope.isAdministrator = false;
             $scope.interval = defaultPageUpdateInterval;
             $scope.completedJobCurPage = 1;
@@ -30 +32 @@
             };
 
+            var getAllActiveJobsFromAllUsers = function () {
+                jobService.getAllActiveJobsFromAllUsers({}, function (jobs) {
+                    $scope.isAdministrator = true;
+                    $scope.allUsersJobs = jobs;
+                    var length = $scope.allUsersJobs.length;
+                    for (var i = 0; i < length; ++i) {
+                        $scope.allUsersJobs[i].DateCreated = CSharpDateToString($scope.allUsersJobs[i].DateCreated);
+                    }
+                });
+            };
+
             $scope.changeCompletedJobPage = function () {
                 update();
@@ -36 +49 @@
             var update = function () {
                 getAllJobs();
+                if (first || $scope.isAdministrator) {
+                    getAllActiveJobsFromAllUsers();
+                }
                 getCompletedJobs();
             };
+
 
             $scope.updateInterval = $interval(update, $scope.interval);
@@ -45 +62 @@
             });
             update(); // init page
+            first = false;
         }]
     );