ตัวชี้วัดเเละหลักสูตร

src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.component.html

@@ -161,7 +161,7 @@
                                             </a>
                                             <div class="ciricon flex text-start items-center cursor-pointer"
                                                 *ngIf="!seeTab"
-                                                (click)="assessmentToolsSelectIndex=[l,m];deleteAssessmentTools()">
+                                                (click)="dataSelectIndex=i;assessmentToolsSelectIndex=[l,m];deleteAssessmentTools()">
                                                 <i class="ri-close-line text-red-500"></i>
                                             </div>
                                         </ng-container>

src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.component.ts

@@ -281,5 +281,4 @@ export class EditGroupIndicators implements OnInit {
 			positionClass: 'toast-top-right',
 		})
 	}
-
 }

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

@@ -60,15 +60,18 @@
                         <td style="font-size: 12px;">{{item[2]}}</td>
                         <td class="flex justify-center">
                             <button type="button" class="ti-btn rounded-sm ti-btn-secondary"
-                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;" (click)="returnPage('c')">
+                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
+                                (click)="returnPage('c')">
                                 CC
                             </button>
                             <button type="button" class="ti-btn rounded-sm ti-btn-warning"
-                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;" (click)="returnPage('c')">
+                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
+                                (click)="returnPage('c')">
                                 MC
                             </button>
                             <button type="button" class="ti-btn rounded-sm ti-btn-success"
-                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;" (click)="returnPage('c')">
+                                style="height: 15px; width: 45px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
+                                (click)="returnPage('c')">
                                 PC
                             </button>
                         </td>
@@ -80,7 +83,8 @@
                         </td>
                         <td class="text-center">
                             <button type="button" class="ti-btn rounded-sm ti-btn-success"
-                                style="height: 15px; width: 55px; font-size: 12px; display: flex; align-items: center; justify-content: center;" (click)="returnPage('pms')">
+                                style="height: 15px; width: 55px; font-size: 12px; display: flex; align-items: center; justify-content: center;"
+                                (click)="returnPage('pms')">
                                 ประเมิน
                             </button>
                         </td>

src/app/components/performance-evaluation/supervisor-evaluation/round-one/round-one.component.ts

@@ -10,6 +10,7 @@ export class RoundOneComponent {
   @Input() pathTitle = ['การประเมินสมรรถนะ', 'ทะเบียนเครื่องมือ', 'เครื่องมือประเมิน'];
   @Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
   @Output() sendPageEvalution: EventEmitter<string> = new EventEmitter<string>();
+  @Output() sendEmployeeId: EventEmitter<string> = new EventEmitter<string>();
   activeTab: string = 'tab1'; // กำหนด tab เริ่มต้น
   isChecked: boolean = false;
 
@@ -88,6 +89,7 @@ export class RoundOneComponent {
     });
   }
   returnPage(text: string) {
+    this.sendEmployeeId.emit()
     this.sendPageEvalution.emit(text)
   }
 }

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

@@ -24,7 +24,7 @@
             <div class="pt-50px px-2rem">
                 <div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
                     <app-round-one [pathTitle]="pathTitle" (sendPathTitle)="pathTitle=$event"
-                        (sendPageEvalution)="pageEvalution=$event"></app-round-one>
+                        (sendPageEvalution)="pageEvalution=$event" (sendEmployeeId)="employeeId=$event"></app-round-one>
                 </div>
                 <div id="underline-2" role="tabpanel" aria-labelledby="underline-item-2">
                 </div>
@@ -40,5 +40,7 @@
     <app-pms-evalution (sendPageEvalution)="pageEvalution=$event"></app-pms-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='c'">
-    <app-c-evaluation (sendPageEvalution)="pageEvalution=$event"></app-c-evaluation>
+    <!-- <app-c-evaluation (sendPageEvalution)="pageEvalution=$event"></app-c-evaluation> -->
+    <app-self-evaluation [pathTitle]="pathTitle" (sendPageEvalution)="pageEvalution=$event"
+        (sendPathTitle)="pathTitle=$event" (employeeId)="employeeId"></app-self-evaluation>
 </ng-container>
\ No newline at end of file

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

@@ -8,4 +8,5 @@ import { Component } from '@angular/core';
 export class SupervisorEvaluationComponent {
   pathTitle = ['การประเมินผล', 'ประเมินโดยหัวหน้า']
   pageEvalution = ''
+  employeeId?: string
 }

src/app/shared/services/appraisal.service.ts

@@ -3,8 +3,8 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { AlertModel } from '../model/alert.model';
-import { AppraisalModel } from '../model/appraisal.model';
 import { AppraisalFormModel } from '../model/appraisal-form.model';
+import { AppraisalCompentencyModel, AppraisalCompentencyModel2 } from '../model/appraisal-competency.model';
 @Injectable({
   providedIn: 'root'
 })
@@ -13,13 +13,13 @@ export class AppraisalService {
   urlApi = environment.baseUrl + this.api
   constructor(private http: HttpClient) {
   }
-  getFormCompentencyById(evaluationRoundId: string, apsassessy: string, typeId: string): Observable<AppraisalFormModel> {
-    return this.http.get<AppraisalFormModel>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy + "/" + typeId)
+  getFormCompentencyById(evaluationRoundId: string, apsassessy: string, typeId: string): Observable<AppraisalCompentencyModel2> {
+    return this.http.get<AppraisalCompentencyModel2>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy + "/" + typeId)
   }
-  getCompetencyList(): Observable<AppraisalModel[]> {
-    return this.http.get<AppraisalModel[]>(this.urlApi + "/competency/emp")
+  getCompetencyList(): Observable<AppraisalCompentencyModel[]> {
+    return this.http.get<AppraisalCompentencyModel[]>(this.urlApi + "/competency/emp")
   }
-  postCompetency(body: AppraisalFormModel): Observable<AlertModel> {
+  postCompetency(body: AppraisalCompentencyModel2): Observable<AlertModel> {
     return this.http.post<AlertModel>(this.urlApi + "/competency", body)
   }
 }
\ No newline at end of file

src/app/shared/services/employee.service.ts

@@ -34,6 +34,12 @@ export class EmployeeService {
   getById(employeeId: string): Observable<EmployeeModel> {
     return this.http.get<EmployeeModel>(this.urlApi + "/profile?employeeId=" + employeeId)
   }
+  getWorking(): Observable<EmployeeModel> {
+    return this.http.get<EmployeeModel>(this.urlApi + "/working/mini")
+  }
+  getWorkingById(employeeId?: string): Observable<EmployeeModel> {
+    return this.http.get<EmployeeModel>(this.urlApi + "/working/mini" + (employeeId ? "?employeeId=" + employeeId : ''))
+  }
   getProfile(): Observable<EmployeeModel> {
     return this.http.get<EmployeeModel>(this.urlApi + "/profile")
   }