ไฟล์template

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

@@ -107,7 +107,7 @@ export class EditGroupIndicators implements OnInit {
 					};
 				});
 				this.dataList.sort((a, b) => +a.code - +b.code)
-				let maxCode = Math.max(-1, ...this.dataList.map(x => +x.code))
+				let maxCode = Math.max(0, ...this.dataList.map(x => +x.code))
 				while (this.dataList.length < +this.indicatorsCourses.competencyTopic.expectationLevel) {
 					this.dataList.push({
 						code: (++maxCode) + "",

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

@@ -3,7 +3,7 @@ import { EvaluationCycleModel, MyEvaluationCycleModel } from "./evaluation-cycle
 import { MasfromEvaluationAssessment1Model, MyMasfromEvaluationAssessment1Model } from "./masfrom-evaluation-assessment1.model"
 import { MyPLModel, PLModel } from "./pl.model"
 
-export interface AppraisalFromModel {
+export interface AppraisalFormModel {
     personalLevel: PLModel
     masfromEvaluationRoundModel: EvaluationCycleModel
     companyId: string
@@ -36,7 +36,7 @@ export interface AppraisalFromModel {
     sumEvaluationResults: string
     masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
 }
-export class MyAppraisalFromModel implements AppraisalFromModel {
+export class MyAppraisalFormModel implements AppraisalFormModel {
     personalLevel: PLModel
     masfromEvaluationRoundModel: EvaluationCycleModel
     companyId: string
@@ -68,7 +68,7 @@ export class MyAppraisalFromModel implements AppraisalFromModel {
     evaluationResults: string
     sumEvaluationResults: string
     masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1Model[]
-    constructor(data?: Partial<AppraisalFromModel>) {
+    constructor(data?: Partial<AppraisalFormModel>) {
         this.personalLevel = new MyPLModel(data?.personalLevel)
         this.masfromEvaluationRoundModel = new MyEvaluationCycleModel(data?.masfromEvaluationRoundModel)
         this.companyId = data?.companyId || ""

src/app/shared/model/development-plan.model.ts

+export interface DevelopmentPlanModel {
+  planId: string;
+  companyId: string;
+  ojtJobAssignment: boolean;
+  coachMentor: boolean;
+  training: boolean;
+}
+
+export class MyDevelopmentPlanModel implements DevelopmentPlanModel {
+  planId: string;
+  companyId: string;
+  ojtJobAssignment: boolean;
+  coachMentor: boolean;
+  training: boolean;
+  constructor(data?: Partial<DevelopmentPlanModel>) {
+    this.planId = data?.planId || '';
+    this.companyId = data?.companyId || '';
+    this.ojtJobAssignment = data?.ojtJobAssignment ?? false
+    this.coachMentor = data?.coachMentor ?? false
+    this.training = data?.training ?? false
+  }
+}

src/app/shared/model/group-assessment1.model.ts

@@ -4,7 +4,7 @@ import { MyPLModel, PLModel } from "./pl.model"
 
 export interface GroupAssessment1Model {
     personalLevelModel: PLModel
-    competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel[]
+    competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
     companyId: string
     groupAssessmentMini: GroupAssessmentMiniModel
 }
@@ -12,12 +12,12 @@ export interface GroupAssessment1Model {
 
 export class MyGroupAssessment1Model implements GroupAssessment1Model {
     personalLevelModel: PLModel
-    competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel[]
+    competencyIndicatorsCourses1Mini: CompetencyIndicatorsCourses1MiniModel
     companyId: string
     groupAssessmentMini: GroupAssessmentMiniModel
     constructor(data?: Partial<GroupAssessment1Model>) {
         this.personalLevelModel = new MyPLModel(data?.personalLevelModel)
-        this.competencyIndicatorsCourses1Mini = data?.competencyIndicatorsCourses1Mini?.map(x => new MyCompetencyIndicatorsCourses1MiniModel(x)) || []
+        this.competencyIndicatorsCourses1Mini = new MyCompetencyIndicatorsCourses1MiniModel(data?.competencyIndicatorsCourses1Mini)
         this.companyId = data?.companyId || ""
         this.groupAssessmentMini = new MyGroupAssessmentMiniModel(data?.groupAssessmentMini)
     }

src/app/shared/model/idp-development.model.ts

-export interface DevelopmentPlan {
-    planId: string;
-    companyId: string;
-    ojtJobAssignment: boolean;
-    coachMentor: boolean;
-    training: boolean;
+import { DevelopmentPlanModel, MyDevelopmentPlanModel } from "./development-plan.model";
+
+export interface IdpDevelopmentModel {
+  evaluationId: string;
+  companyId: string;
+  score: number;
+  developmentPlan: DevelopmentPlanModel[];
+}
+
+export class MyIdpDevelopmentModel implements IdpDevelopmentModel {
+  evaluationId: string;
+  companyId: string;
+  score: number;
+  developmentPlan: DevelopmentPlanModel[];
+
+  constructor(data?: Partial<IdpDevelopmentModel>) {
+    this.evaluationId = data?.evaluationId || '';
+    this.companyId = data?.companyId || '';
+    this.score = data?.score ?? 0;
+    this.developmentPlan = data?.developmentPlan?.map(x => new MyDevelopmentPlanModel(x)) || [];
   }
-  
-  export interface IdpDevelopmentModel {
-    evaluationId: string;
-    companyId: string;
-    score: number;
-    developmentPlan: DevelopmentPlan[];
-  }
-  
-  export class MyIdpDevelopmentModel implements IdpDevelopmentModel {
-    evaluationId: string;
-    companyId: string;
-    score: number;
-    developmentPlan: DevelopmentPlan[];
-  
-    constructor(data: Partial<IdpDevelopmentModel>) {
-      this.evaluationId = data.evaluationId || '';
-      this.companyId = data.companyId || '';
-      this.score = data.score ?? 0;
-      this.developmentPlan = data.developmentPlan || [];
-    }
-  }
-  
\ No newline at end of file
+}

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

@@ -5,7 +5,7 @@ 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 { AppraisalFromModel } from '../model/appraisal-form.model';
+import { AppraisalFormModel } from '../model/appraisal-form.model';
 @Injectable({
   providedIn: 'root'
 })
@@ -14,8 +14,8 @@ export class AppraisalService {
   urlApi = environment.baseUrl + this.api
   constructor(private http: HttpClient) {
   }
-  getFormById(evaluationRoundId: string, apsassessy: string): Observable<AppraisalFromModel> {
-    return this.http.get<AppraisalFromModel>(this.urlApi + "/" + evaluationRoundId + "/" + apsassessy)
+  getFormCompentencyById(evaluationRoundId: string, apsassessy: string): Observable<AppraisalFormModel> {
+    return this.http.get<AppraisalFormModel>(this.urlApi + "/competency/" + evaluationRoundId + "/" + apsassessy)
   }
   getList(): Observable<AppraisalModel[]> {
     return this.http.get<AppraisalModel[]>(this.urlApi + "/competency/emp")