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

ประเมินโดยหัวหน้า

src/app/components/dashboard/dashboard.module.ts

@@ -157,6 +157,7 @@ import { PmsEvaluationCycleService } from 'src/app/shared/services/pms-evaluatio
 import { PmsEvaluationAssessmentService } from 'src/app/shared/services/pms-evaluation-assessment.service';
 import { TimeAttendanceComponent } from '../performance-management-evaluation/time-attendance/time-attendance.component';
 import { PmsWorkingTimeService } from 'src/app/shared/services/pms-working-time.service';
+import { EvaluationIdpService } from 'src/app/shared/services/evaluation-Idp.service';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -344,6 +345,7 @@ export class CustomDateAdapter extends NativeDateAdapter {
     PmsEvaluationCycleService,
     PmsEvaluationAssessmentService,
     PmsWorkingTimeService,
+    EvaluationIdpService,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpRequestInterceptor,

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

@@ -104,7 +104,7 @@
                                             </td>
                                             <td style="font-size: 12px;">{{item.apsassessy.position.tdesc}}</td>
                                             <td class="text-center">
-                                                <div class="flex">
+                                                <div class="flex justify-center">
                                                     <button type="button" class="ti-btn rounded-sm "
                                                         *ngFor="let type of item.typeList"
                                                         [class.ti-btn-soft-secondary]="type.statusType == 'employee'"
@@ -117,10 +117,16 @@
                                                 </div>
                                             </td>
                                             <td class="text-center">
-                                                <!-- <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> -->
+                                                <div class="flex justify-center">
+                                                    <button type="button" class="ti-btn rounded-sm"
+                                                        [class.ti-btn-soft-secondary]="item.statusIdp.statusType == 'employee'"
+                                                        [class.ti-btn-soft-warning]="item.statusIdp.statusType != 'employee'&&item.statusIdp.statusType != 'Boss_finish'"
+                                                        [class.ti-btn-soft-success]="item.statusIdp.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,'',subordinate.select?.evaluationRoundId);pageEvalution='idp'">
+                                                        IDP
+                                                    </button>
+                                                </div>
                                             </td>
                                             <td class="text-center">
                                                 <!-- <button type="button" class="ti-btn rounded-sm ti-btn-soft-success"
@@ -190,14 +196,17 @@
 </ng-container>
 
 <ng-container *ngIf="pageEvalution=='idp'">
-    <app-idp-evalution (sendPageEvalution)="pageEvalution=$event"></app-idp-evalution>
+    <app-idp-evalution [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
+        (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
+        [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
+        [evaluateeId]="formEvaluation.evaluateeId"></app-idp-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='pms'">
     <app-pms-evalution (sendPageEvalution)="pageEvalution=$event"></app-pms-evalution>
 </ng-container>
 <ng-container *ngIf="pageEvalution=='evaluation'">
     <app-evaluation [pathTitle]="['การประเมินผล', 'ประเมินโดยหัวหน้า','ประเมิน']"
-        (sendReturnPath)="pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
+        (sendReturnPath)="getBossList();pageEvalution='' ; pathTitle =  ['การประเมินผล', 'ประเมินโดยหัวหน้า']"
         [evaluationRoundId]="formEvaluation.evaluationRoundId" [evaluaterId]="formEvaluation.evaluaterId"
         [evaluateeId]="formEvaluation.evaluateeId"
         [competencyTypeId]="formEvaluation.competencyTypeId"></app-evaluation>

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

@@ -67,7 +67,7 @@ export class SupervisorEvaluationComponent {
     this.page = Array.from({ length: Math.ceil(this.subordinateFilter().length / 10) }, (_, i) => i + 1);
   }
   selectSubordinate(data: Masfromevaluationassessment, competencyTypeId: string, evaluationRoundId?: string) {
-    if (data && competencyTypeId && evaluationRoundId) {
+    if (data && evaluationRoundId) {
       this.formEvaluation.evaluateeId = data.apsassessy.employeeId
       this.formEvaluation.competencyTypeId = competencyTypeId
       this.formEvaluation.evaluationRoundId = evaluationRoundId

src/app/shared/model/appraisal-subordinate.model.ts

@@ -15,6 +15,10 @@ export interface Masfromevaluationassessment {
     gread: string
     sumScore: number
     typeList: TypeList[]
+    statusIdp: {
+        shortName: string,
+        statusType: string
+    }
 }
 
 export interface MasfromStatusType {

src/app/shared/services/evaluation-Idp.service.ts

+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { AlertModel } from '../model/alert.model';
+import { IdpFormModel } from '../model/idp-form.model';
+@Injectable({
+  providedIn: 'root'
+})
+export class EvaluationIdpService {
+  api = "/evaluation-Idp"
+  urlApi = environment.baseUrl + this.api
+  constructor(private http: HttpClient) {
+  }
+  getFormIdp(evaluationRoundId: string, employeeId: string): Observable<IdpFormModel> {
+    return this.http.get<IdpFormModel>(this.urlApi + "/" + evaluationRoundId + "/" + employeeId)
+  }
+  postIdp(body: IdpFormModel): Observable<AlertModel> {
+    return this.http.post<AlertModel>(this.urlApi + "/", body)
+  }
+}
\ No newline at end of file