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

Timestamp:

06/25/15 18:34:40 (10 years ago)

Author:

dglaser

Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

• updated daos
• changed statistics database schema
• updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp.Statistics-3.3:

• added jobs, client and user page

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Statistics/3.3 (modified) (2 props)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetails.cshtml (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobDetailsCtrl.js (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialog.cshtml (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/details/jobTaskDetailsDialogCtrl.js (added)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobs.cshtml (modified) (3 diffs)
• HeuristicLab.Services.WebApp.Statistics/3.3/WebApp/jobs/jobsCtrl.js (modified) (1 diff)

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

@@ -10 +10 @@
                 <a ng-href="#/statistics/users">Users</a>
             </li>
-            <li>
-                <a ng-href="#/statistics/clients">Clients</a>
-            </li>
         }
+        <li>
+            <a ng-href="#/statistics/clients">Clients</a>
+        </li>
     </ul>
 </header>
 
 <div class="default-view-container">
-
-
     <div class="row">
         <div class="col-lg-12">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h3 class="panel-title">My Jobs</h3>
+                    <h3 class="panel-title">Current Jobs</h3>
                 </div>
                 <div class="panel-body">
                     <table class="table table-hover table-condensed">
                         <thead>
-                            <tr>
-                                <th>#</th>
-                                <th>Job Name</th>
-                                <th>Date Created</th>
-                                <th></th>
-                            </tr>
+                        <tr>
+                            <th>#</th>
+                            <th>Job Name</th>
+                            <th>Date Created</th>
+                            <th>Progress</th>
+                            <th></th>
+                        </tr>
                         </thead>
                         <tr ng-repeat="job in jobs">
@@ -40 +39 @@
                             <td>{{job.Name}}</td>
                             <td>{{job.DateCreated}}</td>
-                            <td><a ng-href="" data-ng-click="getTasksByJobId(job.Id)">Load Tasks</a></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="jobs.length">
-                            <td colspan="4" class="text-center">No jobs found!</td>
+                            <td colspan="5" class="text-center">No active jobs found!</td>
                         </tr>
                     </table>
@@ -51 +55 @@
     </div>
 
-    <div class="row" ng-show="tasks.length">
-
-        <div class="col-lg-3 col-md-6" ng-repeat="task in tasks">
+    <div class="row">
+        <div class="col-lg-12">
             <div class="panel panel-default">
-
                 <div class="panel-heading">
-                    <h3 class="panel-title">Task {{$index + 1}}</h3>
+                    <h3 class="panel-title">Completed Jobs</h3>
                 </div>
                 <div class="panel-body">
-                    <table class="table table-hover table-condensed table-no-border table-auto-width">
+                    <table class="table table-hover table-condensed">
+                        <thead>
                         <tr>
-                            <td>Initial Waiting Time:</td>
-                            <td>{{task.InitialWaitingTime}}</td>
+                            <th>#</th>
+                            <th>Job Name</th>
+                            <th>Date Created</th>
+                            <th>Date Completed</th>
+                            <th>Tasks</th>
+                            <th></th>
                         </tr>
-                        <tr>
-                            <td>Waiting Time:</td>
-                            <td>{{task.WaitingTime}}</td>
+                        </thead>
+                        <tr ng-repeat="job in completedJobPage.Jobs">
+                            <td>{{($index + 1)+((completedJobCurPage-1)*(completedJobPageSize))}}</td>
+                            <td>{{job.Name}}</td>
+                            <td>{{job.DateCreated}}</td>
+                            <td>{{job.DateCompleted}}</td>
+                            <td>{{job.TotalTasks}}</td>
+                            <td><a ng-href="#/statistics/jobs/{{job.Id}}">Details</a></td>
                         </tr>
-                        <tr>
-                            <td>Calculating Time:</td>
-                            <td>{{task.CalculatingTime}}</td>
-                        </tr>
-                        <tr>
-                            <td>Transfer Time:</td>
-                            <td>{{task.TransferTime}}</td>
-                        </tr>
-                        <tr>
-                            <td>Start Time:</td>
-                            <td>{{task.StartTime}}</td>
-                        </tr>
-                        <tr>
-                            <td>End Time:</td>
-                            <td>{{task.EndTime}}</td>
-                        </tr>
-                        <tr>
-                            <td>Calculation Runs:</td>
-                            <td>{{task.NumCalculationRuns}}</td>
-                        </tr>
-                        <tr>
-                            <td>Retries Runs:</td>
-                            <td>{{task.NumRetries}}</td>
-                        </tr>
-                        <tr>
-                            <td>Cores Required:</td>
-                            <td>{{task.CoresRequired}}</td>
-                        </tr>
-                        <tr>
-                            <td>Memory Required:</td>
-                            <td>{{task.MemoryRequired}}</td>
-                        </tr>
-                        <tr>
-                            <td>Priority:</td>
-                            <td>{{task.Priority}}</td>
+                        <tr ng-hide="completedJobPage.Jobs.length">
+                            <td colspan="6" class="text-center">No completed jobs found!</td>
                         </tr>
                     </table>
+                    <div class="row text-center" ng-show="completedJobPage.TotalJobs > completedJobPage.Jobs.length">
+                        <pagination max-size="10" total-items="completedJobPage.TotalJobs"
+                                    ng-model="completedJobCurPage" items-per-page="completedJobPageSize"
+                                    ng-change="changeCompletedJobPage()"
+                                    boundary-links="true" rotate="false" num-pages="numPages"></pagination>
+                    </div>
                 </div>
-
             </div>
         </div>

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

@@ -2 +2 @@
     var module = appStatisticsPlugin.getAngularModule();
     module.controller('app.statistics.jobsCtrl',
-        ['$scope', 'app.statistics.data.service', function($scope, statisticsService) {
-            var getJobs = function() {
-                statisticsService.getJobs({}, function(jobs) {
+        ['$scope', '$interval', 'app.statistics.jobService', function ($scope, $interval, jobService) {
+            $scope.interval = defaultPageUpdateInterval;
+            $scope.completedJobCurPage = 1;
+            $scope.completedJobPageSize = 20;
+
+            var getAllJobs = function() {
+                jobService.getAllJobs({ completed: false }, function(jobs) {
                     $scope.jobs = jobs;
+                    var length = $scope.jobs.length;
+                    for (var i = 0; i < length; ++i) {
+                        $scope.jobs[i].DateCreated = CSharpDateToString($scope.jobs[i].DateCreated);
+                    }
                 });
             };
 
-            $scope.getTasksByJobId = function(id) {
-                statisticsService.getTasksByJobId({ id: id }, function(tasks) {
-                    $scope.tasks = tasks;
-                });
+            var getCompletedJobs = function() {
+                jobService.getJobs({ page: $scope.completedJobCurPage, size: $scope.completedJobPageSize, completed: true },
+                    function (jobPage) {
+                        $scope.completedJobPage = jobPage;
+                        var length = $scope.completedJobPage.Jobs.length;
+                        for (var i = 0; i < length; ++i) {
+                            $scope.completedJobPage.Jobs[i].DateCreated = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCreated);
+                            $scope.completedJobPage.Jobs[i].DateCompleted = CSharpDateToString($scope.completedJobPage.Jobs[i].DateCompleted);
+                        }
+                    }
+                );
             };
 
-            getJobs();
+            $scope.changeCompletedJobPage = function () {
+                update();
+            };
+
+            var update = function () {
+                getAllJobs();
+                getCompletedJobs();
+            };
+
+            $scope.updateInterval = $interval(update, $scope.interval);
+            var cancelInterval = $scope.$on('$locationChangeSuccess', function () {
+                $interval.cancel($scope.updateInterval);
+                cancelInterval();
+            });
+            update(); // init page
         }]
     );