viewaps rec

hrAppWeb.war/RECRUIT/Candidate.jsp

@@ -224,9 +224,9 @@
           <span ng-if="app.blacklist.active"><swaplang code="SW013837">Status</swaplang> : <label class="label label-danger">{{app.blacklist.detail}}</label></span>
           <span ng-if="app.appointment"><swaplang code="SW003415">Appointment</swaplang>  : <label class="label label-success"><swaplang code="SW013202">Have an appointment</swaplang></label></span>
           <span ng-if="!app.appointment"><swaplang code="SW003415">Appointment</swaplang>  : <label class="label label-warning"><swaplang code="SW013203">No appointments</swaplang></label></span>
-          <span ng-if="(app.committee.length === app.evaluate.length) && app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-success"><swaplang code="SW000067">Complete</swaplang> ({{app.evaluate.length}} / {{app.committee.length}})</label></span>
-          <span ng-if="!app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-success"><swaplang code="SW000067">Complete</swaplang> ( No Evaluate )</label></span>
-          <span ng-if="!(app.committee.length === app.evaluate.length) && app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-warning"><swaplang code="SW013204">Unfinished</swaplang> ({{app.evaluate.length}} / {{app.committee.length}})</label></span>
+<%--          <span ng-if="(app.committee.length === app.evaluate.length) && app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-success"><swaplang code="SW000067">Complete</swaplang> ({{app.evaluate.length}} / {{app.committee.length}})</label></span>--%>
+<%--          <span ng-if="!app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-success"><swaplang code="SW000067">Complete</swaplang> ( No Evaluate )</label></span>--%>
+<%--          <span ng-if="!(app.committee.length === app.evaluate.length) && app.needEvaluate"><swaplang code="SW012548">Appraisal</swaplang> : <label class="label label-warning"><swaplang code="SW013204">Unfinished</swaplang> ({{app.evaluate.length}} / {{app.committee.length}})</label></span>--%>
           <span>
             <swaplang code="SW006670">Candidate Status</swaplang>:
             <select ng-change="change_mstatus(this.app.status,app.candidateid)" ng-model="app.status"  style="background-color:lightgrey ; font-size: 80%">

hrAppWeb.war/RECRUIT/CommitteeSetupForm.jsp

@@ -172,7 +172,7 @@
                       </md-button>
                     </td>
                     <td>
-                      <a ng-hide="chkPage()" ng-click='viewApsForm(committee.employeeid)'>
+                      <a ng-hide="chkPage()" ng-click='viewApsForm(committee.employeeid, committee.seq)'>
                         {{committee.employeeid}}
                         <md-tooltip md-direction="bottom"><swaplang code="SW012131">Interview Results</swaplang></md-tooltip>
                       </a>

hrAppWeb.war/RECRUIT/js/CommitteeSetup/CommitteeSetup.Controller.js

@@ -241,7 +241,7 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
     }
   }
 
-  $scope.viewApsForm = (committeeid) =>{
+  $scope.viewApsForm = (committeeid, state) =>{
     let pageName = ''
     let jobid = $scope.clsFormApplicant.formApplicant.jobid
 
@@ -254,7 +254,12 @@ angular.module('RECRUIT').controller('CommitteeSetup', function ($scope, $mdDial
     if ($scope.dbName.toUpperCase() === ("STD_NEW")) {
       pageName = "../APS_FORM_INTERVIEW_DHAS.jsp";
     } else if ($scope.dbName.toUpperCase() === ("DHAS")) {
-      pageName = "../APS_FORM_INTERVIEW_DHAS.jsp";
+      if ($scope.committee.length == state) {
+        pageName = "../APS_FORM_INTERVIEW_DHAS_RESULT.jsp";
+      } else {
+        pageName = "../APS_FORM_INTERVIEW_DHAS_DEPT.jsp"
+      }
+      // pageName = "../APS_FORM_INTERVIEW_DHAS.jsp";
     } else if ($scope.dbName.toUpperCase() === ("ITE")) {
       pageName = "../APS_FORM_INTERVIEW_ITE.jsp";
     } else if ($scope.dbName.toUpperCase() === ("KOKOTEL")) {