Skip to content

M
mySkill-x
Commit f23f1e12 by Nattana Chaiyamat
Options

เพิ่มการเก็บระยะเวลาที่พัฒนา ในส่วน IDP

parent 5d5f9cd4
Showing with 26 additions and 9 deletions
src/app/components/performance-evaluation/pms-form-employee/pms-idp/pms-idp.component.html
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<i class="ti ti-dots-vertical fs-l"></i> <i class="ti ti-dots-vertical fs-l"></i>
</div> </div>
</th> </th>
<th scope="col" rowspan="3" style="border-radius: 0 20px 0 0;" <th scope="col" rowspan="3" style="border-radius: 0 20px 0 0;min-width: 175px"
class="relative px-10px py-10px bg-soft-secondary text-primary !text-center"> class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
<span class="font-size-12px font-weight-700 ">ระยะเวลาที่พัฒนา</span> <span class="font-size-12px font-weight-700 ">ระยะเวลาที่พัฒนา</span>
</th> </th>
...@@ -256,14 +256,16 @@ ...@@ -256,14 +256,16 @@
</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">
...@@ -274,7 +276,8 @@ ...@@ -274,7 +276,8 @@
</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;">
...@@ -299,7 +302,7 @@ ...@@ -299,7 +302,7 @@
*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)">
<i class="ri-add-line"></i> <i class="ri-add-line"></i>
Add Add
</button> </button>
...@@ -312,12 +315,26 @@ ...@@ -312,12 +315,26 @@
*ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd"> *ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
จาก&nbsp; จาก&nbsp;
</ng-container> </ng-container>
{{convertDateFormat(appraisalIdp.masfromEvaluationRound.apsPeriodStart)}}
<ng-container <ng-container
*ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd"> *ngIf="data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training && appraisalIdp.masfromEvaluationIdp.idpStatus=='1'">
&nbsp;ถึง&nbsp; <input type="date" id="input-label" class="ti-form-input"
[(ngModel)]="appraisalIdp.masfromEvaluationRound.apsPeriodStart">
<ng-container
*ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
<p></p>ถึง&nbsp;
</ng-container>
<input type="date" id="input-label" class="ti-form-input"
[(ngModel)]="appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
</ng-container>
<ng-container
*ngIf="!(data.idpDevelopmentPlan&&data.idpDevelopmentPlan?.training) || appraisalIdp.masfromEvaluationIdp.idpStatus!='1'">
{{convertDateFormat(appraisalIdp.masfromEvaluationRound.apsPeriodStart)}}
<ng-container
*ngIf="appraisalIdp.masfromEvaluationRound.apsPeriodStart &&appraisalIdp.masfromEvaluationRound.apsPeriodEnd">
<p></p>ถึง&nbsp;
</ng-container>
{{convertDateFormat(appraisalIdp.masfromEvaluationRound.apsPeriodEnd)}}
</ng-container> </ng-container>
{{convertDateFormat(appraisalIdp.masfromEvaluationRound.apsPeriodEnd)}}
</td> </td>
</tr> </tr>
</ng-container> </ng-container>
......
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