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

Timestamp:

06/26/15 18:02:03 (9 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

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js (modified) (4 diffs)

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;
         }]
     );