Commit 796a8b7f by peema_phongam

fix apsform check

parent 4b4177cc
...@@ -83,14 +83,13 @@ angular.module('APS_INTERVIEW').controller('InterviewForm', ['$scope', '$http', ...@@ -83,14 +83,13 @@ angular.module('APS_INTERVIEW').controller('InterviewForm', ['$scope', '$http',
RecService.RestMcandidate.getQuery({id: $scope.candidateid}).$promise.then(function (data){ RecService.RestMcandidate.getQuery({id: $scope.candidateid}).$promise.then(function (data){
$scope.candidate = data.result; $scope.candidate = data.result;
if ($scope.candidate.other.hasOwnProperty('apsform')) { if ($scope.candidate.other.hasOwnProperty('apsform') && $scope.candidate.other.form) {
$scope.formdata = $scope.candidate.other.apsform $scope.formdata = $scope.candidate.other.apsform
} else { } else {
$scope.formdata.apsdate = new Date() $scope.formdata.apsdate = new Date()
$scope.formdata.committee_fullname = $scope.hrFullname $scope.formdata.committee_fullname = $scope.hrFullname
$scope.formdata.committeeid = $scope.committeeid $scope.formdata.committeeid = $scope.committeeid
} }
setFormAPS() setFormAPS()
setExamData1() setExamData1()
setExamScore2() setExamScore2()
...@@ -98,6 +97,7 @@ angular.module('APS_INTERVIEW').controller('InterviewForm', ['$scope', '$http', ...@@ -98,6 +97,7 @@ angular.module('APS_INTERVIEW').controller('InterviewForm', ['$scope', '$http',
setExamScore4() setExamScore4()
setExamScore5() setExamScore5()
$scope.isReady = true $scope.isReady = true
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment