Skip to content

M
mySkill-x
Commit 0ddf2a6c by Nakarin Luankla
Options

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

parents 37b46bbd cd1c3879
Showing with 69 additions and 63 deletions
src/app/components/company-components/account-settings/user-settings/user-settings.component.html
......@@ -120,9 +120,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="currentModal='edit';selectUser(item.data)"
data-hs-overlay="#user-setting-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#user-setting-alert-modal"
(click)="currentModal='delete';selectUser(item.data)"></i>
(click)="currentModal='delete';selectUser(item.data)"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html
......@@ -118,9 +118,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#company-registration-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.code!='100'"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" *ngIf="item.data.code!='100'"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#company-registration-page-alert-modal"></i>
data-hs-overlay="#company-registration-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/day-type-registry/day-type-registry.component.html
......@@ -147,9 +147,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#day-type-registry-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#day-type-registry-alert-modal"></i>
data-hs-overlay="#day-type-registry-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.html
......@@ -125,9 +125,9 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" data-hs-overlay="#sub-employee-registration-modal"
(click)="modalType='update';selectEmployee(item.data)"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#sub-employee-registration-alert-delete-modal"
(click)="modalType='delete';selectEmployee(item.data)"></i>
(click)="modalType='delete';selectEmployee(item.data)"></i> -->
</td>
</tr>
</tbody>
......@@ -222,6 +222,7 @@
<label class="col-span-3 ti-form-label text-primary mt-2 align-center">รหัสพนักงาน<span
class="text-danger">*</span></label>
<input type="text" class="col-span-6 ti-form-input" [ngClass]="{'bg-input-readonly':modalType=='update'}"
oninput="this.value = this.value.replace(/[^a-zA-Z0-9\u0E00-\uFFFF]/g, '')" maxlength="15"
[readonly]="modalType=='update'" [(ngModel)]="employee.select.employeeId">
</div>
<div class="grid grid-cols-12 gap-x-6">
......
src/app/components/company-components/employee-registration/sub-employee-registration/sub-employee-registration.component.ts
......@@ -487,6 +487,8 @@ export class SubEmployeeRegistrationComponent {
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.search = ""
this.searchChange()
this.getEmployeeList()
} else {
this.showAlert(response.message, 'error')
......@@ -583,6 +585,7 @@ export class SubEmployeeRegistrationComponent {
!this.employee.select.lname ||
!this.employee.select.empGroup.groupId ||
!this.employee.select.firstHireDate ||
!this.employee.select.resigndate ||
!this.employee.select.bu1.bu1id ||
!this.employee.select.bu2.bu2id ||
!this.employee.select.bu3.bu3id ||
......
src/app/components/company-components/job-description/employee-categories/employee-categories.component.html
......@@ -121,9 +121,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#employee-categories-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#employee-categories-page-alert-modal"></i>
data-hs-overlay="#employee-categories-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/job-description/employee-group-unit/employee-group-unit.component.html
......@@ -118,9 +118,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#employee-group-unit-component-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#employee-group-unit-component-page-alert-modal"></i>
data-hs-overlay="#employee-group-unit-component-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/job-description/employee-level/employee-level.component.html
......@@ -118,9 +118,9 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#employee-level-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#employee-level-page-alert-modal"></i>
data-hs-overlay="#employee-level-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/company-components/job-description/position/position-unit.component.html
......@@ -120,9 +120,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#position-unit-component-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#position-unit-component-page-alert-modal"></i>
data-hs-overlay="#position-unit-component-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/competency-assessment/competency-management/group-competencies/edit-group-competencies/edit-group-competencies.component.html
......@@ -102,12 +102,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......
src/app/components/competency-assessment/course-registration/development-course/development-course.component.html
......@@ -53,12 +53,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......@@ -114,9 +114,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="currentModal='edit' ;selectCompetencycourse(item.data)"
data-hs-overlay="#development-course-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="currentModal='delete' ;selectCompetencycourse(item.data)"
data-hs-overlay="#development-course-alert-modal"></i>
data-hs-overlay="#development-course-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html
......@@ -139,8 +139,8 @@
data-hs-overlay="#evaluation-cycle-page-modal"></i>
<i class="ti ti-user cursor-pointer i-gray fs-l px-1" *ngIf="item.data.statusFrom.code =='1'" data-hs-overlay="#evaluation-cycle-person-modal"
(click)="openModal('evaluation-cycle-person-modal',item.data.evaluationRoundId)"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#evaluation-cycle-page-alert-modal"></i>
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#evaluation-cycle-page-alert-modal"></i> -->
<!-- <span class="badge text-white m-1" *ngIf="item.data.statusCode.code!='1'"
[ngClass]="{'bg-primary':item.data.statusCode.code=='1','bg-gray-400':item.data.statusCode.code!='3'}">ปิดรอบประเมิน</span>
<span class="badge text-white m-1 bg-secondary" *ngIf="item.data.statusCode.code=='0'">สร้างแบบฟอร์ม</span> -->
......
src/app/components/competency-assessment/grade-registration/grade-management/grade-management.component.html
......@@ -90,8 +90,8 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="selectData(item);pathTitleChange('edit')"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#grade-management-alert-delete-modal" (click)="selectData(item)"></i>
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#grade-management-alert-delete-modal" (click)="selectData(item)"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/competency-assessment/grade-registration/grade-management/group-grade/group-grade.component.html
......@@ -37,12 +37,12 @@
Clear
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
......
src/app/components/competency-assessment/grade-registration/grade-management/sub-grade-registration/sub-grade-registration.component.html
......@@ -43,12 +43,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......
src/app/components/competency-assessment/idp-development-plan/set-idp-development-plan/set-idp-development-plan.component.html
......@@ -35,12 +35,12 @@
Save
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......
src/app/components/competency-assessment/name-registration/competency-topic/competency-topic.component.html
......@@ -52,12 +52,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......@@ -112,9 +112,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#competency-topic-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#competency-topic-page-alert-modal"></i>
data-hs-overlay="#competency-topic-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......@@ -229,7 +229,7 @@
(click)="dataSelect.type.code=''">
<i class="ti ti-circle-x cursor-pointer"></i>
</button>
<button type="button" class="flex items-center text-gray-500 dark:text-white/70"
<button type="button" class="flex items-center text-gray-500 dark:text-white/70" (click)="searchCompetencytypeChange()"
data-hs-overlay="#competency-topic-table-modal-select">
<i class="ri-search-line cursor-pointer text-gray"></i>
</button>
......@@ -353,7 +353,7 @@
</tbody>
<tbody *ngIf="!competencytypeListLoading&&competencytypeListFilter().length">
<tr
*ngFor="let item of competencytypeListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
*ngFor="let item of competencytypeListFilter()| slice:((currentPageModal-1) * 10) : (((currentPageModal-1) * 10) + 10);let i = index">
<td class="text-center">{{item.id}}</td>
<td>{{item.name}}</td>
<td class="text-center">{{item.code}}</td>
......@@ -381,7 +381,7 @@
<i class="ri-arrow-left-s-line align-middle rtl:rotate-180"></i>
</a>
</li>
<li *ngFor="let item of page;let f = first;let l = last">
<li *ngFor="let item of pageModal;let f = first;let l = last">
<ng-container
*ngIf="item==3&&currentPageModal!=1&&currentPageModal!=2&&currentPageModal!=3">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i
......
src/app/components/competency-assessment/name-registration/type-registration/type-registration.component.html
......@@ -53,12 +53,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......@@ -112,9 +112,9 @@
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';setData(item.data)"
data-hs-overlay="#type-registration-component-page-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#type-registration-component-page-alert-modal"></i>
data-hs-overlay="#type-registration-component-page-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.html
......@@ -9,12 +9,12 @@
Save
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
......
src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.ts
......@@ -32,7 +32,7 @@ export class CompetencyConfigurationComponent {
}
saveSetting() {
this.setting.loading = true
this.settingAssessmentService.post(new MySettingAssessmentModel({ ...this.setting.data, expectationLevel: +(this.setting.data.expectationLevel) })).subscribe({
this.settingAssessmentService.post(new MySettingAssessmentModel({ ...this.setting.data, expectationLevel: +(this.setting.data.expectationLevel), active: true })).subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
......
src/app/components/competency-assessment/tool-register/assessment-tool/assessment-tool.component.html
......@@ -53,12 +53,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......@@ -112,9 +112,9 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" data-hs-overlay="#assessment-tool-modal"
(click)="currentModal='edit';selectAssessment(item.data)"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#assessment-tool-alert-modal"
(click)="currentModal='delete';selectAssessment(item.data)"></i>
(click)="currentModal='delete';selectAssessment(item.data)"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/performance-management-evaluation/assessment-management/evaluation-grouping/edit-evaluation-grouping/edit-evaluation-grouping.component.html
......@@ -78,12 +78,12 @@
Delete
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......
src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html
......@@ -139,8 +139,8 @@
data-hs-overlay="#management-evaluation-cycle-page-modal"></i>
<i class="ti ti-user cursor-pointer i-gray fs-l px-1" data-hs-overlay="#evaluation-cycle-person-modal"
(click)="openModal('evaluation-cycle-person-modal',item.data.pmsEvaluationRoundId)"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#management-evaluation-cycle-page-alert-modal"></i>
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';setData(item.data)"
data-hs-overlay="#management-evaluation-cycle-page-alert-modal"></i> -->
<!-- <span class="badge text-white m-1" *ngIf="item.data.statusCode.code!='1'"
[ngClass]="{'bg-primary':item.data.statusCode.code=='1','bg-gray-400':item.data.statusCode.code!='3'}">ปิดรอบประเมิน</span>
<span class="badge text-white m-1 bg-secondary" *ngIf="item.data.statusCode.code=='0'">สร้างแบบฟอร์ม</span> -->
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html
......@@ -109,9 +109,9 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';selectPmstopic(item.data)"
data-hs-overlay="#assessment-topics-modal"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='delete';selectPmstopic(item.data)"
data-hs-overlay="#assessment-topics-alert-modal"></i>
data-hs-overlay="#assessment-topics-alert-modal"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.html
......@@ -52,12 +52,12 @@
Delete
</button>
</div> -->
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
</div>
......
src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-grade-management.component.html
......@@ -91,8 +91,8 @@
<td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="selectData(item);pathTitleChange('edit')"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#grade-management-alert-delete-modal" (click)="selectData(item)"></i>
<!-- <i class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#grade-management-alert-delete-modal" (click)="selectData(item)"></i> -->
</td>
</tr>
</tbody>
......
src/app/components/performance-management-evaluation/pms-grade-registration/pms-grade-management/pms-group-grade/pms-group-grade.component.html
......@@ -37,12 +37,12 @@
Clear
</button>
</div>
<div class="px-1">
<!-- <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-10 m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div> -->
</div>
</div>
......
src/app/shared/model/setting-assessment.model.ts
......@@ -8,6 +8,7 @@ export interface SettingAssessmentModel {
settingScore3: number;
settingScore2: number;
settingScore1: number;
active: boolean
}
export class MySettingAssessmentModel implements SettingAssessmentModel {
......@@ -20,7 +21,7 @@ export class MySettingAssessmentModel implements SettingAssessmentModel {
settingScore3: number;
settingScore2: number;
settingScore1: number;
active: boolean
constructor(data?: Partial<SettingAssessmentModel>) {
this.apsyear = data?.apsyear || "";
this.companyId = data?.companyId || "";
......@@ -31,5 +32,6 @@ export class MySettingAssessmentModel implements SettingAssessmentModel {
this.settingScore3 = data?.settingScore3 ?? 0;
this.settingScore2 = data?.settingScore2 ?? 0;
this.settingScore1 = data?.settingScore1 ?? 0;
this.active = data?.active ?? false
}
}
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