Skip to content

M
myAppraisal
Commit f09b5ccb by Nattana Chaiyamat
Options

แก้wording เพิ่มเติม

parent eab05bce
Showing with 25 additions and 15 deletions
src/app/components/company-components/company-registration/branch-business-unit/branch-business-unit.component.html
......@@ -3,38 +3,45 @@
</div>
<div class="page">
<nav class="flex rtl:space-x-reverse space-x-2">
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900 active"
<a (click)="onSendPathTitle('ทะเบียนฝ่าย')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900 active"
href="javascript:void(0);" id="card-type-item-1" data-hs-tab="#card-type-1" aria-controls="card-type-1">
ทะเบียนฝ่าย
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ทะเบียนแผนก')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-2" data-hs-tab="#card-type-2" aria-controls="card-type-2">
ทะเบียนแผนก
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ทะเบียนส่วน')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-3" data-hs-tab="#card-type-3" aria-controls="card-type-3">
ทะเบียนส่วน
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ส่วนย่อย1')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-4" data-hs-tab="#card-type-4" aria-controls="card-type-4">
ส่วนย่อย1
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ส่วนย่อย2')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-5" data-hs-tab="#card-type-5" aria-controls="card-type-5">
ส่วนย่อย2
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ส่วนย่อย3')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-6" data-hs-tab="#card-type-6" aria-controls="card-type-6">
ส่วนย่อย3
</a>
<a class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
<a (click)="onSendPathTitle('ส่วนย่อย4')"
class="border w-32 justify-center rounded-4px hs-tab-active:!bg-primary hs-tab-active:border-primary hs-tab-active:!text-white -mb-px py-2 px-3 inline-flex items-center gap-2 font-size-16px font-weight-500 text-center text-gray-600 hover:text-gray-900"
href="javascript:void(0);" id="card-type-item-7" data-hs-tab="#card-type-7" aria-controls="card-type-7">
ส่วนย่อย4
</a>
</nav>
<div class="pt-50px">
<div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1">
<app-department-register ></app-department-register>
<app-department-register></app-department-register>
</div>
<div id="card-type-2" class="hidden" role="tabpanel" aria-labelledby="card-type-item-2">
<app-department-list></app-department-list>
......
src/app/components/company-components/company-registration/branch-business-unit/branch-business-unit.component.ts
......@@ -6,7 +6,10 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
styleUrls: ['./branch-business-unit.component.scss']
})
export class BranchBusinessUnitComponent {
@Input() pathTitle = ['การจัดการข้อมูลองค์กร', 'ทะเบียนบริษัท', 'สาขาและหน่วยธุรกิจ' ,'ทะเบียนฝ่าย']
@Input() pathTitle = ['การจัดการข้อมูลองค์กร', 'ทะเบียนบริษัท', 'สาขาและหน่วยธุรกิจ', 'ทะเบียนฝ่าย']
@Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
onSendPathTitle(pathTitle: string) {
this.sendPathTitle.emit(['การจัดการข้อมูลองค์กร', 'ทะเบียนบริษัท', 'สาขาและหน่วยธุรกิจ', pathTitle])
}
}
src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html
......@@ -56,7 +56,7 @@
<thead class="height-50px">
<tr class="font-size-12px">
<ng-container
*ngFor="let item of ['รหัสบริษัท','รายละเอียด (ไทย)','รายละเอียด (อังกฤษ)','Avtion']; let f = first; let l = last">
*ngFor="let item of ['รหัสบริษัท','รายละเอียด (ไทย)','รายละเอียด (อังกฤษ)','การจัดการ']; let f = first; let l = last">
<th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary"
[class.!text-center]="f||l">
<span class="font-size-12px font-weight-700">{{ item }}</span>
......
src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html
......@@ -203,7 +203,7 @@
</div>
<div class="flex justify-between mt-2rem space-x-4">
<div class="w-1/2 pr-2">
<label class="ti-form-label">กำหนดเกรด</label>
<label class="ti-form-label">กำหนดเกรด *</label>
<div class="relative flex rounded-md">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
name="hs-leading-button-add-on-with-icon-and-button"
......@@ -223,7 +223,7 @@
</div>
<div class="flex justify-between mt-2rem space-x-4">
<div class="w-1/2 pr-2">
<label class="ti-form-label">คะแนนต่ำสุด</label>
<label class="ti-form-label">คะแนนต่ำสุด *</label>
<div class="relative flex rounded-md">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
name="hs-leading-button-add-on-with-icon-and-button"
......@@ -232,7 +232,7 @@
</div>
</div>
<div class="w-1/2 pl-2">
<label class="ti-form-label">คะแนนสูงสุด</label>
<label class="ti-form-label">คะแนนสูงสุด *</label>
<div class="relative flex rounded-md">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
name="hs-leading-button-add-on-with-icon-and-button"
......
src/app/shared/services/navservice.ts
......@@ -127,7 +127,7 @@ export class NavService implements OnDestroy {
{ path: '/idp-development-plan', title: 'แผนพัฒนา IDP', type: 'link' },
{ path: '/competency-management', title: 'การจัดการสมรรถนะ', type: 'link' },
{ path: '/evaluation-cycle-manager', title: 'การจัดการรอบการประเมิน', type: 'link' },
{ path: '/setting-competency', title: 'การตั่งค่า', type: 'link' },
{ path: '/setting-competency', title: 'การตั้งค่า', type: 'link' },
{ path: '/dashboard/projects', title: 'รายงาน', type: 'link' },
],
},
......@@ -143,7 +143,7 @@ export class NavService implements OnDestroy {
{ path: '/evaluation-factors', title: 'ปัจจัยการประเมินผล', type: 'link' },
{ path: '/assessment-management', title: 'การจัดการการประเมิน', type: 'link' },
{ path: '/evaluation-cycle-performance', title: 'รอบการประเมิน', type: 'link' },
{ path: '/setting-performance-evalution', title: 'การตั่งค่า', type: 'link' },
{ path: '/setting-performance-evalution', title: 'การตั้งค่า', type: 'link' },
{ path: '', title: 'รายงาน', type: 'link' },
],
},
......
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