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

Timestamp:

06/30/15 13:12:07 (9 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated database schema
• updated sql scripts
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

• merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

• updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

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

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetailsCtrl.js (modified) (2 diffs)

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

@@ -11 +11 @@
                 jobService.getJobDetails({ id: $stateParams.id }, function (job) {
                     $scope.job = job;
-                    $scope.job.DateCreated = CSharpDateToString($scope.job.DateCreated);
-                    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);
-                    $scope.job.AvgTransferringTime = $scope.job.AvgTransferringTime.toHHMMSS();
-                    $scope.job.AvgCalculatingTime = $scope.job.AvgCalculatingTime.toHHMMSS();
-                    $scope.job.MinCalculatingTime = $scope.job.MinCalculatingTime.toHHMMSS();
-                    $scope.job.MaxCalculatingTime = $scope.job.MaxCalculatingTime.toHHMMSS();
-                    $scope.job.TotalCalculatingTime = $scope.job.TotalCalculatingTime.toHHMMSS();
-                    $scope.job.TotalWaitingTime = $scope.job.TotalWaitingTime.toHHMMSS();
-                    $scope.job.TotalTime = $scope.job.TotalTime.toHHMMSS();
 
                     var length = job.TasksStates.length;
@@ -66 +53 @@
                     function (taskPage) {
                         $scope.taskPage = taskPage;
-                        var length = $scope.taskPage.Tasks.length;
-                        for (var i = 0; i < length; ++i) {
-                            $scope.taskPage.Tasks[i].TotalTime = $scope.taskPage.Tasks[i].TotalTime.toHHMMSS();
-                            $scope.taskPage.Tasks[i].InitialWaitingTime = $scope.taskPage.Tasks[i].InitialWaitingTime.toHHMMSS();
-                            $scope.taskPage.Tasks[i].WaitingTime = $scope.taskPage.Tasks[i].WaitingTime.toHHMMSS();
-                            $scope.taskPage.Tasks[i].CalculatingTime = $scope.taskPage.Tasks[i].CalculatingTime.toHHMMSS();
-                            $scope.taskPage.Tasks[i].TransferTime = $scope.taskPage.Tasks[i].TransferTime.toHHMMSS();
-                            var startTime = $scope.taskPage.Tasks[i].StartTime;
-                            if (isDefined(startTime)) {
-                                $scope.taskPage.Tasks[i].StartTime = CSharpDateToString(startTime);
-                            } else {
-                                $scope.taskPage.Tasks[i].StartTime = 'Not started';
-                            }
-                            var endTime = $scope.taskPage.Tasks[i].EndTime;
-                            if (isDefined(endTime)) {
-                                $scope.taskPage.Tasks[i].EndTime = CSharpDateToString(endTime);
-                            } else {
-                                $scope.taskPage.Tasks[i].EndTime = 'Not finished';
-                            }
-                        }
                     }
                 );