[UI] Common class for results

[validation.git] / ui / src / main / webapp / app / BluvalUI / CommittedSubmissions / CommittedSubmissionsController.js

diff --git a/ui/src/main/webapp/app/BluvalUI/CommittedSubmissions/CommittedSubmissionsController.js b/ui/src/main/webapp/app/BluvalUI/CommittedSubmissions/CommittedSubmissionsController.js
index 8f7a8a3..f9b1a16 100644 (file)
--- a/ui/src/main/webapp/app/BluvalUI/CommittedSubmissions/CommittedSubmissionsController.js
+++ b/ui/src/main/webapp/app/BluvalUI/CommittedSubmissions/CommittedSubmissionsController.js
@@ -16,44 +16,52 @@
 
 var app = angular.module('CommittedSubmissions');
 
-app.controller('CommittedSubmissionsController', function($scope, restAPISvc,
-        $interval, refreshPeriod, committedSubmissionsSvc, NgTableParams,
-        appContext, $window) {
-
-    $scope.getLayer = committedSubmissionsSvc.getLayer;
-    $scope.getResultUrl = committedSubmissionsSvc.getResultUrl;
-    $scope.mapResult = committedSubmissionsSvc.mapResult;
-
-    initialize();
-
-    function initialize() {
-        restAPISvc.getRestAPI("/api/v1/submission/", function(submissions) {
-            $scope.submissionDatas = submissions;
-            var data = submissions;
-            $scope.tableParams = new NgTableParams({
-                page : 1,
-                count : 5
-            }, {
-                dataset : data
-            });
-        });
-    }
-
-    $scope.refreshCommittedSubmissions = function() {
-        initialize();
-    }
-
-    $scope.getValidationResults = function(submissionData) {
-        if (!submissionData.validationNexusTestResult.timestamp) {
-            return;
-        }
-        $window.location.href = appContext
-                + "/validationresults#?submissionId="
-                + submissionData.submissionId;
-    }
-
-    $interval(function() {
-        $scope.refreshCommittedSubmissions();
-    }, refreshPeriod);
-
-});
+app
+        .controller(
+                'CommittedSubmissionsController',
+                function($scope, restAPISvc, $interval, refreshPeriod,
+                        committedSubmissionsSvc, NgTableParams, appContext,
+                        $window) {
+
+                    $scope.getLayer = committedSubmissionsSvc.getLayer;
+                    $scope.getResultUrl = committedSubmissionsSvc.getResultUrl;
+                    $scope.mapResult = committedSubmissionsSvc.mapResult;
+
+                    initialize();
+
+                    function initialize() {
+                        restAPISvc.getRestAPI("/api/v1/submission/", function(
+                                submissions) {
+                            $scope.submissions = submissions;
+                            var data = submissions;
+                            $scope.tableParams = new NgTableParams({
+                                page : 1,
+                                count : 5
+                            }, {
+                                dataset : data
+                            });
+                        });
+                    }
+
+                    $scope.refreshCommittedSubmissions = function() {
+                        initialize();
+                    }
+
+                    $scope.getValidationResults = function(submission) {
+                        if (!submission.validationDbTestResult
+                                || !submission.validationDbTestResult.timestamp
+                                || !submission.validationDbTestResult.wrobotDbTestResults
+                                || submission.validationDbTestResult.wrobotDbTestResults.length === 0) {
+                            return;
+                        }
+                        $window.location.href = appContext
+                                + "/validationresults#?submissionId="
+                                + submission.submissionId;
+                    }
+
+                    /*
+                     * $interval(function() {
+                     * $scope.refreshCommittedSubmissions(); }, refreshPeriod);
+                     */
+
+                });