แก้ไขกลุ่มสมรรถนะ

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html

@@ -159,7 +159,7 @@
                                 </label>
                             </td>
                             <td style="font-size: 12px; width: 60%;">
-                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc}}
+                                {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}
                             </td>
                             <td style="font-size: 12px;text-align: center;">
                                 {{item.data.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.expectation}}
@@ -310,7 +310,7 @@
                                         {{item.data.competencyIndicatorsCourses0.competencyTopic.competencyTopicId}}
                                     </td>
                                     <td style="font-size: 12px; width: 60%;">
-                                        {{item.data.competencyIndicatorsCourses0.tdesc}}
+                                        {{item.data.competencyIndicatorsCourses0.competencyTopic.tdesc}}
                                     </td>
                                     <td style="font-size: 12px;text-align: center; width: 20%;">
                                         {{item.data.competencyIndicatorsCourses0.expectation}}</td>

src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.ts

@@ -117,6 +117,7 @@ export class EditGroupCompetenciesComponent {
       })
     })
     this.isDataListCheckedAll = false
+    this.searchChange()
     this.dataListCheckAll()
   }
 

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

@@ -206,34 +206,34 @@ export class SelfEvaluationComponent implements OnInit {
   }
 
   caltargetScore(targetScore: number) {
-    console.log(" 🐒 targetScore:", targetScore)
+    console.log(" 🐒 targetScore:", this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 1)))
     switch (targetScore) {
       case (1): {
-        this.appraisalCompentencyForm.data.targetScore1 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 1)).length
+        this.appraisalCompentencyForm.data.targetScore1 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 1).length).length
         console.log(" 🐒   1:",   this.appraisalCompentencyForm.data.targetScore1)
         this.cdr.detectChanges()
         break;
       }
       case (2): {
-        this.appraisalCompentencyForm.data.targetScore2 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 2)).length * 2
+        this.appraisalCompentencyForm.data.targetScore2 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 2).length).length * 2
         console.log(" 🐒   2:",   this.appraisalCompentencyForm.data.targetScore2)
         this.cdr.detectChanges()
         break;
       }
       case (3): {
-        this.appraisalCompentencyForm.data.targetScore3 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 3)).length * 3
+        this.appraisalCompentencyForm.data.targetScore3 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 3).length).length * 3
         console.log(" 🐒   3:",   this.appraisalCompentencyForm.data.targetScore3)
         this.cdr.detectChanges()
         break;
       }
       case (4): {
-        this.appraisalCompentencyForm.data.targetScore4 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 4)).length * 4
+        this.appraisalCompentencyForm.data.targetScore4 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 4).length).length * 4
         console.log(" 🐒   4:",   this.appraisalCompentencyForm.data.targetScore4)
         this.cdr.detectChanges()
         break;
       }
       case (5): {
-        this.appraisalCompentencyForm.data.targetScore5 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 5)).length * 5
+        this.appraisalCompentencyForm.data.targetScore5 = this.appraisalCompentencyForm.data.masfromEvaluationAssessment1lList.filter(x => x.groupAssessment1.competencyIndicatorsCourses1Mini.behavioralIndicatorsList.filter(y => y.competencyBehavioral.scoreTopicExpectation == 5).length).length * 5
         console.log(" 🐒   5:",   this.appraisalCompentencyForm.data.targetScore5)
         this.cdr.detectChanges()
         break;