การประเมินผล

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

-<app-page-header [pathTitle]="pathTitle"></app-page-header>
-<div class="bg-card-white">
-</div>
-<div class="block-main-content">
-    <ng-container *ngTemplateOutlet="currentTemplate"></ng-container>
-</div>
+<ng-container *ngIf="!onEdit">
+    <app-page-header [pathTitle]="pathTitle"></app-page-header>
+    <div class="bg-card-white">
+    </div>
+    <div class="block-main-content">
+        <ng-container *ngTemplateOutlet="selfEvaluation"></ng-container>
+    </div>
+</ng-container>
 
 <ng-template #selfEvaluation>
     <div class="font-size-18px font-weight-700 pt-1.5rem text-primary px-2rem">
@@ -117,10 +119,13 @@
                                         {{masfromEvaluationAssessment1.masfromStatusType.tdesc}}
                                     </td>
                                     <td class="flex justify-center items-center">
-                                        <span class="rounded-md bg-success text-white px-3 py-1 cursor-pointer" (click)="selectCompentencyForm(masfromEvaluationAssessment1.competencyType.competencyTypeId);currentTemplate = selfEvaluationEdit ; 
-                                        pathTitle = ['การประเมินผล', 'ประเมินตนเอง','ประเมินผล']">
+                                        <button type="button" class="ti-btn rounded-sm " (click)="selectCompentencyForm(masfromEvaluationAssessment1.competencyType.competencyTypeId);onEdit = true ; 
+                                       pathTitle = ['การประเมินผล', 'ประเมินตนเอง','ประเมินผล']"
+                                            [class.ti-btn-soft-secondary]="masfromEvaluationAssessment1.masfromStatusType.code == 'employee'"
+                                            [class.ti-btn-soft-warning]="masfromEvaluationAssessment1.masfromStatusType.code != 'employee'&&masfromEvaluationAssessment1.masfromStatusType.code != 'Boss_finish'"
+                                            [class.ti-btn-soft-success]="masfromEvaluationAssessment1.masfromStatusType.code == 'Boss_finish'">
                                             ประเมิน
-                                        </span>
+                                        </button>
                                     </td>
                                 </tr>
                             </tbody>
@@ -200,10 +205,10 @@
 
 
 
-<ng-template #selfEvaluationEdit>
+<ng-container *ngIf="onEdit">
     <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินตนเอง','ประเมิน']"
-        (sendReturnPath)="currentTemplate = selfEvaluation ; pathTitle =  ['การประเมินผล', 'ประเมินตนเอง']"
+        (sendReturnPath)="onEdit = false ; pathTitle =  ['การประเมินผล', 'ประเมินตนเอง']"
         [evaluationRoundId]="appraisalCompentency.select?.masfromEvaluationRound?.evaluationRoundId || ''"
         [evaluaterId]="evaluatee.data.employeeId" [evaluateeId]="evaluatee.data.employeeId"
         [competencyTypeId]="competencyTypeId"></app-evaluation>
-</ng-template>
\ No newline at end of file
+</ng-container>
\ No newline at end of file

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

@@ -24,20 +24,18 @@ export class SelfEvaluationComponent implements OnInit {
     score: ["หากได้คะแนน 90 - 100% ถือว่า Gap +1", "หากได้คะแนน 80 - 89% ถือว่า ไม่มี Gap", "หากได้คะแนน 60 - 79% ถือว่า Gap - 1", "หากได้คะแนน 40 - 59% ถือว่า Gap -2", "หากได้คะแนน 0 - 39% ถือว่า Gap - 3"],
     condition: ["1.หากได้คะแนนสูงกว่า 80% แต่มี 3 2 หรือ 1 ด้วย ถือว่า Gap -1", "2.หากได้คะแนนต่ำกว่า 80% แต่มี 4 และ 5 ให้คิด Gap ตาม %", "3.คะแนนต่ำกว่า 80% แต่มี 2 และ 1 ให้คิด Gap ตาม %"],
   }]
-  @ViewChild('selfEvaluation', { static: true }) selfEvaluation!: TemplateRef<any>;
-  @ViewChild('selfEvaluationEdit', { static: true }) selfEvaluationEdit!: TemplateRef<any>;
-  currentTemplate: TemplateRef<any> = this.selfEvaluation
   appraisalCompentency: { loading: boolean, select?: AppraisalCompentencyModel, dataList: AppraisalCompentencyModel[] } = { loading: false, select: undefined, dataList: [] }
   appraisalPms: { loading: boolean, select: undefined, dataList: { check: boolean, data: undefined }[] } = { loading: false, select: undefined, dataList: [] }
   evaluatee: { loading: boolean, data: EmployeeModel } = { loading: false, data: new MyEmployeeModel() }
   currentDate = new Date()
   competencyTypeId = ""
+
+  onEdit = false
   constructor(private appraisalService: AppraisalService,
     private employeeService: EmployeeService,
     private cdr: ChangeDetectorRef
   ) { }
   ngOnInit(): void {
-    this.currentTemplate = this.selfEvaluation
     this.getEvaluatee()
     this.getAppraisalCompentencyList()
   }

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

@@ -27,9 +27,8 @@
                         <div class="px-1">
                             <div class="relative shadow-md">
                                 <input type="text" id="hs-leading-icon" name="hs-leading-icon"
-                                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
-                                    placeholder="Search" style="height: 40px;" [(ngModel)]="search"
-                                    (ngModelChange)="searchChange()">
+                                    class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search"
+                                    style="height: 40px;" [(ngModel)]="search" (ngModelChange)="searchChange()">
                                 <div
                                     class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
                                     <i class="ri-search-line text-gray"></i>
@@ -105,8 +104,11 @@
                                             <td style="font-size: 12px;">{{item.apsassessy.position.tdesc}}</td>
                                             <td class="text-center">
                                                 <div class="flex">
-                                                    <button type="button" class="ti-btn rounded-sm ti-btn-soft-success"
+                                                    <button type="button" class="ti-btn rounded-sm "
                                                         *ngFor="let type of item.typeList"
+                                                        [class.ti-btn-soft-secondary]="type.statusType == 'employee'"
+                                                        [class.ti-btn-soft-warning]="type.statusType != 'employee'&&type.statusType != 'Boss_finish'"
+                                                        [class.ti-btn-soft-success]="type.statusType == 'Boss_finish'"
                                                         style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;"
                                                         (click)="selectSubordinate(item,type.competencyTypeId,subordinate.select?.evaluationRoundId);pageEvalution='evaluation'">
                                                         {{type.shortName}}
@@ -114,16 +116,16 @@
                                                 </div>
                                             </td>
                                             <td class="text-center">
-                                                <button type="button" class="ti-btn rounded-sm ti-btn-soft-dark"
+                                                <!-- <button type="button" class="ti-btn rounded-sm ti-btn-soft-dark"
                                                     style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;">
                                                     IDP
-                                                </button>
+                                                </button> -->
                                             </td>
                                             <td class="text-center">
-                                                <button type="button" class="ti-btn rounded-sm ti-btn-soft-success"
+                                                <!-- <button type="button" class="ti-btn rounded-sm ti-btn-soft-success"
                                                     style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;margin-left:4px;">
                                                     ประเมิน
-                                                </button>
+                                                </button> -->
                                             </td>
                                             <td class="text-center" style="font-size: 12px;">{{item.sumScore}}</td>
                                             <td class="text-center" style="font-size: 12px;">{{item.gread}}</td>