Skip to content

M
myAppraisal
Commit b1eb4e98 by Nakarin Luankla
Options

Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV 

# Conflicts:
#	src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
#	src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.ts
parents 38718e44 6010dff5
Showing with 52 additions and 33 deletions
src/app/components/company-components/employee-registration/employee-registration.component.html
......@@ -10,7 +10,7 @@
<nav class="-mb-0.5 flex space-x-6 rtl:space-x-reverse">
<a class="text-base font-medium hs-tab-active:text-lg hs-tab-active:font-bold hs-tab-active:border-secondary hs-tab-active:text-secondary pb-3 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 dark:text-white/70 hover:text-secondary active"
href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1"
aria-controls="underline-1" (click)="pathTitle = ['การจัดการข้อมูลองค์กร','ตั้งค่าผู้ใช้งาน', 'ทะเบียนพนักงาน']">
aria-controls="underline-1" (click)="pathTitle = ['การจัดการข้อมูลองค์กร','ทะเบียนพนักงาน', 'ทะเบียนพนักงาน']">
ทะเบียนพนักงาน
</a>
</nav>
......
src/app/components/company-components/employee-registration/employee-registration.component.ts
......@@ -6,5 +6,5 @@ import { Component } from '@angular/core';
styleUrls: ['./employee-registration.component.scss']
})
export class EmployeeRegistrationComponent {
pathTitle = ['การจัดการข้อมูลองค์กร','ตั้งค่าผู้ใช้งาน', 'ทะเบียนพนักงาน']
pathTitle = ['การจัดการข้อมูลองค์กร','ทะเบียนพนักงาน', 'ทะเบียนพนักงาน']
}
src/app/components/company-components/job-description/position/position-unit.component.html
......@@ -55,7 +55,7 @@
<thead>
<tr>
<ng-container
*ngFor="let item of ['รหัสพนักงาน','รายละเอียด(ไทย) ','รายละเอียด(อังกฤษ)','การจัดการ']; let f = first; let l = last; let i = index">
*ngFor="let item of ['รหัสตำแหน่ง','รายละเอียด(ไทย) ','รายละเอียด(อังกฤษ)','การจัดการ']; let f = first; let l = last; let i = index">
<th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
<span class="font-size-12px font-weight-700">{{ item }}</span>
<div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l">
......@@ -393,4 +393,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/competency-assessment/competency-management/indicators-and-curriculum/edit-group-indicators/edit-group-indicators.ts
......@@ -38,8 +38,30 @@ export class EditGroupIndicators implements OnInit {
{ code: "O", nameShow: "O", name: "O" },
]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
},
{ code: "2", behaviorIndicators: [], assessmentTools: [], curriculum: [] },
{ code: "3", behaviorIndicators: [], assessmentTools: [], curriculum: [] }
{
code: "1", behaviorIndicators: ["asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", "2", "3"], assessmentTools: [[
{ code: "O", nameShow: "O", name: "O" },
{ code: "A", nameShow: "A", name: "A" },
{ code: "D", nameShow: "D", name: "D" },
{ code: "O", nameShow: "O", name: "O" },
{ code: "A", nameShow: "A", name: "A" },
{ code: "D", nameShow: "D", name: "D" }
],[],[
{ code: "O", nameShow: "O", name: "O" },
]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
},
{
code: "1", behaviorIndicators: ["asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", "2", "3"], assessmentTools: [[
{ code: "O", nameShow: "O", name: "O" },
{ code: "A", nameShow: "A", name: "A" },
{ code: "D", nameShow: "D", name: "D" },
{ code: "O", nameShow: "O", name: "O" },
{ code: "A", nameShow: "A", name: "A" },
{ code: "D", nameShow: "D", name: "D" }
],[],[
{ code: "O", nameShow: "O", name: "O" },
]], curriculum: [{ code: "1", name: "1" }, { code: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad", name: "asdasdasdasdasdasdasdasdasdasddsdasdasdasdasdasdasdasdasdasdsad" }, { code: "3", name: "3" }]
},
]
dataSelect?: DataModel
assessmentToolsSelect: number = -1
......@@ -109,4 +131,4 @@ export class EditGroupIndicators implements OnInit {
return match;
});
}
}
\ No newline at end of file
}
src/app/components/competency-assessment/competency-management/set-approvers/set-approvers.component.html
......@@ -166,7 +166,7 @@
<label for="input-label" class="ti-form-label">ระดับพนักงาน</label>
<input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly
value="พนักงานระดับ 01-02">
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 1</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 1</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
......@@ -182,7 +182,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 2</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
......@@ -198,7 +198,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 3</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
......@@ -214,7 +214,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 4</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
......@@ -230,7 +230,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 5</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button"
......
src/app/components/competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component.html
......@@ -47,7 +47,7 @@
<div class="page px-rem">
<p class="pb-2">ตั่งค่าคะแนนประเมินตัวชี้วัดที่ไม่ติด GAP</p>
<p class="pb-2">ตั้งค่าคะแนนประเมินตัวชี้วัดที่ไม่ติด GAP</p>
<div class="overflow-auto table-bordered rounded-t-none" style="max-width: 50%;">
<div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1">
<div class="overflow-auto shadow-md">
......@@ -65,7 +65,7 @@
</thead>
<tbody>
<tr>
<td class="text-base font-bold" style="height: 70px;">ไม่ผ่าน<br>(ไม่ติดGAP)</td>
<td class="text-base font-bold" style="height: 70px;">ผ่าน<br>(ไม่ติดGAP)</td>
<td><input type="radio" name="score5" value="5"></td>
<td><input type="radio" name="score4" value="4"></td>
<td><input type="radio" name="score3" value="3"></td>
......
src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
......@@ -6,16 +6,16 @@
<div class="flex items-center">
<label for="hs-checkbox-group-1" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70">{{mockDataSelect.length}} Selected</label>
</div>
<div class="flex items-center">
<i (click)="toggleCheckbox()" [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}"
class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i>
<label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70" (click)="toggleCheckbox()">Select All</label>
</div>
</div>
</div>
<div class="flex justify-end">
<div class="px-1">
<div class="relative shadow-md">
......@@ -237,15 +237,15 @@
</div>
<div class="ti-modal-body" style="padding-top: 0px;">
<label for="input-label" class="ti-form-label mt-1rem">รหัส *</label>
<input type="text" id="input-label" class="ti-form-input w-1/2">
<input type="text" id="input-label" class="ti-form-input w-1/2" value="01" >
<label for="detail_th" class="ti-form-label mt-1rem">ชื่อประเภท (ไทย)*</label>
<input type="text" id="detail_th" class="ti-form-input w-2/3">
<input type="text" id="detail_th" class="ti-form-input w-2/3" value="Core Competency">
<label for="detail_eng" class="ti-form-label mt-1rem">ชื่อประเภท (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3">
<input type="text" id="detail_eng" class="ti-form-input w-2/3" value="Core Competency">
<label for="detail_eng" class="ti-form-label mt-1rem">ชื่อย่อ *</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3">
<input type="text" id="detail_eng" class="ti-form-input w-2/3" value="CC">
<label for="detail_eng" class="ti-form-label mt-1rem">ระดับความคาดหวัง *</label>
<input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;">
<input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;" value="8">
<div class="flex justify-end mt-2rem mb-1rem">
<button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
......@@ -259,7 +259,7 @@
</div>
</div>
</div>
</div>
</div>
......@@ -368,4 +368,4 @@
</div>
</div>
</div>
</div>
\ No newline at end of file
</div>
src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.ts
......@@ -11,7 +11,7 @@ export class TypeRegistration {
@Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
activeTab: string = 'tab1'; // กำหนด tab เริ่มต้น
isChecked: boolean = false;
// ฟังก์ชันในการเปลี่ยนแท็บ
changeTab(tab: { id: string, text: string }) {
this.sendPathTitle.emit(['การประเมินสมรรถนะ', 'ทะเบียนกำหนดชื่อ', tab.text]);
......
src/app/components/performance-management-evaluation/assessment-management/assigning-approvers/assigning-approvers.component.html
......@@ -163,7 +163,7 @@
<div class="ti-modal-body mt-1">
<label for="input-label" class="ti-form-label">ระดับพนักงาน</label>
<input type="text" id="input-label" class="ti-form-input w-1/2 bg-input-readonly" readonly value="พนักงานระดับ 01-02" >
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 1</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 1</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
......@@ -174,7 +174,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 2</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 2</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
......@@ -185,7 +185,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 3</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 3</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
......@@ -196,7 +196,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 4</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 4</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
......@@ -207,7 +207,7 @@
</div>
</div>
</div>
<label class="ti-form-label mt-2rem">ผู้อนุมัติอันดับที่ 5</label>
<label class="ti-form-label mt-2rem">ผู้ประเมินลำดับที่ 5</label>
<div class="flex">
<div class="relative flex rounded-md w-2/3">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" name="hs-leading-button-add-on-with-icon-and-button" class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10" style="padding-right: 2.5rem;" value="">
......
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