Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html

@@ -60,9 +60,7 @@
                 <tr class="font-size-12px">
                     <ng-container
                         *ngFor="let item of ['รหัสเกรด','รายละเอียดเอกสาร','เกรด','คะแนนสูงสุด','คะแนนต่ำสุด','น้ำหนัก','การจัดการ']; let f = first; let l = last; let i = index">
-                        <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
-                            [class.!text-center]="item === 'รหัสเกรด' || item === 'เกรด' || item === 'คะแนนสูงสุด' || item === 'คะแนนต่ำสุด' || item === 'น้ำหนัก'"
-                            [class.text-center]="!(item === 'รายละเอียดเอกสาร')">
+                        <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary text-center">
                             <span class="font-size-12px font-weight-700">{{ item }}</span>
                             <div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="f && l">
                                 <i class="ti ti-dots-vertical fs-l"></i>
@@ -89,9 +87,9 @@
                     <td style="width: 40%; padding-left: 25px;">{{item.details}}</td>
                     <td class="text-center" style="width: 15%;">{{item.grade}}</td>
                     <td class="text-center" style="width: 15%;">{{item.highscore}}</td>
-                    <td class="text-center" style="width: 15%;">{{item.lowscore}}</td>
-                    <td class="text-center" style="width: 15%;">{{item.weight}}</td>
-                    <td class="flex justify-center">
+                    <td class="text-center" style="width: 10%;">{{item.lowscore}}</td>
+                    <td class="text-center" style="width: 10%;">{{item.weight}}</td>
+                    <td class="text-center" style="width: 10%;">
                         <i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit'"
                             data-hs-overlay="#sub-grade-registration-modal"></i>
                         <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
@@ -366,4 +364,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file

src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.ts

@@ -29,8 +29,11 @@ export class SubGradeRegistrationComponent {
   search = '';
 
   dataList: DataModel[] = [
-    { check: false, code: 'O1A', details: 'ระดับ A', grade: 'A', highscore: 'O1A', lowscore: 'O1A', weight: 'O1A' },
-    { check: false, code: 'O2B', details: 'ระดับ B', grade: 'B', highscore: 'O1B', lowscore: 'O1B', weight: 'O1B' },
+    { check: false, code: '01A', details: 'ระดับ A', grade: 'A', highscore: '100', lowscore: '80', weight: '1' },
+    { check: false, code: '01B', details: 'ระดับ B', grade: 'B', highscore: '79', lowscore: '70', weight: '1' },
+    { check: false, code: '01C', details: 'ระดับ C', grade: 'C', highscore: '69', lowscore: '60', weight: '1' },
+    { check: false, code: '01D', details: 'ระดับ D', grade: 'D', highscore: '59', lowscore: '50', weight: '1' },
+    { check: false, code: '01F', details: 'ระดับ F', grade: 'F', highscore: '49', lowscore: '0', weight: '1' },
   ];
 
   constructor(private toastr: ToastrService) {
@@ -45,7 +48,7 @@ export class SubGradeRegistrationComponent {
           ? ['การประเมินสมรรถนะ', 'ทะเบียนเกรด', 'การจัดการเกรด', 'แก้ไขกลุ่มเกรด']
           : ['การประเมินสมรรถนะ', 'ทะเบียนเกรด', 'การจัดการเกรด']
     );
-    
+
   }
 
   searchChange() {

src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html

@@ -94,9 +94,24 @@
                         <span class="flex justify-center items-center rounded-full h-5 w-5  text-white"
                             [ngClass]="{'bg-success':item.status=='1','bg-warning':item.status=='2','bg-gray-400':item.status=='3'}">
                             <ng-container [ngSwitch]="item.status">
-                                <i *ngSwitchCase="'1'" class="ti ti-player-play"></i>
-                                <i *ngSwitchCase="'2'" class="ti ti-clock"></i>
-                                <i *ngSwitchCase="'3'" class="ti ti-check"></i>
+                                <div class="hs-tooltip ti-main-tooltip">
+                                    <i *ngSwitchCase="'1'" class="ti ti-player-play hs-tooltip-toggle"></i>
+                                    <span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
+                                        กำลังดำเนินการประเมิน
+                                      </span>
+                                </div>
+                                <div class="hs-tooltip ti-main-tooltip">
+                                    <i *ngSwitchCase="'2'" class="ti ti-clock hs-tooltip-toggle"></i>
+                                    <span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
+                                        ยังไม่ถึงเวลาการประเมิน
+                                      </span>
+                                </div>
+                                <div class="hs-tooltip ti-main-tooltip">
+                                    <i *ngSwitchCase="'3'" class="ti ti-check hs-tooltip-toggle"></i>
+                                    <span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
+                                        สิ้นสุดช่วงเวลาประเมิน
+                                      </span>
+                                </div>
                                 <div *ngSwitchDefault></div>
                             </ng-container>
                         </span>