X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=ui%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FBluvalUI%2FCommittedSubmissions%2FCommittedSubmissionsController.js;h=f9b1a164377069821d81b9b9682842e82d6dd297;hp=8f7a8a328f03fb4ac11ba502efa307cb86867571;hb=147ecf7bf79ea9967a121d0038103151a38ebef2;hpb=e6b82a7ccd840c8b089ae4d5e69930fd0dd5ef35 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 --- 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); + */ + + });