การประเมินสมรรถนะ

การตั้งค่า
กำหนดค่าระบบประเมินสมรรถนะ

src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.html

@@ -2,7 +2,9 @@
     <div class="flex justify-end">
         <div class="px-1">
             <button type="button" class="ti-btn ti-btn-soft-success h-10 m-0 shadow-md"
-                data-hs-overlay="#competency-configuration-alert-modal">
+                data-hs-overlay="#competency-configuration-alert-modal"
+                [class.ti-btn-disabled]="!setting.data.apsyear||checkEmpty(setting.data.expectationLevel)||!setting.data.settingGroupAssessment"
+                [disabled]="!setting.data.apsyear||checkEmpty(setting.data.expectationLevel)||!setting.data.settingGroupAssessment">
                 <i class="ri-save-3-line"></i>
                 Save
             </button>

src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.ts

@@ -57,5 +57,18 @@ export class CompetencyConfigurationComponent {
     })
   }
 
+  checkEmpty(data?: string | number) {
+    switch (typeof data) {
+      case ('number'): {
+        return data == null || data == undefined
+      }
+      case ('string'): {
+        return data == "" || data == null || data == undefined
+      }
+      default: {
+        return true
+      }
+    }
+  }
 }
 

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

@@ -38,8 +38,7 @@ export class SelfEvaluationComponent implements OnInit {
   appraisalCompentency: { loading: boolean, select?: AppraisalCompentencyModel, dataList: AppraisalCompentencyModel[] } = { loading: false, select: undefined, dataList: [] }
   appraisalCompentency2: { loading: boolean, data?: AppraisalCompentencyModel2 } = { loading: false, data: undefined }
   appraisalPms: { loading: boolean, select: undefined, dataList: { check: boolean, data: undefined }[] } = { loading: false, select: undefined, dataList: [] }
-  employee: { loading: boolean, data: EmployeeModel } = { loading: false, data: new MyEmployeeModel() }
-  employeeEvaluate: { loading: boolean, data: EmployeeModel, evaluate: boolean } = { loading: false, data: new MyEmployeeModel(), evaluate: false }
+  employee: { loading: boolean, data: EmployeeModel, evaluate: boolean } = { loading: false, data: new MyEmployeeModel(), evaluate: false }
   setting: { loading: boolean, data: SettingAssessmentModel } = { loading: false, data: new MySettingAssessmentModel() }
   currentDate = new Date()
   constructor(private appraisalService: AppraisalService,
@@ -78,19 +77,6 @@ export class SelfEvaluationComponent implements OnInit {
       }
     })
   }
-  getWorkingLogin() {
-    this.employeeEvaluate.loading = true
-    this.employeeService.getWorking().subscribe({
-      next: response => {
-        this.employeeEvaluate.data = new MyEmployeeModel(response)
-        this.employeeEvaluate.loading = false
-        this.cdr.detectChanges()
-      }, error: error => {
-        this.employeeEvaluate.loading = false
-        this.cdr.detectChanges()
-      }
-    })
-  }
   getWorking() {
     this.employee.loading = true
     this.employeeService.getWorkingById(this.employeeId).subscribe({
@@ -136,36 +122,37 @@ export class SelfEvaluationComponent implements OnInit {
             switch (this.appraisalCompentency2.data?.currentStep) {
               case ("0"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsassessyDate = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsassessy.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsassessy.employeeId
                 break
               }
               case ("1"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsapprove1Date = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsapprove1.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsapprove1.employeeId
                 break
               }
               case ("2"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsapprove2Date = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsapprove2.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsapprove2.employeeId
                 break
               }
               case ("3"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsapprove3Date = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsapprove3.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsapprove3.employeeId
                 break
               }
               case ("4"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsapprove4Date = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsapprove4.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsapprove4.employeeId
                 break
               }
               case ("5"): {
                 this.appraisalCompentency2.data.masfromEvaluationAssessment1lList[0].apsapprove5Date = this.currentDate.toISOString().split('T')[0];
-                this.employeeEvaluate.evaluate = this.employeeEvaluate.data.employeeId == this.appraisalCompentency2.data.apsapprove5.employeeId
+                this.employee.evaluate = this.employee.data.employeeId == this.appraisalCompentency2.data.apsapprove5.employeeId
                 break
               }
               default: { return }
             }
+            console.log(" 🐒 this.employee.evaluate:", this.employee.evaluate)
           }
           this.calnumberCheck()
           this.appraisalCompentency2.loading = false
@@ -417,24 +404,28 @@ export class SelfEvaluationComponent implements OnInit {
         }
         this.appraisalService.postCompetency(body).subscribe({
           next: response => {
-            if (response.success) {
-              Swal.fire({
-                title: 'บันทึกสำเร็จ!',
-                text: 'การประเมินของคุณถูกบันทึกแล้ว',
-                icon: 'success',
-                customClass: {
-                  confirmButton: '!swal2-button-bg-green',
-                }
-              });
-            } else {
-              Swal.fire({
-                title: 'ยกเลิก!',
-                text: 'การบันทึกถูกยกเลิก',
-                icon: 'error',
-                customClass: {
-                  confirmButton: '!swal2-button-bg-danger',
-                }
-              });
+            if (this.appraisalCompentency2.data) {
+              if (response.success) {
+                this.getAppraisalCompentencyForm(this.appraisalCompentency2.data?.masfromEvaluationAssessment1lList[0].competencyType.competencyTypeId)
+                this.getWorking()
+                Swal.fire({
+                  title: 'บันทึกสำเร็จ!',
+                  text: 'การประเมินของคุณถูกบันทึกแล้ว',
+                  icon: 'success',
+                  customClass: {
+                    confirmButton: '!swal2-button-bg-green',
+                  }
+                });
+              } else {
+                Swal.fire({
+                  title: 'ยกเลิก!',
+                  text: 'การบันทึกถูกยกเลิก',
+                  icon: 'error',
+                  customClass: {
+                    confirmButton: '!swal2-button-bg-danger',
+                  }
+                });
+              }
             }
           }, error: error => {
             Swal.fire({