Skip to content

M
mySkill-x
Commit d8822afa by Nattana Chaiyamat
Options

Wizard ลิงค์ผิด

parent 3acb518d
Showing with 55 additions and 54 deletions
src/app/components/employee-self-service/employee-self-service.component.html
...@@ -133,18 +133,36 @@ ...@@ -133,18 +133,36 @@
<div class="col-12 p-2"> <div class="col-12 p-2">
<table> <table>
<ng-container *ngFor="let item of generalPages; let i = index"> <ng-container *ngFor="let item of generalPages; let i = index">
<tbody class="table-link" [attr.data-disable-hover]="!item.link" style="line-height: 2.25rem;"> <ng-container *ngIf="item.text == 'Download เอกสาร'">
<td class="text-menu row-top w-auto"> <tbody class="table-link" [attr.data-disable-hover]="!documentManager.dataList.length"
<a [routerLink]="item.link?item.link:null"> [attr.data-hs-overlay]="documentManager.dataList.length ? '#download-file-manage-modal' : null"
{{i + 1}}&nbsp; style="line-height: 2.25rem;">
</a> <td class="text-menu row-top w-auto">
</td> <a [routerLink]="item.link?item.link:null">
<td class="text-menu"> {{i + 1}}&nbsp;
<a class="table-link-link" [routerLink]="item.link?item.link:null"> </a>
{{ item.text }} </td>
</a> <td class="text-menu">
</td> <a class="table-link-link" [routerLink]="item.link?item.link:null">
</tbody> {{ item.text }}
</a>
</td>
</tbody>
</ng-container>
<ng-container *ngIf="item.text != 'Download เอกสาร'">
<tbody class="table-link" [attr.data-disable-hover]="!item.link" style="line-height: 2.25rem;">
<td class="text-menu row-top w-auto">
<a [routerLink]="item.link?item.link:null">
{{i + 1}}&nbsp;
</a>
</td>
<td class="text-menu">
<a class="table-link-link" [routerLink]="item.link?item.link:null">
{{ item.text }}
</a>
</td>
</tbody>
</ng-container>
</ng-container> </ng-container>
</table> </table>
</div> </div>
...@@ -188,40 +206,20 @@ ...@@ -188,40 +206,20 @@
<div class="row col-12"> <div class="row col-12">
<ng-container *ngFor="let items of competencyPages; let i = index"> <ng-container *ngFor="let items of competencyPages; let i = index">
<ng-container *ngFor="let item of items; let l = index"> <ng-container *ngFor="let item of items; let l = index">
<ng-container *ngIf="item.description == 'รายงาน Competency Base Pay'"> <div class=" col-4 p-2 ">
<div class=" col-4 p-2 "> <a [routerLink]=" item.link?item.link:null" class="row sub-box-menu p-2 row-center"
<a class="row sub-box-menu p-2 row-center" [attr.data-disable-hover]="!item.link" style="min-height: 65px;">
[attr.data-disable-hover]="!documentManager.dataList.length" <div class="col-2">
[attr.data-hs-overlay]="documentManager.dataList.length ? '#download-file-manage-modal' : null" <span
style="min-height: 65px;"> class="flex align-items-center justify-content-center rounded-circle text-white bg-primary text-left text-no">
<div class="col-2"> {{(i*3)+l+1}}
<span </span>
class="flex align-items-center justify-content-center rounded-circle text-white bg-primary text-left text-no"> </div>
{{(i*3)+l+1}} <div class="col text-menu">
</span> {{item.text}}
</div> </div>
<div class="col text-menu"> </a>
{{item.text}} </div>
</div>
</a>
</div>
</ng-container>
<ng-container *ngIf="item.description != 'รายงาน Competency Base Pay'">
<div class=" col-4 p-2 ">
<a [routerLink]=" item.link?item.link:null" class="row sub-box-menu p-2 row-center"
[attr.data-disable-hover]="!item.link" style="min-height: 65px;">
<div class="col-2">
<span
class="flex align-items-center justify-content-center rounded-circle text-white bg-primary text-left text-no">
{{(i*3)+l+1}}
</span>
</div>
<div class="col text-menu">
{{item.text}}
</div>
</a>
</div>
</ng-container>
</ng-container> </ng-container>
</ng-container> </ng-container>
</div> </div>
...@@ -261,7 +259,8 @@ ...@@ -261,7 +259,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ti-modal-footer !rounded-t-none !rounded-b-sm" style="background-color: white;border-radius: 0 0 5px 5px;"> <div class="ti-modal-footer !rounded-t-none !rounded-b-sm"
style="background-color: white;border-radius: 0 0 5px 5px;">
<button type="button" class="hs-dropdown-toggle ti-btn ti-btn-danger" <button type="button" class="hs-dropdown-toggle ti-btn ti-btn-danger"
data-hs-overlay="#download-file-manage-modal"> data-hs-overlay="#download-file-manage-modal">
{{'Close' | translate}} {{'Close' | translate}}
......
src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
[columns]="columns" [selectedItems]="selectedItems" [childForm]="true" (createFormEvent)="createForm($event)" [columns]="columns" [selectedItems]="selectedItems" [childForm]="true" (createFormEvent)="createForm($event)"
(sendNextPageForm)="selectPmsMasfromEvaluationCycle($event); openDialogForm()" (sendNextPageForm)="selectPmsMasfromEvaluationCycle($event); openDialogForm()"
(sendSelectData)="modalStatus='edit';selectPmsMasfromEvaluationCycle($event);openDialog()" (sendSelectData)="modalStatus='edit';selectPmsMasfromEvaluationCycle($event);openDialog()"
(sendSelectedItems)="onSelectItemChange($event)"> (sendSelectedItems)="onSelectItemChange($event)" [actionWidth]="translateService.getCurrentLang()=='th'?220:0">
</app-datagrid-syncfution> </app-datagrid-syncfution>
</div> </div>
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
[class.ti-btn-disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())" [class.ti-btn-disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())"
(click)="addPmsMasfromEvaluation()" (click)="addPmsMasfromEvaluation()"
[disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())"> [disabled]="!pmsMasfromEvaluation.select.pmsEvaluationRoundId||!pmsMasfromEvaluation.select.tdesc||(modalStatus=='add'&&checkPrimary())">
{{'SaveDAte' | translate}} {{'SaveData' | translate}}
</button> </button>
</mat-dialog-actions> </mat-dialog-actions>
</ng-template> </ng-template>
......
src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.ts
...@@ -120,7 +120,7 @@ export class ManagementCycleComponent { ...@@ -120,7 +120,7 @@ export class ManagementCycleComponent {
private cdr: ChangeDetectorRef, private cdr: ChangeDetectorRef,
private renderer: Renderer2, private renderer: Renderer2,
private jobcodeService: JobcodeService, private jobcodeService: JobcodeService,
private translateService: TranslateService public translateService: TranslateService
) { ) {
this.translateService.onLangChange.subscribe((event) => { this.translateService.onLangChange.subscribe((event) => {
this.setSyncfutionDataList() this.setSyncfutionDataList()
...@@ -128,14 +128,15 @@ export class ManagementCycleComponent { ...@@ -128,14 +128,15 @@ export class ManagementCycleComponent {
} }
setSyncfutionDataList() { setSyncfutionDataList() {
if (this.pmsMasfromEvaluation.dataList) { if (this.pmsMasfromEvaluation.dataList) {
this.syncfutionDataList = this.pmsMasfromEvaluation.dataList.map(e => ({ this.syncfutionDataList = this.pmsMasfromEvaluation.dataList.map(e => ({
pmsEvaluationRoundId: e.pmsEvaluationRoundId, pmsEvaluationRoundId: e.pmsEvaluationRoundId,
name: this.translateService.getCurrentLang() == 'th' ? e.tdesc : e.edesc, name: this.translateService.getCurrentLang() == 'th' ? e.tdesc : e.edesc,
apsyear: e.apsyear, apsyear: e.apsyear,
apsPeriodStart: e.apsPeriodStart, apsPeriodStart: e.apsPeriodStart,
apsPeriodEnd: e.apsPeriodEnd, apsPeriodEnd: e.apsPeriodEnd,
statusCode: e.statusCode.tdesc statusCode: this.translateService.getCurrentLang() == 'th' ? e.statusCode.tdesc : e.statusCode.edesc,
statusFrom: e.statusFrom
})) }))
} }
} }
......
src/assets/i18n/th.json
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
"Part5": "ทะเบียนการประเมินเวลาทำงาน", "Part5": "ทะเบียนการประเมินเวลาทำงาน",
"PmsFactors": "ปัจจัยการประเมินผล", "PmsFactors": "ปัจจัยการประเมินผล",
"PmsManage": "การจัดการการประเมินผล", "PmsManage": "การจัดการการประเมินผล",
"EvaluationPeriod": "รอบการประเมิน" "EvaluationPeriod": "รอบการประเมิน",
"TimeAttendance": "ทะเบียนการประเมินเวลาทำงาน"
}, },
"TimeAttendance_head": "ทะเบียนเครื่องมือ", "TimeAttendance_head": "ทะเบียนการประเมินเวลาทำงาน",
"TimeAttendanceManage": "เครื่องมือประเมิน", "TimeAttendanceManage": "เครื่องมือประเมิน",
"PerformanceManagementSystem": "ประเมินการจัดการประสิทธิภาพ", "PerformanceManagementSystem": "ประเมินการจัดการประสิทธิภาพ",
"SearchByNoOrName": "ค้นหาตามรหัสหรือชื่อ", "SearchByNoOrName": "ค้นหาตามรหัสหรือชื่อ",
......
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