ประเมินตนเอง

src/app/components/performance-evaluation/pms-form-employee/pms-competency/pms-competency.component.html

@@ -150,21 +150,21 @@
                             style="border-radius:10px"
                             (mouseenter)="biScore.set(bi.behavioralIndicators+bi.assessmentId,item)"
                             (mouseleave)="biScore.clear()"
-                            (click)="bi.competencyBehavioral.scoreTopicExpectationBoss=item;calnumberCheck()" [ngClass]="{
-                              '!border-secondary':  bi.competencyBehavioral.scoreTopicExpectationBoss>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
-                              '!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectationBoss>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
-                              '!text-white !bg-secondary': bi.competencyBehavioral.scoreTopicExpectationBoss==item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)==item ,
+                            (click)="bi.competencyBehavioral.scoreTopicExpectation=item;calnumberCheck()" [ngClass]="{
+                              '!border-secondary':  bi.competencyBehavioral.scoreTopicExpectation>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
+                              '!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectation>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
+                              '!text-white !bg-secondary': bi.competencyBehavioral.scoreTopicExpectation==item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)==item ,
                               'pointer-events-none':!canEdit}">
                             {{item}}
                           </button>
                         </ng-container>
-                        <ng-container *ngIf="evaluaterId!=evaluateeId&&!complete">
+                        <ng-container *ngIf="evaluaterId!=evaluateeId||complete">
                           <button type="button"
                             class="h-12 w-12 p-0 shadow border text-soft-secondary-no-hover bg-white"
                             style="border-radius:10px"
                             (mouseenter)="biScore.set(bi.behavioralIndicators+bi.assessmentId,item)"
                             (mouseleave)="biScore.clear()"
-                            (click)="bi.competencyBehavioral.scoreTopicExpectationBoss=item;bi.competencyBehavioral.scoreTopicExpectationBoss=item;calnumberCheck()"
+                            (click)="bi.competencyBehavioral.scoreTopicExpectationBoss=item;calnumberCheck()"
                             [ngClass]="{
                               '!border-secondary':  bi.competencyBehavioral.scoreTopicExpectationBoss>=item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>=item ,
                               '!text-indigo-600':bi.competencyBehavioral.scoreTopicExpectationBoss>item||(biScore.get(bi.behavioralIndicators+bi.assessmentId) ?? 0)>item,
@@ -184,7 +184,7 @@
                       </span>
                     </div>
                   </td>
-                  <ng-container *ngIf="evaluaterId!=evaluateeId&&!complete">
+                  <ng-container *ngIf="evaluaterId!=evaluateeId||complete">
                     <td class="py-2 text-center text-indigo-600 font-semibold" style="vertical-align: top">
                       {{bi.competencyBehavioral.scoreTopicExpectationBoss}}
                     </td>