ฟอร์มประเมิน

src/app/components/performance-evaluation/idp-evaluation/idp-evalution.component.ts

@@ -13,7 +13,6 @@ export class IdpEvalutionComponent {
   @Input() evaluationRoundId = ""
   @Input() evaluateeId = ""
   @Input() evaluaterId = ""
-  @Input() masfromStatusType = ""
   @Output() sendReturnPath: EventEmitter<any> = new EventEmitter<any>();
   currentDate = new Date()
   hoveredCode: string | null = null;
@@ -34,8 +33,8 @@ export class IdpEvalutionComponent {
       next: response => {
         this.formIdp.data = JSON.parse(JSON.stringify(response))
         if (this.formIdp.data) {
-          this.canSave = (this.formIdp.data.currentStep == this.formIdp.data.checkStep) && (this.masfromStatusType != 'Boss_finish' && this.masfromStatusType != 'Not_evaluating_yet')
-          this.canEdit = (this.formIdp.data.currentStep == this.formIdp.data.checkStep && (+(this.formIdp.data.checkStep) <= 1)) && (this.masfromStatusType != 'Boss_finish' && this.masfromStatusType != 'Not_evaluating_yet')
+          this.canSave = (this.formIdp.data.currentStep == this.formIdp.data.checkStep) && (this.formIdp.data.masfromStatusType.code != 'Boss_finish' && this.formIdp.data.masfromStatusType.code != 'Not_evaluating_yet')
+          this.canEdit = (this.formIdp.data.currentStep == this.formIdp.data.checkStep && (+(this.formIdp.data.checkStep) <= 1)) && (this.formIdp.data.masfromStatusType.code != 'Boss_finish' && this.formIdp.data.masfromStatusType.code != 'Not_evaluating_yet')
         }
         switch (this.formIdp.data?.currentStep) {
           case ("0"): {

src/app/components/performance-evaluation/pms-evaluation/pms-evalution.component.ts

@@ -97,7 +97,6 @@ export class PmsEvalutionComponent {
   @Input() evaluateeId = ""
   @Input() evaluaterId = ""
   @Input() competencyTypeId = ""
-  @Input() masfromStatusType = ""
   @Output() sendReturnPath: EventEmitter<any> = new EventEmitter<any>();
   appraisalPms: { loading: boolean, data?: AppraisalPmsFormModel } = { loading: false, data: undefined }
   groupGrade: { loading: boolean, dataList: CompetencyGradeModel[] } = { loading: false, dataList: [] }
@@ -175,8 +174,8 @@ export class PmsEvalutionComponent {
         }
         this.changePercentage()
         if (this.appraisalPms.data) {
-          this.canSave = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.masfromStatusType != 'Boss_finish' && this.masfromStatusType != 'Not_evaluating_yet'
-          this.canEdit = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.masfromStatusType != 'Boss_finish' && this.masfromStatusType != 'Not_evaluating_yet'
+          this.canSave = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet'
+          this.canEdit = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet'
           switch (this.appraisalPms.data?.currentStep) {
             case ("0"): {
               if (this.canSave) {

src/app/components/performance-evaluation/self-evaluation/self-evaluation.component.html

@@ -258,7 +258,6 @@
 <ng-container *ngIf="onEdit=='pms'">
     <app-pms-evalution [pathTitle]="['การประเมินผล', 'ประเมินตนเอง','ประเมิน']"
         (sendReturnPath)="getAppraisalCompentencyList();getAppraisalPmsList();onEdit='' ; pathTitle =  ['การประเมินผล', 'ประเมินตนเอง']"
-        [masfromStatusType]="appraisalPms.select?.masfromStatusType?.code||''"
         [evaluationRoundId]="appraisalPms.select?.pmsMasfromEvaluationRound?.pmsEvaluationRoundId || ''"
         [evaluaterId]="evaluatee.data.employeeId" [evaluateeId]="evaluatee.data.employeeId"></app-pms-evalution>
 </ng-container>
\ No newline at end of file

src/app/components/performance-evaluation/supervisor-evaluation/supervisor-evaluation.component.html

@@ -245,14 +245,14 @@
 <ng-container *ngIf="pageEvalution=='idp'">
     <app-idp-evalution [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
         (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
-        [masfromStatusType]="formEvaluation.masfromStatusType" [evaluationRoundId]="formEvaluation.evaluationRoundId"
-        [evaluaterId]="formEvaluation.evaluaterId" [evaluateeId]="formEvaluation.evaluateeId"></app-idp-evalution>
+        [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
+        [evaluateeId]="formEvaluation.evaluateeId"></app-idp-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='pms'">
     <app-pms-evalution [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
         (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
-        [masfromStatusType]="formEvaluation.masfromStatusType" [evaluationRoundId]="formEvaluation.evaluationRoundId"
-        [evaluaterId]="formEvaluation.evaluaterId" [evaluateeId]="formEvaluation.evaluateeId"></app-pms-evalution>
+        [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
+        [evaluateeId]="formEvaluation.evaluateeId"></app-pms-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='evaluation'">
     <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"