การประเมินผล > ประเมินตนเอง

src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/edit-define-document-form/edit-define-document-form.component.html

@@ -91,14 +91,14 @@
                         <tr
                             *ngFor="let item of assessmentListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
                             <td class="flex justify-center items-center">
-                                {{item.masfromEvaluationRoundModel.evaluationRoundId}}</td>
+                                {{item.masfromEvaluationRound.evaluationRoundId}}</td>
                             <td>{{item.apsassessy.fname}} {{item.apsassessy.lname}}</td>
                             <td class="text-center">{{item.apsassessy.position.tdesc}}</td>
                             <td class="text-center">{{item.apsassessy.pl.tdesc}}</td>
                             <td class="flex justify-center items-center space-x-2">
                                 <i class="ti ti-edit cursor-pointer i-gray fs-xl px-1"
                                     data-hs-overlay="#edit-define-document-form-table-modal-edit"
-                                    (click)="openEdit(item.masfromEvaluationRoundModel.evaluationRoundId,item.apsassessy.employeeId)"></i>
+                                    (click)="openEdit(item.masfromEvaluationRound.evaluationRoundId,item.apsassessy.employeeId)"></i>
                                 <input type="checkbox" id="hs-small-switch{{i+1}}" [(ngModel)]="item.active"  
                                     class="ti-switch checked:bg-none checked:bg-green-600 checked:hover:bg-green-600 checked:focus:bg-green-600 focus:border-green-600 dark:checked:bg-green-600 checked:before:bg-green-200 dark:checked:before:bg-green-200 shrink-0 w-11 h-6 before:w-5 before:h-5">
                             </td>

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

-import { EmployeeModel, MyEmployeeModel } from "./employee.model"
-import { EvaluationCycleModel, MyEvaluationCycleModel } from "./evaluation-cycle.model"
-import { MasfromEvaluationAssessment1Model, MyMasfromEvaluationAssessment1Model } from "./masfrom-evaluation-assessment1.model"
-import { MyPLModel, PLModel } from "./pl.model"
+import { CompetencytypeModel, MyCompetencytypeModel } from "./competencytype.model"
+import { MyStatusCodeModel, StatusCodeModel } from "./status-code.model"
 
 export interface AppraisalFormModel {
-    personalLevel: PLModel
-    masfromEvaluationRoundModel: EvaluationCycleModel
+    plId: string
     companyId: string
-    fromDetail: string
-    apsassessy: EmployeeModel
-    apsassessyComment: string
-    apsapprove1: EmployeeModel
-    apsapprove2: EmployeeModel
-    apsapprove3: EmployeeModel
-    apsapprove4: EmployeeModel
-    apsapprove5: EmployeeModel
+    lineNo: number
+    competencyType: CompetencytypeModel
+    masfromStatusType: StatusCodeModel
+    currentStep: string
+    lastStep: string
     apsassessyStatus: string
     apsapprove1Status: string
     apsapprove2Status: string
@@ -28,28 +22,29 @@ export interface AppraisalFormModel {
     numberCheck5: number
     weightedTotal: number
     averageScore: number
+    apsassessyComment: string
     apsapprove1Comment: string
     apsapprove2Comment: string
     apsapprove3Comment: string
     apsapprove4Comment: string
     apsapprove5Comment: string
+    apsassessyDate: string
+    apsapprove1Date: string
+    apsapprove2Date: string
+    apsapprove3Date: string
+    apsapprove4Date: string
+    apsapprove5Date: string
     evaluationResults: string
     sumEvaluationResults: string
-    masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
-    active: boolean
 }
 export class MyAppraisalFormModel implements AppraisalFormModel {
-    personalLevel: PLModel
-    masfromEvaluationRoundModel: EvaluationCycleModel
+    plId: string
     companyId: string
-    fromDetail: string
-    apsassessy: EmployeeModel
-    apsassessyComment: string
-    apsapprove1: EmployeeModel
-    apsapprove2: EmployeeModel
-    apsapprove3: EmployeeModel
-    apsapprove4: EmployeeModel
-    apsapprove5: EmployeeModel
+    lineNo: number
+    competencyType: CompetencytypeModel
+    masfromStatusType: StatusCodeModel
+    currentStep: string
+    lastStep: string
     apsassessyStatus: string
     apsapprove1Status: string
     apsapprove2Status: string
@@ -63,27 +58,28 @@ export class MyAppraisalFormModel implements AppraisalFormModel {
     numberCheck5: number
     weightedTotal: number
     averageScore: number
+    apsassessyComment: string
     apsapprove1Comment: string
     apsapprove2Comment: string
     apsapprove3Comment: string
     apsapprove4Comment: string
     apsapprove5Comment: string
+    apsassessyDate: string
+    apsapprove1Date: string
+    apsapprove2Date: string
+    apsapprove3Date: string
+    apsapprove4Date: string
+    apsapprove5Date: string
     evaluationResults: string
     sumEvaluationResults: string
-    masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
-    active: boolean
     constructor(data?: Partial<AppraisalFormModel>) {
-        this.personalLevel = new MyPLModel(data?.personalLevel)
-        this.masfromEvaluationRoundModel = new MyEvaluationCycleModel(data?.masfromEvaluationRoundModel)
+        this.plId = data?.plId || ""
         this.companyId = data?.companyId || ""
-        this.fromDetail = data?.fromDetail || ""
-        this.apsassessyComment = data?.apsassessyComment || ""
-        this.apsassessy = new MyEmployeeModel(data?.apsassessy)
-        this.apsapprove1 = new MyEmployeeModel(data?.apsapprove1)
-        this.apsapprove2 = new MyEmployeeModel(data?.apsapprove2)
-        this.apsapprove3 = new MyEmployeeModel(data?.apsapprove3)
-        this.apsapprove4 = new MyEmployeeModel(data?.apsapprove4)
-        this.apsapprove5 = new MyEmployeeModel(data?.apsapprove5)
+        this.lineNo = data?.lineNo ?? 0
+        this.competencyType = new MyCompetencytypeModel(data?.competencyType)
+        this.masfromStatusType = new MyStatusCodeModel(data?.masfromStatusType)
+        this.currentStep = data?.currentStep || ""
+        this.lastStep = data?.lastStep || ""
         this.apsassessyStatus = data?.apsassessyStatus || ""
         this.apsapprove1Status = data?.apsapprove1Status || ""
         this.apsapprove2Status = data?.apsapprove2Status || ""
@@ -97,15 +93,20 @@ export class MyAppraisalFormModel implements AppraisalFormModel {
         this.numberCheck5 = data?.numberCheck5 ?? 0
         this.weightedTotal = data?.weightedTotal ?? 0
         this.averageScore = data?.averageScore ?? 0
+        this.apsassessyComment = data?.apsassessyComment || ""
         this.apsapprove1Comment = data?.apsapprove1Comment || ""
         this.apsapprove2Comment = data?.apsapprove2Comment || ""
         this.apsapprove3Comment = data?.apsapprove3Comment || ""
         this.apsapprove4Comment = data?.apsapprove4Comment || ""
         this.apsapprove5Comment = data?.apsapprove5Comment || ""
+        this.apsassessyDate = data?.apsassessyDate || ""
+        this.apsapprove1Date = data?.apsapprove1Date || ""
+        this.apsapprove2Date = data?.apsapprove2Date || ""
+        this.apsapprove3Date = data?.apsapprove3Date || ""
+        this.apsapprove4Date = data?.apsapprove4Date || ""
+        this.apsapprove5Date = data?.apsapprove5Date || ""
         this.evaluationResults = data?.evaluationResults || ""
         this.sumEvaluationResults = data?.sumEvaluationResults || ""
-        this.masfromEvaluationAssessment1lList = data?.masfromEvaluationAssessment1lList?.map(x => new MyMasfromEvaluationAssessment1Model(x)) || []
-        this.active = data?.active ?? false
     }
 }
 

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

+import { AppraisalFormModel, MyAppraisalFormModel } from "./appraisal-form.model"
 import { EmployeeModel, MyEmployeeModel } from "./employee.model"
 import { EvaluationCycleModel, MyEvaluationCycleModel } from "./evaluation-cycle.model"
 import { MyPLModel, PLModel } from "./pl.model"
-import { MyStatusCodeModel, StatusCodeModel } from "./status-code.model"
 
 export interface AppraisalModel {
     personalLevel: PLModel
-    masfromEvaluationRoundModel: EvaluationCycleModel
+    masfromEvaluationRound: EvaluationCycleModel
     companyId: string
-    masfromStatusType: StatusCodeModel
-    fromDetail: string
+    active: boolean
     apsassessy: EmployeeModel
     apsapprove1: EmployeeModel
     apsapprove2: EmployeeModel
     apsapprove3: EmployeeModel
     apsapprove4: EmployeeModel
     apsapprove5: EmployeeModel
-    apsassessyStatus: string
-    apsapprove1Status: string
-    apsapprove2Status: string
-    apsapprove3Status: string
-    apsapprove4Status: string
-    apsapprove5Status: string
-    targetScore1: number
-    targetScore2: number
-    targetScore3: number
-    targetScore4: number
-    targetScore5: number
-    weightedTotal: number
-    averageScore: number
-    apsapprove1Comment: string
-    apsapprove2Comment: string
-    apsapprove3Comment: string
-    apsapprove4Comment: string
-    apsapprove5Comment: string
-    evaluationResults: string
-    sumEvaluationResults: string
+    masfromEvaluationAssessment1: AppraisalFormModel[]
 }
 export class MyAppraisalModel implements AppraisalModel {
     personalLevel: PLModel
-    masfromEvaluationRoundModel: EvaluationCycleModel
+    masfromEvaluationRound: EvaluationCycleModel
     companyId: string
-    masfromStatusType: StatusCodeModel
-    fromDetail: string
+    active: boolean
     apsassessy: EmployeeModel
     apsapprove1: EmployeeModel
     apsapprove2: EmployeeModel
     apsapprove3: EmployeeModel
     apsapprove4: EmployeeModel
     apsapprove5: EmployeeModel
-    apsassessyStatus: string
-    apsapprove1Status: string
-    apsapprove2Status: string
-    apsapprove3Status: string
-    apsapprove4Status: string
-    apsapprove5Status: string
-    targetScore1: number
-    targetScore2: number
-    targetScore3: number
-    targetScore4: number
-    targetScore5: number
-    weightedTotal: number
-    averageScore: number
-    apsapprove1Comment: string
-    apsapprove2Comment: string
-    apsapprove3Comment: string
-    apsapprove4Comment: string
-    apsapprove5Comment: string
-    evaluationResults: string
-    sumEvaluationResults: string
+    masfromEvaluationAssessment1: AppraisalFormModel[]
     constructor(data?: Partial<AppraisalModel>) {
         this.personalLevel = new MyPLModel(data?.personalLevel)
-        this.masfromEvaluationRoundModel = new MyEvaluationCycleModel(data?.masfromEvaluationRoundModel)
+        this.masfromEvaluationRound = new MyEvaluationCycleModel(data?.masfromEvaluationRound)
         this.companyId = data?.companyId || ""
-        this.masfromStatusType = new MyStatusCodeModel(data?.masfromStatusType)
-        this.fromDetail = data?.fromDetail || ""
+        this.active = data?.active ?? false
         this.apsassessy = new MyEmployeeModel(data?.apsassessy)
         this.apsapprove1 = new MyEmployeeModel(data?.apsapprove1)
         this.apsapprove2 = new MyEmployeeModel(data?.apsapprove2)
         this.apsapprove3 = new MyEmployeeModel(data?.apsapprove3)
         this.apsapprove4 = new MyEmployeeModel(data?.apsapprove4)
         this.apsapprove5 = new MyEmployeeModel(data?.apsapprove5)
-        this.apsassessyStatus = data?.apsassessyStatus || ""
-        this.apsapprove1Status = data?.apsapprove1Status || ""
-        this.apsapprove2Status = data?.apsapprove2Status || ""
-        this.apsapprove3Status = data?.apsapprove3Status || ""
-        this.apsapprove4Status = data?.apsapprove4Status || ""
-        this.apsapprove5Status = data?.apsapprove5Status || ""
-        this.targetScore1 = data?.targetScore1 ?? 0
-        this.targetScore2 = data?.targetScore2 ?? 0
-        this.targetScore3 = data?.targetScore3 ?? 0
-        this.targetScore4 = data?.targetScore4 ?? 0
-        this.targetScore5 = data?.targetScore5 ?? 0
-        this.weightedTotal = data?.weightedTotal ?? 0
-        this.averageScore = data?.averageScore ?? 0
-        this.apsapprove1Comment = data?.apsapprove1Comment || ""
-        this.apsapprove2Comment = data?.apsapprove2Comment || ""
-        this.apsapprove3Comment = data?.apsapprove3Comment || ""
-        this.apsapprove4Comment = data?.apsapprove4Comment || ""
-        this.apsapprove5Comment = data?.apsapprove5Comment || ""
-        this.evaluationResults = data?.evaluationResults || ""
-        this.sumEvaluationResults = data?.sumEvaluationResults || ""
+        this.masfromEvaluationAssessment1 = data?.masfromEvaluationAssessment1?.map(x => new MyAppraisalFormModel(x)) || []
+
     }
 }
 

src/app/shared/model/competencytype.model.ts

@@ -15,13 +15,13 @@ export class MyCompetencytypeModel implements CompetencytypeModel {
     tdesc: string
     shortName: string
     expectationLevel: string
-    constructor(data: Partial<CompetencytypeModel>) {
-        this.competencyTypeId = data.competencyTypeId || ""
-        this.companyId = data.companyId || ""
-        this.edesc = data.edesc || ""
-        this.tdesc = data.tdesc || ""
-        this.shortName = data.shortName || ""
-        this.expectationLevel = data.expectationLevel || ""
+    constructor(data?: Partial<CompetencytypeModel>) {
+        this.competencyTypeId = data?.competencyTypeId || ""
+        this.companyId = data?.companyId || ""
+        this.edesc = data?.edesc || ""
+        this.tdesc = data?.tdesc || ""
+        this.shortName = data?.shortName || ""
+        this.expectationLevel = data?.expectationLevel || ""
     }
 }
 

src/app/shared/model/evaluation-cycle.model.ts

 import { MyStatusCodeModel, StatusCodeModel } from "./status-code.model";
 
 export interface EvaluationCycleModel {
-    evaluationRoundId: string;
-    tdesc: string;
-    edesc: string;
-    apsyear: string;
-    apsPeriodStart: string;
-    apsPeriodEnd: string;
-    statusCode: StatusCodeModel;
+    evaluationRoundId: string
+    companyId: string
+    tdesc: string
+    edesc: string
+    apsyear: string
+    apsPeriodStart: string
+    apsPeriodEnd: string
+    statusCode: StatusCodeModel
+
 }
 
 export class MyEvaluationCycleModel implements EvaluationCycleModel {
-    evaluationRoundId: string;
-    tdesc: string;
-    edesc: string;
-    apsyear: string;
-    apsPeriodStart: string;
-    apsPeriodEnd: string;
-    statusCode: StatusCodeModel;
-
+    evaluationRoundId: string
+    companyId: string
+    tdesc: string
+    edesc: string
+    apsyear: string
+    apsPeriodStart: string
+    apsPeriodEnd: string
+    statusCode: StatusCodeModel
     constructor(data?: Partial<EvaluationCycleModel>) {
         this.evaluationRoundId = data?.evaluationRoundId || "";
+        this.companyId = data?.companyId || "";
         this.tdesc = data?.tdesc || "";
         this.edesc = data?.edesc || "";
         this.apsyear = data?.apsyear || "";
         this.apsPeriodStart = data?.apsPeriodStart || "";
         this.apsPeriodEnd = data?.apsPeriodEnd || "";
-        this.statusCode =new MyStatusCodeModel(data?.statusCode || {})
+        this.statusCode = new MyStatusCodeModel(data?.statusCode || {})
 
     }
 }

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

@@ -2,7 +2,6 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { environment } from 'src/environments/environment';
-import { PLModel } from '../model/pl.model';
 import { AlertModel } from '../model/alert.model';
 import { AppraisalModel } from '../model/appraisal.model';
 import { AppraisalFormModel } from '../model/appraisal-form.model';
@@ -14,8 +13,8 @@ export class AppraisalService {
   urlApi = environment.baseUrl + this.api
   constructor(private http: HttpClient) {
   }
-  getFormCompentencyById(evaluationRoundId: string, apsassessy: string): Observable<AppraisalFormModel> {
-    return this.http.get<AppraisalFormModel>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy)
+  getFormCompentencyById(evaluationRoundId: string, apsassessy: string, typeId: string): Observable<AppraisalFormModel> {
+    return this.http.get<AppraisalFormModel>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy + "/" + typeId)
   }
   getCompetencyList(): Observable<AppraisalModel[]> {
     return this.http.get<AppraisalModel[]>(this.urlApi + "/competency/emp")