Skip to content

M
mySkill-x
Commit 03619eca by Nakarin Luankla
Options

Merge branch 'UAT' of https://mygit.myhr.co.th/angular/mySkill-x into UAT

parents 5f9f90b6 a258c88a
Showing with 9 additions and 9 deletions
src/app/components/performance-evaluation/pms-form-employee/pms-idp/pms-idp.component.html
...@@ -243,27 +243,27 @@ ...@@ -243,27 +243,27 @@
<td class="align-start text-center" <td class="align-start text-center"
[class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.ojtJobAssignment"> [class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.ojtJobAssignment">
<ng-container <ng-container
*ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan.ojtJobAssignment"> *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.ojtJobAssignment">
<i class="ti ti-check text-danger fs-xl "></i> <i class="ti ti-check text-danger fs-xl "></i>
</ng-container> </ng-container>
</td> </td>
<td class="align-start text-center" <td class="align-start text-center"
[class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.coachMentor"> [class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.coachMentor">
<ng-container <ng-container
*ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan.coachMentor"> *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.coachMentor">
<i class="ti ti-check text-danger fs-xl "></i> <i class="ti ti-check text-danger fs-xl "></i>
</ng-container> </ng-container>
</td> </td>
<td class="align-start text-center" <td class="align-start text-center"
[class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.training"> [class.bg-gray-200]="!data.idpDevelopmentPlan||!data.idpDevelopmentPlan.training">
<ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan.training"> <ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training">
<i class="ti ti-check text-danger fs-xl "></i> <i class="ti ti-check text-danger fs-xl "></i>
</ng-container> </ng-container>
</td> </td>
<td class="!p-0"></td> <td class="!p-0"></td>
<td class="align-start text-center" <td class="align-start text-center"
[class.bg-gray-200]="canEdit?(!data.idpDevelopmentPlan.training||(appraisalIdp.masfromEvaluationIdp.idpStatus!='1' && !data.competencyCourse)):!data.competencyCourse"> [class.bg-gray-200]="canEdit?(!data.idpDevelopmentPlan?.training||(appraisalIdp.masfromEvaluationIdp.idpStatus!='1' && !data.competencyCourse)):!data.competencyCourse">
<ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan.training"> <ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training">
<div class="flex !items-center" <div class="flex !items-center"
*ngFor="let competencyCourse of data.competencyCourse" *ngFor="let competencyCourse of data.competencyCourse"
style="min-height: 100px;flex-direction:column"> style="min-height: 100px;flex-direction:column">
...@@ -273,8 +273,8 @@ ...@@ -273,8 +273,8 @@
</ng-container> </ng-container>
</td> </td>
<td class="align-start text-center !white-space-normal" <td class="align-start text-center !white-space-normal"
[class.bg-gray-200]="canEdit?(!data.idpDevelopmentPlan.training||(appraisalIdp.masfromEvaluationIdp.idpStatus!='1' && !data.competencyCourse)):!data.competencyCourse"> [class.bg-gray-200]="canEdit?(!data.idpDevelopmentPlan?.training||(appraisalIdp.masfromEvaluationIdp.idpStatus!='1' && !data.competencyCourse)):!data.competencyCourse">
<ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan.training"> <ng-container *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training">
<ng-container <ng-container
*ngFor="let competencyCourse of data.competencyCourse;let l = index;let last=last"> *ngFor="let competencyCourse of data.competencyCourse;let l = index;let last=last">
<div class="flex !items-center" style="min-height: 100px;"> <div class="flex !items-center" style="min-height: 100px;">
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
</ng-container> </ng-container>
</ng-container> </ng-container>
<ng-container <ng-container
*ngIf="canEdit&&!data.competencyCourse?.length&&appraisalIdp.masfromEvaluationIdp.idpStatus=='1'&&data.idpDevelopmentPlan.training"> *ngIf="canEdit&&!data.competencyCourse?.length&&appraisalIdp.masfromEvaluationIdp.idpStatus=='1'&&data.idpDevelopmentPlan?.training">
<button type="button" <button type="button"
class="ti-btn ti-btn-soft-secondary h-45px m-0 shadow-md" class="ti-btn ti-btn-soft-secondary h-45px m-0 shadow-md"
(click)="openCompetencycourseDialog(i) "> (click)="openCompetencycourseDialog(i) ">
......
src/app/shared/model/competency.model.ts
...@@ -1714,7 +1714,7 @@ export interface CompetencyIndicatorsCourses1 { ...@@ -1714,7 +1714,7 @@ export interface CompetencyIndicatorsCourses1 {
behavioralIndicators: BehavioralIndicator[] behavioralIndicators: BehavioralIndicator[]
competencyCourse: CompetencyCourse[] competencyCourse: CompetencyCourse[]
competencyCourseId: string competencyCourseId: string
idpDevelopmentPlan: IdpDevelopmentPlan idpDevelopmentPlan: IdpDevelopmentPlan | null
indicatorsCourses0: IndicatorsCourses0 indicatorsCourses0: IndicatorsCourses0
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment