การประเมินจัดการประสิทธิภาพ

รอบการประเมิน PMS

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

@@ -183,7 +183,8 @@ export class EditDefineDocumentFormComponent {
         this.empassessmentRoundList = response
         this.empassessmentRoundListCheckbox = this.empassessmentRoundList.map(item => ({ checkbox: false, item }))
         this.checkTopic();
-        this.searchEmpassessmentListFilterChange()
+        this.searchEmpassessmentListFilterChange();
+        this.getIndicators();
         this.cdr.detectChanges();
       },
       error: err => {
@@ -341,7 +342,7 @@ export class EditDefineDocumentFormComponent {
     this.apsassessy = apsassessy
     this.getApsassessy()
     this.getApsassessyMini();
-    this.getIndicators();
+
   }
 
 

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

@@ -153,6 +153,8 @@ import { EvaluationAssessmentService } from 'src/app/shared/services/evaluation-
 import { AppraisalService } from 'src/app/shared/services/appraisal.service';
 import { DayTypeRegistryComponent } from '../company-components/day-type-registry/day-type-registry.component';
 import { EventgrpService } from 'src/app/shared/services/eventgrp.service';
+import { PmsEvaluationCycleService } from 'src/app/shared/services/pms-evaluation-cycle.service';
+import { PmsEvaluationAssessmentService } from 'src/app/shared/services/pms-evaluation-assessment.service';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -336,6 +338,8 @@ export class CustomDateAdapter extends NativeDateAdapter {
     EvaluationAssessmentService,
     AppraisalService,
     EventgrpService,
+    PmsEvaluationCycleService,
+    PmsEvaluationAssessmentService,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: HttpRequestInterceptor,

src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/edit-evaluation-form/edit-evaluation-form.component.html

@@ -74,12 +74,12 @@
                         <tr
                             *ngFor="let item of assessmentListFilter() | slice:((currentPage-1) * this.pageSize) : (((currentPage-1) * this.pageSize) + this.pageSize);let i = index">
                             <td class="flex justify-center items-center">
-                                {{item.masfromEvaluationRound.evaluationRoundId}}</td>
+                                {{item.pmsMasfromEvaluationRound.pmsEvaluationRoundId}}</td>
                             <td>{{item.apsassessy.fname}} {{item.apsassessy.lname}}</td>
                             <td class="text-center">{{item.apsassessy.position.tdesc}}</td>
                             <td class="text-center">{{item.personalLevel.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" *ngIf="item.active"  (click)="openAddRoundModel(item.masfromEvaluationRound.evaluationRoundId,item.apsassessy.employeeId,item,'form-pm-emp')"  ></i>
+                                <i class="ti ti-edit cursor-pointer i-gray fs-xl px-1" *ngIf="item.active"  (click)="openAddRoundModel(item.pmsMasfromEvaluationRound.pmsEvaluationRoundId,item.apsassessy.employeeId,item,'form-pm-emp')"  ></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>
@@ -169,12 +169,12 @@
                         <div class="col-span-1">
                             <input type="text" id="input-label"
                                 class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
-                                readonly value="{{selectEmp.masfromEvaluationRound.evaluationRoundId}}">
+                                readonly value="{{selectEmp?.pmsMasfromEvaluationRound?.pmsEvaluationRoundId}}">
                         </div>
                         <div class="col-span-1">
                             <input type="text" id="input-label"
                                 class="py-2 px-3  ltr:pr-11 rtl:pl-11 ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10 bg-input-readonly"
-                                readonly value="{{selectEmp.apsassessy.fname}} {{selectEmp.apsassessy.lname}}">
+                                readonly value="{{selectEmp?.apsassessy?.fname}} {{selectEmp?.apsassessy?.lname}}">
                         </div>
                     </div>
                 </div>
@@ -238,9 +238,9 @@
                                 <thead>
                                     <tr>
                                         <ng-container
-                                            *ngFor="let item of ['','รหัสสมรรถนะ','ชื่อสมรรถนะ','ระดับความหวัง','การจัดการ']; let f = first; let l = last; let i = index">
+                                            *ngFor="let item of ['','รหัส','ชื่อหัวข้อ','ประเภท','น้ำหนัก','การจัดการ']; let f = first; let l = last; let i = index">
                                             <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
-                                                [class.!text-center]="f || l || item === 'ระดับความหวัง'">
+                                                [class.!text-center]="f || l || item === 'ประเภท'">
                                                 <span class="text-sm">{{ item }}</span>
                                             </th>
                                         </ng-container>
@@ -267,14 +267,15 @@
                                     <tr  *ngFor="let item of empassessmentListFilter() | slice:((currentPageRound-1) * pageSizeRound) : (((currentPageRound-1) * pageSizeRound) + pageSizeRound);let i = index">
                                         <td class="text-center">
                                             <input type="checkbox" class="ti-form-checkbox cursor-pointer"
-                                                id="checkbox-{{item.item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}" [(ngModel)]="item.checkbox" (change)="checkempassessmentRoundListCheckbox()">
+                                                id="checkbox-{{item.item.groupAssessment1.pmsTopic.pmsTopicId}}" [(ngModel)]="item.checkbox" (change)="checkempassessmentRoundListCheckbox()">
                                         </td>
                                         <td>
                                             <label
-                                                for="checkbox-{{item.item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}">{{item.item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}</label>
+                                                for="checkbox-{{item.item.groupAssessment1.pmsTopic.pmsTopicId}}">{{item.item.groupAssessment1.pmsTopic.pmsTopicId}}</label>
                                         </td>
-                                        <td >{{item.item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}</td>
-                                        <td class="!text-center">{{item.item.groupAssessment1.competencyIndicatorsCourses1Mini.lineNo}}</td>
+                                        <td >{{item.item.groupAssessment1.pmsTopic.tdesc}}</td>
+                                        <td class="!text-center">{{item.item.groupAssessment1.pmsTopic.pmsType.tdesc}}</td>
+                                        <td class="!text-center"><input type="text" class="form-control" oninput="this.value = this.value.replace(/[^0-9]/g, '')" [(ngModel)]="item.item.weight" style="width: 60px;"></td>
                                         <td class="flex justify-center">
                                             <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="deleteFormOne(item.item);"></i>
                                         </td>
@@ -381,7 +382,7 @@
                                 <thead>
                                     <tr>
                                         <ng-container
-                                            *ngFor="let item of ['รหัส','ชื่อประเภท','ความคาดหวัง','การจัดการ']; let f = first; let l = last; let i = index">
+                                            *ngFor="let item of ['รหัส','ชื่อหัวข้อ','ประเภท','การจัดการ']; let f = first; let l = last; let i = index">
                                             <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
                                                 [class.!text-center]="f||l">
                                                 <span class="text-sm">{{ item }}</span>
@@ -409,9 +410,9 @@
                                 </thead>
                                 <tbody>
                                     <tr  *ngFor="let item of filterIndicators() | slice:((currentPageIndicator-1) * pageSizeIndicator) : (((currentPageIndicator-1) * pageSizeIndicator) + pageSizeIndicator);let i = index">
-                                        <td>{{item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}</td>
-                                        <td >{{item.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}</td>
-                                        <td class="!text-center">{{item.groupAssessment1.competencyIndicatorsCourses1Mini.lineNo}}</td>
+                                        <td>{{item.groupAssessment1.pmsTopic.pmsTopicId}}</td>
+                                        <td >{{item.groupAssessment1.pmsTopic.tdesc}}</td>
+                                        <td class="!text-center">{{item.groupAssessment1.pmsTopic.pmsType.tdesc}}</td>
                                         <td class="flex justify-center">
                                             <div class="px-1">
                                                 <button type="button" (click)="addIndicators(item)"

src/app/components/performance-management-evaluation/evaluation-cycle-performance/document-form/edit-evaluation-form/edit-evaluation-form.component.ts

@@ -4,8 +4,11 @@ import { AppraisalRoundModel, MyAppraisalRoundModel } from 'src/app/shared/model
 import { AppraisalModel, MyAppraisalModel } from 'src/app/shared/model/appraisal.model';
 import { EvaluationCycleModel, MyEvaluationCycleModel } from 'src/app/shared/model/evaluation-cycle.model';
 import { EvaluationModal } from 'src/app/shared/model/evaluation-form.modal';
-import { EvaluationAssessmentService } from 'src/app/shared/services/evaluation-assessment.service';
-import { EvaluationCycleService } from 'src/app/shared/services/evaluation-cycle.service';
+import { MasfromEvaluationAssessment1lList, PmsMasfromEvaluationFullModel } from 'src/app/shared/model/pms-masfrom-evaluation-list.model';
+import { MyPmsMasfromEvaluationModel, PmsMasfromEvaluationModel } from 'src/app/shared/model/pms-masfrom-evaluation.model';
+import { PmsEvaluationAssessmentService } from 'src/app/shared/services/pms-evaluation-assessment.service';
+import { PmsMasfromEvaluationCycleService } from 'src/app/shared/services/pms-masfrom-evaluation.service';
+import { PmstopicService } from 'src/app/shared/services/pmstopic.service';
 
 
 @Component({
@@ -24,9 +27,9 @@ export class EditEvaluationFormComponent {
   pageSize = 10
   search = ""
 
-  assessmentList: AppraisalModel[] = []
+  assessmentList: PmsMasfromEvaluationFullModel[] = []
 
-  evaluationRound: EvaluationCycleModel = new MyEvaluationCycleModel()
+  evaluationRound: PmsMasfromEvaluationModel = new MyPmsMasfromEvaluationModel()
 
   isChecked: boolean = false;
 
@@ -34,24 +37,24 @@ export class EditEvaluationFormComponent {
   empassessmentList?: EvaluationModal
   searchEmp = ""
 
-  empassessmentRoundList: AppraisalRoundModel[] = []
-  empassessmentRoundListCheckbox: { checkbox: boolean, item: AppraisalRoundModel }[] = []
+  empassessmentRoundList: MasfromEvaluationAssessment1lList[] = []
+  empassessmentRoundListCheckbox: { checkbox: boolean, item: MasfromEvaluationAssessment1lList }[] = []
   currentPageRound = 1
   pageRound = Array.from({ length: 1 }, (_, i) => i + 1);
   pageSizeRound = 10
 
   searchRound = ""
-  selectEmp: AppraisalModel = new MyAppraisalModel()
+  selectEmp?: PmsMasfromEvaluationFullModel
   numDataListChecked = 0
   msg = ""
   typeForm = ""
 
-  selectData: AppraisalRoundModel = new MyAppraisalRoundModel()
+  selectData?: MasfromEvaluationAssessment1lList
 
   loading = false
 
-  indicatorsList: AppraisalRoundModel[] = []
-  indicatorsListShow: AppraisalRoundModel[] = []
+  indicatorsList: MasfromEvaluationAssessment1lList[] = []
+  indicatorsListShow: MasfromEvaluationAssessment1lList[] = []
   searchIndicator = ""
   currentPageIndicator = 1
   pageIndicator = Array.from({ length: 1 }, (_, i) => i + 1);
@@ -59,8 +62,9 @@ export class EditEvaluationFormComponent {
   competencyTopicIds: string[] = []
   constructor(private toastr: ToastrService,
     private cdr: ChangeDetectorRef,
-    private evaluationAssessmentService: EvaluationAssessmentService,
-    private evaluationCycleService: EvaluationCycleService
+    private pmsMasfromEvaluationCycleService: PmsMasfromEvaluationCycleService,
+    private pmsEvaluationAssessmentService: PmsEvaluationAssessmentService,
+    private pmstopicService: PmstopicService
   ) {
 
   }
@@ -81,7 +85,7 @@ export class EditEvaluationFormComponent {
   }
   //############################# เเก้ไขเเบบฟอร์มตามรอบการประเมิน modal แรก #############################
   getAssessmentId() {
-    this.evaluationCycleService.getById(this.evaluationRoundId!).subscribe({
+    this.pmsMasfromEvaluationCycleService.getById(this.evaluationRoundId!).subscribe({
       next: response => {
         this.evaluationRound = response
         this.cdr.detectChanges();
@@ -93,7 +97,7 @@ export class EditEvaluationFormComponent {
 
   }
   getAssessmentList() {
-    this.evaluationAssessmentService.getById(this.evaluationRoundId!).subscribe({
+    this.pmsEvaluationAssessmentService.getById(this.evaluationRoundId!).subscribe({
       next: response => {
         this.assessmentList = response
         this.searchChange()
@@ -110,8 +114,10 @@ export class EditEvaluationFormComponent {
       x.apsassessy.lname.toLowerCase().includes(this.search.toLowerCase()) ||
       x.apsassessy.efname.toLowerCase().includes(this.search.toLowerCase()) ||
       x.apsassessy.elname.toLowerCase().includes(this.search.toLowerCase()) ||
-      x.masfromEvaluationRound.evaluationRoundId.toLowerCase().includes(this.search.toLowerCase()) ||
-      x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase())
+      x.pmsMasfromEvaluationRound.pmsEvaluationRoundId.toLowerCase().includes(this.search.toLowerCase()) ||
+      x.apsassessy.employeeId.toLowerCase().includes(this.search.toLowerCase())||
+      x.apsassessy.position.tdesc.toLowerCase().includes(this.search.toLowerCase())||
+      x.personalLevel.tdesc.toLowerCase().includes(this.search.toLowerCase())
     )
   }
   searchChange() {
@@ -124,7 +130,7 @@ export class EditEvaluationFormComponent {
   saveAssessmentList() {
     let body = this.assessmentList.filter(x => x.active == true)
     if (body.length > 0) {
-      this.evaluationAssessmentService.postList(body).subscribe({
+      this.pmsEvaluationAssessmentService.postList(body).subscribe({
         next: response => {
           if (response.success) {
             this.showAlert(response.message, 'success')
@@ -145,9 +151,12 @@ export class EditEvaluationFormComponent {
   saveIndicators() {
     if (this.empassessmentRoundListCheckbox.map(x => x.item).length > 0) {
       if (this.empassessmentList) {
-        this.empassessmentList.masfromTopic = this.empassessmentRoundListCheckbox.map(x => x.item) as any;
+        this.empassessmentList.masfromTopic = this.empassessmentRoundListCheckbox.map(x => {
+          x.item.weight = Number(x.item.weight);
+          return x.item as any;
+        });
       }
-      this.evaluationAssessmentService.postList([this.empassessmentList]).subscribe({
+      this.pmsEvaluationAssessmentService.postList([this.empassessmentList]).subscribe({
         next: response => {
           if (response.success) {
             this.showAlert(response.message, 'success')
@@ -165,7 +174,7 @@ export class EditEvaluationFormComponent {
   }
   getApsassessy() {
     this.loading = true
-    this.evaluationAssessmentService.getApsassessy(this.evaluationRoundId, this.apsassessy).subscribe({
+    this.pmsEvaluationAssessmentService.getApsassessy(this.evaluationRoundId, this.apsassessy).subscribe({
       next: response => {
         this.empassessmentList = response
         this.loading = false
@@ -178,12 +187,13 @@ export class EditEvaluationFormComponent {
     })
   }
   getApsassessyMini() {
-    this.evaluationAssessmentService.getApsassessyMini(this.evaluationRoundId, this.apsassessy).subscribe({
+    this.pmsEvaluationAssessmentService.getApsassessyMini(this.evaluationRoundId, this.apsassessy).subscribe({
       next: response => {
         this.empassessmentRoundList = response
         this.empassessmentRoundListCheckbox = this.empassessmentRoundList.map(item => ({ checkbox: false, item }))
         this.checkTopic();
         this.searchEmpassessmentListFilterChange()
+        this.getIndicators();
         this.cdr.detectChanges();
       },
       error: err => {
@@ -193,9 +203,10 @@ export class EditEvaluationFormComponent {
   }
   empassessmentListFilter() {
     return this.empassessmentRoundListCheckbox.filter(x =>
-      x.item.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.tdesc?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? "") ||
-      x.item.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.edesc?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? "") ||
-      x.item.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.competencyTopicId?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? ""))
+      x.item.groupAssessment1?.pmsTopic?.tdesc?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? "") ||
+      x.item.groupAssessment1?.pmsTopic?.edesc?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? "") ||
+      x.item.groupAssessment1.pmsTopic.pmsType.tdesc?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? "") ||
+      x.item.groupAssessment1?.pmsTopic?.pmsTopicId?.toLowerCase()?.includes(this.searchRound?.toLowerCase() ?? ""))
   }
 
   searchEmpassessmentListFilterChange() {
@@ -205,8 +216,8 @@ export class EditEvaluationFormComponent {
   }
   checkTopic() {
     this.competencyTopicIds = Array.from(new Set(
-      this.empassessmentRoundListCheckbox.filter(x => x.item.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.competencyTopicId)
-        .map(x => x.item.groupAssessment1!.competencyIndicatorsCourses1Mini!.competencyIndicatorsCourses0!.competencyTopic!.competencyTopicId)
+      this.empassessmentRoundListCheckbox.filter(x => x.item.groupAssessment1?.pmsTopic?.pmsTopicId)
+        .map(x => x.item.groupAssessment1!?.pmsTopic?.pmsTopicId)
     ));
   }
   toggleCheckbox() {
@@ -219,7 +230,7 @@ export class EditEvaluationFormComponent {
     this.numDataListChecked = this.empassessmentRoundListCheckbox.filter(x => x.checkbox).length
     this.isChecked = this.numDataListChecked ? true : false
   }
-  deleteFormOne(item: AppraisalRoundModel) {
+  deleteFormOne(item: MasfromEvaluationAssessment1lList) {
     this.selectData = item;
     this.empassessmentRoundListCheckbox = this.empassessmentRoundListCheckbox.filter(i => i.item !== item);
     this.checkTopic();
@@ -239,16 +250,6 @@ export class EditEvaluationFormComponent {
     this.indicatorChange();
     this.searchEmpassessmentListFilterChange();
     this.checkempassessmentRoundListCheckbox();
-    // this.evaluationAssessmentService.deletemMini(body, this.selectEmp.apsassessy.employeeId, this.selectEmp.masfromEvaluationRound.evaluationRoundId).subscribe({
-    //   next: response => {
-    //     if (response.success) {
-    //       this.showAlert(response.message, 'success')
-    //       this.getApsassessyMini();
-    //     } else {
-    //       this.showAlert(response.message, 'error')
-    //     }
-    //   }
-    // })
   }
   // ############################# ปิด Modal 2 #############################
 
@@ -256,7 +257,7 @@ export class EditEvaluationFormComponent {
   //############################# Modal Indicators #############################
 
   getIndicators() {
-    this.evaluationAssessmentService.getIndicators(this.selectEmp.apsassessy.pl.plId).subscribe({
+    this.pmsEvaluationAssessmentService.getIndicators(this.selectEmp!.apsassessy.pl.plId).subscribe({
       next: response => {
         this.indicatorsList = response
         this.indicatorChange()
@@ -271,24 +272,24 @@ export class EditEvaluationFormComponent {
   indicatorChange() {
     this.indicatorsListShow = this.indicatorsList.filter(x =>
       !this.competencyTopicIds.includes(
-        x.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.competencyTopicId
+        x.groupAssessment1?.pmsTopic?.pmsTopicId
       )
     );
   }
   filterIndicators() {
     return this.indicatorsListShow.filter(x =>
-      x.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.tdesc?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? "") ||
-      x.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.edesc?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? "") ||
-      x.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.competencyTopicId?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? ""))
+      x.groupAssessment1?.pmsTopic.tdesc?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? "") ||
+      x.groupAssessment1?.pmsTopic.edesc?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? "") ||
+      x.groupAssessment1?.pmsTopic?.pmsTopicId?.toLowerCase()?.includes(this.searchIndicator?.toLowerCase() ?? ""))
   }
   searchIndicatorsChange() {
     this.currentPageIndicator = 1;
     const filteredData = this.filterIndicators();
     this.pageIndicator = Array.from({ length: Math.ceil(filteredData.length / this.pageSizeIndicator) }, (_, i) => i + 1);
   }
-  addIndicators(item: AppraisalRoundModel) {
+  addIndicators(item: MasfromEvaluationAssessment1lList) {
     this.empassessmentRoundListCheckbox.push({ checkbox: false, item })
-    this.competencyTopicIds.push(item.groupAssessment1?.competencyIndicatorsCourses1Mini?.competencyIndicatorsCourses0?.competencyTopic?.competencyTopicId)
+    this.competencyTopicIds.push(item.groupAssessment1?.pmsTopic?.pmsTopicId)
     this.indicatorChange();
     this.closeModalClass('form-assessment')
   }
@@ -333,7 +334,7 @@ export class EditEvaluationFormComponent {
   }
 
 
-  openAddRoundModel(evaluationRoundId: string, apsassessy: string, item: AppraisalModel, model: string) {
+  openAddRoundModel(evaluationRoundId: string, apsassessy: string, item: PmsMasfromEvaluationFullModel, model: string) {
     this.searchIndicator = ""
     this.selectEmp = item
     this.openModalClass(model);
@@ -341,7 +342,7 @@ export class EditEvaluationFormComponent {
     this.apsassessy = apsassessy
     this.getApsassessy()
     this.getApsassessyMini();
-    this.getIndicators();
+    
   }
 
 

src/app/shared/model/pms-masfrom-evaluation-list.model.ts

+export interface PmsMasfromEvaluationFullModel {
+    personalLevel: PersonalLevel
+    pmsMasfromEvaluationRound: PmsMasfromEvaluationRoundModel
+    companyId?: string
+    active?: boolean
+    fromDetail: any
+    apsassessy: Apsassessy
+    apsapprove1: Apsapprove1
+    apsapprove2: Apsapprove2
+    apsapprove3: Apsapprove3
+    apsapprove4: Apsapprove4
+    apsapprove5: Apsapprove5
+    apsassessyStatus: any
+    apsapprove1Status: any
+    apsapprove2Status: any
+    apsapprove3Status: any
+    apsapprove4Status: any
+    apsapprove5Status: any
+    apsassessyScore: any
+    apsapprove1Score: any
+    apsapprove2Score: any
+    apsapprove3Score: any
+    apsapprove4Score: any
+    apsapprove5Score: any
+    masfromEvaluationAssessment1lList: MasfromEvaluationAssessment1lList[]
+  }
+  
+  export interface PersonalLevel {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface PmsMasfromEvaluationRoundModel {
+    pmsEvaluationRoundId: string
+    companyId: string
+    tdesc: string
+    edesc: string
+    apsyear: string
+    apsPeriodStart: string
+    apsPeriodEnd: string
+    statusCode: any
+  }
+  
+  export interface Apsassessy {
+    employeeId: string
+    bossId?: string
+    prefix?: Prefix
+    fname: string
+    lname: string
+    efname: string
+    elname: string
+    bu1: Bu1
+    bu2?: Bu2
+    bu3?: Bu3
+    bu4?: Bu4
+    bu5?: Bu5
+    position: Position
+    job?: Job
+    pl: Pl
+    status: Status
+    time0?: Time0
+    resignDate?: string
+    endWorkDate?: string
+    startDate: string
+    thFullName: string
+    engFullName?: string
+  }
+  
+  export interface Prefix {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu1 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu2 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu3 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu4 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu5 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job {
+    jobCodeId?: string
+    tdesc?: string
+    edesc?: string
+  }
+  
+  export interface Pl {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time0 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface Apsapprove1 {
+    employeeId?: string
+    bossId?: string
+    prefix?: Prefix2
+    fname?: string
+    lname?: string
+    efname?: string
+    elname?: string
+    bu1?: Bu12
+    bu2?: Bu22
+    bu3?: Bu32
+    bu4?: Bu42
+    bu5?: Bu52
+    position?: Position2
+    job?: Job2
+    pl?: Pl2
+    status?: Status2
+    time0?: Time02
+    resignDate?: string
+    endWorkDate?: string
+    startDate?: string
+    thFullName?: string
+    engFullName?: string
+  }
+  
+  export interface Prefix2 {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu12 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu22 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu32 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu42 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu52 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position2 {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job2 {
+    jobCodeId: string
+    tdesc?: string
+    edesc?: string
+  }
+  
+  export interface Pl2 {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status2 {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time02 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface Apsapprove2 {
+    employeeId?: string
+    bossId?: string
+    prefix?: Prefix3
+    fname?: string
+    lname?: string
+    efname?: string
+    elname?: string
+    bu1?: Bu13
+    bu2?: Bu23
+    bu3?: Bu33
+    bu4?: Bu43
+    bu5?: Bu53
+    position?: Position3
+    job?: Job3
+    pl?: Pl3
+    status?: Status3
+    time0?: Time03
+    resignDate?: string
+    endWorkDate?: string
+    startDate?: string
+    thFullName?: string
+    engFullName?: string
+  }
+  
+  export interface Prefix3 {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu13 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu23 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu33 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu43 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu53 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position3 {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job3 {
+    jobCodeId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Pl3 {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status3 {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time03 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface Apsapprove3 {
+    employeeId?: string
+    bossId?: string
+    prefix?: Prefix4
+    fname?: string
+    lname?: string
+    efname?: string
+    elname?: string
+    bu1?: Bu14
+    bu2?: Bu24
+    bu3?: Bu34
+    bu4?: Bu44
+    bu5?: Bu54
+    position?: Position4
+    job?: Job4
+    pl?: Pl4
+    status?: Status4
+    time0?: Time04
+    resignDate?: string
+    endWorkDate?: string
+    startDate?: string
+    thFullName?: string
+    engFullName?: string
+  }
+  
+  export interface Prefix4 {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu14 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu24 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu34 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu44 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu54 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position4 {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job4 {
+    jobCodeId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Pl4 {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status4 {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time04 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface Apsapprove4 {
+    employeeId?: string
+    bossId?: string
+    prefix?: Prefix5
+    fname?: string
+    lname?: string
+    efname?: string
+    elname?: string
+    bu1?: Bu15
+    bu2?: Bu25
+    bu3?: Bu35
+    bu4?: Bu45
+    bu5?: Bu55
+    position?: Position5
+    job?: Job5
+    pl?: Pl5
+    status?: Status5
+    time0?: Time05
+    resignDate?: string
+    endWorkDate?: string
+    startDate?: string
+    thFullName?: string
+    engFullName?: string
+  }
+  
+  export interface Prefix5 {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu15 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu25 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu35 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu45 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu55 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position5 {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job5 {
+    jobCodeId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Pl5 {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status5 {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time05 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface Apsapprove5 {
+    employeeId?: string
+    bossId?: string
+    prefix?: Prefix6
+    fname?: string
+    lname?: string
+    efname?: string
+    elname?: string
+    bu1?: Bu16
+    bu2?: Bu26
+    bu3?: Bu36
+    bu4?: Bu46
+    bu5?: Bu56
+    position?: Position6
+    job?: Job6
+    pl?: Pl6
+    status?: Status6
+    time0?: Time06
+    resignDate?: string
+    endWorkDate?: string
+    startDate?: string
+    thFullName?: string
+    engFullName?: string
+  }
+  
+  export interface Prefix6 {
+    prefixId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Bu16 {
+    bu1id: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Bu26 {
+    bu2id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu36 {
+    bu3id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu46 {
+    bu4id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Bu56 {
+    bu5id: string
+    tdesc: string
+    edesc: string
+    parent: string
+    companyId: string
+  }
+  
+  export interface Position6 {
+    positionId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Job6 {
+    jobCodeId: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Pl6 {
+    plId: string
+    tdesc: string
+    edesc: string
+    companyId: string
+  }
+  
+  export interface Status6 {
+    statusCode: string
+    statusType: string
+    tdesc: string
+    edesc: string
+  }
+  
+  export interface Time06 {
+    time0id: string
+    tdesc: string
+    edesc: string
+    stickTm: string
+    hourD: number
+  }
+  
+  export interface MasfromEvaluationAssessment1lList {
+    companyId?: string
+    weight?: number
+    scoreTopicExpectation: any
+    groupAssessment1: GroupAssessment1
+  }
+  
+  export interface GroupAssessment1 {
+    companyId: string
+    pmsTopic: PmsTopic
+  }
+  
+  export interface PmsTopic {
+    pmsTopicId: string
+    pmsType: PmsType
+    companyId: string
+    lineNo: number
+    edesc: string
+    tdesc: string
+    indicatorsDetail: string
+    performanceGoalsDetail: string
+    weight: number
+    detailUnit: string
+    completionDate: string
+    targetAdetail: string
+    targetBdetail: string
+    targetCdetail: string
+    targetDdetail: string
+    targetFdetail: string
+  }
+  
+  export interface PmsType {
+    pmsTypeId: string
+    companyId: string
+    edesc: string
+    tdesc: string
+    shortName: string
+    weight?: number
+  }
+  
\ No newline at end of file

src/app/shared/model/pms-masfrom-evaluation.model.ts

@@ -9,6 +9,7 @@ export interface PmsMasfromEvaluationModel {
     apsPeriodStart: string
     apsPeriodEnd: string
     statusCode: StatusCodeModel
+    active: boolean
 }
 
 export class MyPmsMasfromEvaluationModel implements PmsMasfromEvaluationModel {
@@ -20,6 +21,7 @@ export class MyPmsMasfromEvaluationModel implements PmsMasfromEvaluationModel {
     apsPeriodStart: string
     apsPeriodEnd: string
     statusCode: StatusCodeModel
+    active: boolean
     constructor(data?: Partial<PmsMasfromEvaluationModel>) {
         this.pmsEvaluationRoundId = data?.pmsEvaluationRoundId || "";
         this.companyId = data?.companyId || "";
@@ -28,6 +30,7 @@ export class MyPmsMasfromEvaluationModel implements PmsMasfromEvaluationModel {
         this.apsyear = data?.apsyear || "";
         this.apsPeriodStart = data?.apsPeriodStart || "";
         this.apsPeriodEnd = data?.apsPeriodEnd || "";
+        this.active = data?.active || false
         this.statusCode = new MyStatusCodeModel(data?.statusCode)
 
     }

src/app/shared/services/pms-evaluation-assessment.service.ts

+import { HttpClient, HttpHeaders } 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 { EvaluationCycleModel } from '../model/evaluation-cycle.model';
+import { AppraisalModel } from '../model/appraisal.model';
+import { AppraisalRoundModel } from '../model/appraisal-aps.model';
+import { EvaluationModal } from '../model/evaluation-form.modal';
+import { PmsMasfromEvaluationModel } from '../model/pms-masfrom-evaluation.model';
+import { MasfromEvaluationAssessment1lList, PmsMasfromEvaluationFullModel } from '../model/pms-masfrom-evaluation-list.model';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class PmsEvaluationAssessmentService {
+    api = "/pms-evaluation-assessment"
+    urlApi = environment.baseUrl + this.api
+    constructor(private http: HttpClient) {
+    }
+    getList(): Observable<EvaluationCycleModel[]> {
+        return this.http.get<EvaluationCycleModel[]>(this.urlApi + "/lists")
+    }
+    getById(evaluationRoundId: string): Observable<PmsMasfromEvaluationFullModel[]> {
+        return this.http.get<PmsMasfromEvaluationFullModel[]>(this.urlApi + "/" + evaluationRoundId)
+    }
+    getApsassessy(evaluationRoundId: string,apsassessy:string): Observable<EvaluationModal> {
+        return this.http.get<EvaluationModal>(this.urlApi + "/" + evaluationRoundId+"/"+apsassessy)
+    }
+    getApsassessyMini(evaluationRoundId: string,apsassessy:string): Observable<MasfromEvaluationAssessment1lList[]> {
+        return this.http.get<MasfromEvaluationAssessment1lList[]>(this.urlApi + "/mini/" + evaluationRoundId+"/"+apsassessy)
+    }
+    getIndicators(plId: string): Observable<MasfromEvaluationAssessment1lList[]> {
+        return this.http.get<MasfromEvaluationAssessment1lList[]>(this.urlApi + "/pms-topic/list/" + plId)
+    }
+    post(body: AppraisalModel): Observable<AlertModel> {
+        return this.http.post<AlertModel>(this.urlApi, body)
+      }
+    postList(body:any): Observable<AlertModel> {
+        return this.http.post<AlertModel>(this.urlApi+"/create-list", body)
+      }
+    delete(body: EvaluationCycleModel | EvaluationCycleModel[]): Observable<AlertModel> {
+        const options = {
+          headers: new HttpHeaders({
+            "Content-Type": "application/json",
+          }),
+          body: body
+        };
+    return this.http.delete<AlertModel>(this.urlApi, options)
+    }
+
+    deletemMini(body: AppraisalRoundModel[],apsassessy:string,evaluationRoundId:string): Observable<AlertModel> {
+        const options = {
+          headers: new HttpHeaders({
+            "Content-Type": "application/json",
+          }),
+          body: body
+        };
+    return this.http.delete<AlertModel>(this.urlApi+'/delete-mini'+"/"+apsassessy+"/"+evaluationRoundId, options)
+    }
+}

src/app/shared/services/pms-evaluation-cycle.service.ts

+import { HttpClient, HttpHeaders } 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 { EvaluationCycleModel } from '../model/evaluation-cycle.model';
+
+@Injectable({
+    providedIn: 'root'
+})
+export class PmsEvaluationCycleService {
+    api = "/pms-evaluation-round"
+    urlApi = environment.baseUrl + this.api
+    constructor(private http: HttpClient) {
+    }
+    getList(): Observable<EvaluationCycleModel[]> {
+        return this.http.get<EvaluationCycleModel[]>(this.urlApi + "/lists")
+    }
+    getById(evaluationRoundId: string): Observable<EvaluationCycleModel> {
+        return this.http.get<EvaluationCycleModel>(this.urlApi + "/" + evaluationRoundId)
+    }
+    getApsassessy(evaluationRoundId: string,apsassessy:string): Observable<EvaluationCycleModel> {
+        return this.http.get<EvaluationCycleModel>(this.urlApi + "/" + evaluationRoundId+"/"+apsassessy)
+    }
+    post(body: EvaluationCycleModel): Observable<AlertModel> {
+        return this.http.post<AlertModel>(this.urlApi, body)
+      }
+    delete(body: EvaluationCycleModel | EvaluationCycleModel[]): Observable<AlertModel> {
+        const options = {
+          headers: new HttpHeaders({
+            "Content-Type": "application/json",
+          }),
+          body: body
+        };
+    return this.http.delete<AlertModel>(this.urlApi, options)
+    }
+}

src/app/shared/services/pms-masfrom-evaluation.service.ts

@@ -31,4 +31,18 @@ export class PmsMasfromEvaluationCycleService {
     };
     return this.http.delete<AlertModel>(this.urlApi, options)
   }
+
+  getApsassessy(evaluationRoundId: string, apsassessy: string): Observable<any> {
+    return this.http.get<any>(this.urlApi + "/" + evaluationRoundId + "/" + apsassessy)
+  }
+  getApsassessyMini(evaluationRoundId: string, apsassessy: string): Observable<any[]> {
+    return this.http.get<any[]>(this.urlApi + "/mini/" + evaluationRoundId + "/" + apsassessy)
+  }
+  postList(body: any): Observable<AlertModel> {
+    return this.http.post<AlertModel>(this.urlApi + "/create-list", body)
+  }
+  getIndicators(plId: string): Observable<any[]> {
+    return this.http.get<any[]>(this.urlApi + "/indicators/list/" + plId)
+  }
+
 }