Repository: incubator-griffin Updated Branches: refs/heads/master 9d8dfb061 -> 0370c215d
fix bug of job Author: Yang <[email protected]> Closes #106 from RachelYang2/fix. Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/0370c215 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/0370c215 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/0370c215 Branch: refs/heads/master Commit: 0370c215d85293723a3716ba9498945732ea555e Parents: 9d8dfb0 Author: Yang <[email protected]> Authored: Fri Jul 7 15:36:58 2017 +0800 Committer: Lionel Liu <[email protected]> Committed: Fri Jul 7 15:36:58 2017 +0800 ---------------------------------------------------------------------- ui/js/controllers/createjob-ac-ctrl.js | 8 ++++---- ui/js/controllers/job-ctrl.js | 10 +++++++--- ui/pages/jobs/createjob-ac.html | 10 +++++----- ui/pages/jobs/jobs.html | 4 +++- 4 files changed, 19 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0370c215/ui/js/controllers/createjob-ac-ctrl.js ---------------------------------------------------------------------- diff --git a/ui/js/controllers/createjob-ac-ctrl.js b/ui/js/controllers/createjob-ac-ctrl.js index ecc2274..9008d26 100644 --- a/ui/js/controllers/createjob-ac-ctrl.js +++ b/ui/js/controllers/createjob-ac-ctrl.js @@ -134,13 +134,13 @@ define(['./module'], function(controllers) { // var newModel = $config.uri.newAccuracyModel; // var BACKEND_SERVER = ''; - var date = new Date(); + var date = new Date(); var month = date.getMonth()+1; var timestamp = Date.parse(date); - timestamp = timestamp / 1000; - var time = date.toDateString()+' '+date.toLocaleTimeString(); + // timestamp = timestamp / 1000; + // var time = date.toDateString()+' '+date.toLocaleTimeString(); // var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + date.getFullYear() + '-'+ month + '-'+date.getDate(); - var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + time; + var jobName = $scope.Measures[$scope.measure] + '-BA-' + $scope.ntAccount + '-' + timestamp; var newJob = $config.uri.addJobs + this.data.groupName + '/' + jobName + '/' + $scope.Measures[$scope.measure]; console.log(newJob); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0370c215/ui/js/controllers/job-ctrl.js ---------------------------------------------------------------------- diff --git a/ui/js/controllers/job-ctrl.js b/ui/js/controllers/job-ctrl.js index 0803991..dd6fcb6 100644 --- a/ui/js/controllers/job-ctrl.js +++ b/ui/js/controllers/job-ctrl.js @@ -39,11 +39,15 @@ define(['./module'], function (controllers) { if(start == 0 && !$scope.rowCollection){ $http.get(allJobs).then(function successCallback(data) { + angular.forEach(data.data,function(job){ + job.name = job.jobName.split('-')[0] + '-' + job.jobName.split('-')[1] + '-' + job.jobName.split('-')[2]; + job.createTime = job.jobName.split('-')[3]; + }); data.data.sort(function(a,b){ - var dateA = Date.parse(new Date(a.jobName.split('-')[3]))/1000; - var dateB = Date.parse(new Date(b.jobName.split('-')[3]))/1000; + var dateA = a.createTime; + var dateB = b.createTime; return -(dateA-dateB); - }); + }); originalRowCollection = angular.copy(data.data); $scope.rowCollection = angular.copy(data.data); http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0370c215/ui/pages/jobs/createjob-ac.html ---------------------------------------------------------------------- diff --git a/ui/pages/jobs/createjob-ac.html b/ui/pages/jobs/createjob-ac.html index f8649c4..7ec12cb 100644 --- a/ui/pages/jobs/createjob-ac.html +++ b/ui/pages/jobs/createjob-ac.html @@ -49,17 +49,17 @@ under the License. </div> </div> <div class="col-md-12 col-lg-12 col-sm-12"> - <div class="form-group"> + <div class="form-group" ng-class="{'has-error':Form.targetPat.$dirty&&Form.targetPat.$invalid, 'has-success':Form.targetPat.$valid}"> <label class="col-md-2 col-lg-2 col-sm-2 control-label"> - Target Partition: + Target Partition<span class="symbol required"></span>: </label> - <div class="col-md-10 col-lg-10 col-sm-10 "> - <input type="text" class="form-control" ng-model="targetPat" placeholder="Please input target partition of your job, such as 'YYYYMMdd-HH'." ng-pattern="/YYYYMMdd-HH/i" ng-maxlength='11'> + <input type="text" class="form-control" ng-model="targetPat" placeholder="Please input target partition of your job, such as 'YYYYMMdd-HH'." + required ng-pattern="/YYYYMMdd-HH/i" ng-maxlength='11' name="targetPat"> + <span class="error text-small block " ng-if="Form.targetPat.$dirty && Form.targetPat.$error.pattern">Please input partition like 'YYYYMMdd-HH'</span> </div> </div> </div> - <div class="col-md-12 col-lg-12 col-sm-12"> <div class="form-group"> <label for="measureSelector" class="col-md-2 col-lg-2 col-sm-2 control-label"> http://git-wip-us.apache.org/repos/asf/incubator-griffin/blob/0370c215/ui/pages/jobs/jobs.html ---------------------------------------------------------------------- diff --git a/ui/pages/jobs/jobs.html b/ui/pages/jobs/jobs.html index 2e166a0..3b53d19 100644 --- a/ui/pages/jobs/jobs.html +++ b/ui/pages/jobs/jobs.html @@ -48,7 +48,9 @@ under the License. <td ng-class="{accordion:true}" ng-click="row.showDetail=!(row.showDetail)" style="cursor: pointer;"> <i ng-show="!row.showDetail" class="fa fa-chevron-circle-right blue"></i> <i ng-show="row.showDetail" class="fa fa-chevron-circle-down blue"></i> - {{row.jobName}}</td> + {{row.jobName}} + <!-- -{{(row.createTime | date: 'yyyy/MM/dd HH:mm:ss') || 'N/A' }} --> + </td> <td>{{row.sourcePat}}</td> <td>{{row.targetPat|strmap:'modeltype'}}</td> <td ng-show="row.previousFireTime==-1">--/--/-- --:--</td>
