diff --git a/hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp b/hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp index 81fa5dc..5ef60b4 100644 --- a/hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp +++ b/hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp @@ -84,6 +84,7 @@ <input type="hidden" name="applicantid" value='<%=applicantid%>'> <input type="hidden" name="committeeid"> <input type="hidden" name="jobid"> + <input type="hidden" name="judge"> <input type="hidden" name="notedit" value='true'> <input type="hidden" name="parentPage" value='<%=parentPage%>'> @@ -173,7 +174,7 @@ </md-button> </td> <td> - <a ng-hide="chkPage()" ng-click='viewApsForm(committee.employeeid, committee.seq)'> + <a ng-hide="chkPage()" ng-click='viewApsForm(committee.employeeid, committee.seq, committee.judge)'> {{committee.employeeid}} <md-tooltip md-direction="bottom"><swaplang code="SW012131">Interview Results</swaplang></md-tooltip> </a> diff --git a/hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js b/hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js index f7b5195..8ac8f61 100644 --- a/hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js +++ b/hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js @@ -275,20 +275,21 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial } - $scope.viewApsForm = (committeeid, state) =>{ + $scope.viewApsForm = (committeeid, state, judge) =>{ let pageName = '' let jobid = $scope.clsFormApplicant.formApplicant.jobid $('input[name="committeeid"]').val(committeeid); $('input[name="jobid"]').val(jobid); + $('input[name="judge"]').val(judge); $('form[name="cscform"]').attr('target','myform'); if ($scope.dbName.toUpperCase() === ("STD_NEW")) { pageName = "../APS_FORM_INTERVIEW_DHAS.jsp"; } else if ($scope.dbName.toUpperCase() === ("DHAS")) { - if ($scope.committee.length == state) { + if (judge == '1') { pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp"; } else { pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp"