เปลี่ยนการจัดกลุ่มหัวข้อประเมิน จาก JL เป็น JD

src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.ts

@@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angu
 import { ToastrService } from 'ngx-toastr';
 import { MyJobcodeModel, JobcodeModel } from 'src/app/shared/model/jobcode.model';
 import { MyPLModel } from 'src/app/shared/model/pl.model';
-import { MyPmsGroupAssessmentModel } from 'src/app/shared/model/pms-group-assessment.model';
+import { MyPmsGroupAssessmentModel, PmsGroupAssessmentModel } from 'src/app/shared/model/pms-group-assessment.model';
 import { MyPmsGroupAssessment1Model, PmsGroupAssessment1Model } from 'src/app/shared/model/pms-group-assessment1.model';
 import { MyPmstopicModel, PmstopicModel } from 'src/app/shared/model/pmstopic.model';
 import { PmsGroupAssessmentService } from 'src/app/shared/services/pms-group-assessment.service';
@@ -30,7 +30,11 @@ export class EditEvaluationGroupingComponent {
     page: Array.from({ length: 1 }, (_, i) => i + 1)
   }
 
-  pmsGroupAssessment: { loading: boolean, select: PmsGroupAssessment1Model, dataList: { check: boolean, data: PmsGroupAssessment1Model }[] } = { loading: false, select: new MyPmsGroupAssessment1Model(), dataList: [] }
+  pmsGroupAssessment: { loading: boolean, select: PmsGroupAssessment1Model, data: PmsGroupAssessmentModel, dataList: { check: boolean, data: PmsGroupAssessment1Model }[] } = {
+    loading: false,
+    select: new MyPmsGroupAssessment1Model(),
+    data: new MyPmsGroupAssessmentModel(), dataList: []
+  }
   pmsGroupAssessmentIndex = -1
   pmstopic: { loading: boolean, select: PmstopicModel, dataList: { check: boolean, data: PmstopicModel }[] } = { loading: false, select: new MyPmstopicModel(), dataList: [] }
 
@@ -86,6 +90,7 @@ export class EditEvaluationGroupingComponent {
     this.pmsGroupAssessment.loading = true
     this.pmsGroupAssessmentService.getBy_plId(this.pl.jobCodeId).subscribe({
       next: response => {
+        this.pmsGroupAssessment.data = response
         this.pmsGroupAssessment.dataList = response.pmsGroupAssessment1List.map(x => ({ check: false, data: new MyPmsGroupAssessment1Model(x) }))
         this.pmsGroupAssessment.dataList.sort((a, b) => a.data.pmsTopic.pmsTopicId.localeCompare(b.data.pmsTopic.pmsTopicId))
         this.pmsGroupAssessment.loading = false
@@ -141,6 +146,7 @@ export class EditEvaluationGroupingComponent {
       personalLevel: new MyPLModel(),
       jd: new MyJobcodeModel(this.pl),
       companyId: "",
+      jlId: this.pmsGroupAssessment.data.jlId,
       pmsGroupAssessment1List: this.pmsGroupAssessment.dataList.map(x => new MyPmsGroupAssessment1Model(x.data))
     }
     this.pmsGroupAssessmentService.post(body).subscribe({

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

@@ -5,6 +5,7 @@ import { MyPLModel, PLModel } from "./pl.model"
 export interface GroupAssessmentModel {
     personalLevel: PLModel
     jd: JobcodeModel
+    jlId: string
     companyId: string
     groupAssessment1List: GroupAssessment1ListModel[]
 }
@@ -13,11 +14,13 @@ export interface GroupAssessmentModel {
 export class MyGroupAssessmentModel implements GroupAssessmentModel {
     personalLevel: PLModel
     jd: JobcodeModel
+    jlId: string
     companyId: string
     groupAssessment1List: GroupAssessment1ListModel[]
     constructor(data?: Partial<GroupAssessmentModel>) {
         this.personalLevel = new MyPLModel(data?.personalLevel || {})
         this.jd = new MyJobcodeModel(data?.jd || {})
+        this.jlId = data?.jlId || ""
         this.companyId = data?.companyId || ""
         this.groupAssessment1List = data?.groupAssessment1List?.map(x => new MyGroupAssessment1ListModel(x)) || []
     }

src/app/shared/model/pms-group-assessment.model.ts

@@ -5,6 +5,7 @@ import { MyPmsGroupAssessment1Model, PmsGroupAssessment1Model } from "./pms-grou
 export interface PmsGroupAssessmentModel {
     personalLevel: PLModel
     jd: JobcodeModel
+    jlId: string
     companyId: string
     pmsGroupAssessment1List: PmsGroupAssessment1Model[]
 }
@@ -13,12 +14,14 @@ export interface PmsGroupAssessmentModel {
 export class MyPmsGroupAssessmentModel implements PmsGroupAssessmentModel {
     personalLevel: PLModel
     jd: JobcodeModel
+    jlId: string
     companyId: string
     pmsGroupAssessment1List: PmsGroupAssessment1Model[]
     constructor(data?: Partial<PmsGroupAssessmentModel>) {
         this.personalLevel = new MyPLModel(data?.personalLevel)
         this.jd = new MyJobcodeModel(data?.jd)
         this.companyId = data?.companyId || ""
+        this.jlId = data?.jlId || ""
         this.pmsGroupAssessment1List = data?.pmsGroupAssessment1List?.map(x => new MyPmsGroupAssessment1Model(x)) || []
     }
 }