Skip to content

M
myAppraisal
Commit 45ca933f by Nattana Chaiyamat
Options

ปีการประเมิน แก้ปีการประเมินให้เป็น +- 5

parent 1cc60d4b
Showing with 110 additions and 43 deletions
src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html
......@@ -137,19 +137,21 @@
<td class="flex justify-center items-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" (click)="modalStatus='edit';setData(item.data)"
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"
<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> -->
<!-- <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> -->
<span class="badge text-white m-1 cursor-pointer" data-hs-overlay="#evaluation-cycle-page-alert-modal" (click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusFrom.code == '0'" [ngClass]="{
<span class="badge text-white m-1 cursor-pointer" data-hs-overlay="#evaluation-cycle-page-alert-modal"
(click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusFrom.code == '0'" [ngClass]="{
'bg-secondary': item.data.statusFrom.code == '0',
'text-white': item.data.statusFrom.code == '0'
}">
สร้างแบบฟอร์ม
</span>
สร้างแบบฟอร์ม
</span>
<span class="badge text-white m-1" *ngIf="item.data.statusFrom.code == '1'" [ngClass]="{
'bg-primary': item.data.statusFrom.code == '1',
......@@ -257,16 +259,18 @@
[ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
[(ngModel)]="evaluation_cycle.evaluationRoundId">
<label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)<span
class="text-danger">*</span></label>
<label for="detail_th" class="ti-form-label mt-2rem">รายละเอียด (ไทย)<span class="text-danger">*</span></label>
<input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="evaluation_cycle.tdesc">
<label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียด (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="evaluation_cycle.edesc">
<label for="input-label" class="ti-form-label mt-2rem">ปีการประเมิน<span class="text-danger">*</span></label>
<input type="text" id="input-label" class="ti-form-input w-1/2"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="evaluation_cycle.apsyear">
<!-- <input type="text" id="input-label" class="ti-form-input w-1/2"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="evaluation_cycle.apsyear"> -->
<select class="ti-form-select" [(ngModel)]="evaluation_cycle.apsyear">
<option *ngFor="let item of yearList" [ngValue]="item">{{ item }}</option>
</select>
<label for="input-label" class="ti-form-label mt-2rem">เริ่มวันที่<span class="text-danger">*</span></label>
<input type="date" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="evaluation_cycle.apsPeriodStart">
......@@ -290,7 +294,7 @@
[ngClass]="{'input-list-f2': f&&!l, 'input-list-c2': !f&&!l, 'input-list-l2': !f&&l, 'input-list-fl2': f&&l}"
[(ngModel)]="item.tdesc">
<div class="absolute inset-y-0 ltr:right-0 rtl:left-0 flex items-center z-20 ltr:pr-4 rtl:pl-4 space-x-2">
<button *ngIf="item.plId" type="button" class="flex items-center text-red-500"
<button *ngIf="item.plId" type="button" class="flex items-center text-red-500"
(click)="pl.selectIndex=i;selectPl()">
<i class="ti ti-circle-x cursor-pointer"></i>
</button>
......@@ -300,7 +304,7 @@
<div class="col-span-1 ml-1" *ngIf="f">
<ng-component *ngTemplateOutlet="plSearchButton"></ng-component>
</div>
</div>
<div class="grid grid-cols-2" *ngIf="!evaluation_cycle.personalLevel.length">
<div class="col-span-1">
......
src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.ts
......@@ -41,8 +41,20 @@ export class EvaluationCycleComponent {
page: Array.from({ length: 1 }, (_, i) => i + 1)
}
pl: { loading: boolean, selectIndex: number, dataList: PLModel[] } = { loading: false, selectIndex: -1, dataList: [] }
currentDate = new Date()
yearList = [
(this.currentDate.getFullYear() - 5) + "",
(this.currentDate.getFullYear() - 4) + "",
(this.currentDate.getFullYear() - 3) + "",
(this.currentDate.getFullYear() - 2) + "",
(this.currentDate.getFullYear() - 1) + "",
(this.currentDate.getFullYear()) + "",
(this.currentDate.getFullYear() + 1) + "",
(this.currentDate.getFullYear() + 2) + "",
(this.currentDate.getFullYear() + 3) + "",
(this.currentDate.getFullYear() + 4) + "",
(this.currentDate.getFullYear() + 5) + "",
]
constructor(private evaluationCycleService: EvaluationCycleService,
private toastr: ToastrService,
private cdr: ChangeDetectorRef,
......@@ -104,7 +116,6 @@ export class EvaluationCycleComponent {
check: false,
data: new MyEvaluationCycleModel(x)
}));
console.log("🚀 ~ EvaluationCycleComponent ~ this.evaluationCycleService.getList ~ this.evaluation_cyclelist:", this.evaluation_cyclelist)
this.dataLoading = false
this.isDataListCheckedAll = false
this.dataListCheckAll()
......@@ -145,7 +156,7 @@ export class EvaluationCycleComponent {
this.evaluation_cycle = new MyEvaluationCycleModel(data)
}
addevaluation_cycle() {
if(this.evaluation_cycle.personalLevel.length ==0){
if (this.evaluation_cycle.personalLevel.length == 0) {
this.plListFilter().forEach(x => this.selectPl(x))
}
const body = new MyEvaluationCycleModel(this.evaluation_cycle)
......
src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.html
......@@ -28,8 +28,11 @@
</div>
<div class="grid grid-cols-3 gap-6">
<div class="col-span-1">
<input type="text" class="ti-form-input w-2/3 pr-10"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="setting.data.apsyear">
<!-- <input type="text" class="ti-form-input w-2/3 pr-10"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="setting.data.apsyear"> -->
<select class="ti-form-select" [(ngModel)]="setting.data.apsyear">
<option *ngFor="let item of yearList" [ngValue]="item">{{ item }}</option>
</select>
</div>
</div>
<div class="grid grid-cols-3 gap-6 mt-10">
......
src/app/components/competency-assessment/setting-competency/competency-configuration/competency-configuration.component.ts
......@@ -10,6 +10,20 @@ import { SettingAssessmentService } from 'src/app/shared/services/setting-assess
})
export class CompetencyConfigurationComponent {
setting: { loading: boolean, data: SettingAssessmentModel } = { loading: false, data: new MySettingAssessmentModel() }
currentDate = new Date()
yearList = [
(this.currentDate.getFullYear() - 5) + "",
(this.currentDate.getFullYear() - 4) + "",
(this.currentDate.getFullYear() - 3) + "",
(this.currentDate.getFullYear() - 2) + "",
(this.currentDate.getFullYear() - 1) + "",
(this.currentDate.getFullYear()) + "",
(this.currentDate.getFullYear() + 1) + "",
(this.currentDate.getFullYear() + 2) + "",
(this.currentDate.getFullYear() + 3) + "",
(this.currentDate.getFullYear() + 4) + "",
(this.currentDate.getFullYear() + 5) + "",
]
constructor(private settingAssessmentService: SettingAssessmentService,
private toastr: ToastrService,
private cdr: ChangeDetectorRef
......
src/app/components/performance-evaluation/evaluation/evaluation.component.html
......@@ -109,7 +109,7 @@
</td>
<td class="align-start !white-space-normal">
<ng-container *ngIf="f">
{{item2.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.tdesc}}
{{item2.groupAssessment1.competencyIndicatorsCourses1Mini.competencyIndicatorsCourses0.competencyTopic.tdesc}}
</ng-container>
</td>
<td class="align-start !white-space-normal">
......
src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.html
......@@ -135,7 +135,8 @@
</span>
</td>
<td class="flex justify-center items-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1"*ngIf="item.data.statusFrom.code =='1'" (click)="modalStatus='edit';setData(item.data)"
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" *ngIf="item.data.statusFrom.code =='1'"
(click)="modalStatus='edit';setData(item.data)"
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>
......@@ -144,12 +145,14 @@
<!-- <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> -->
<span class="badge text-white m-1 cursor-pointer" data-hs-overlay="#management-evaluation-cycle-page-alert-modal" (click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusFrom.code == '0'" [ngClass]="{
<span class="badge text-white m-1 cursor-pointer"
data-hs-overlay="#management-evaluation-cycle-page-alert-modal"
(click)="modalStatus='createForm';setData(item.data)" *ngIf="item.data.statusFrom.code == '0'" [ngClass]="{
'bg-secondary': item.data.statusFrom.code == '0',
'text-white': item.data.statusFrom.code == '0'
}">
สร้างแบบฟอร์ม
</span>
สร้างแบบฟอร์ม
</span>
<span class="badge text-white m-1" *ngIf="item.data.statusFrom.code == '1'" [ngClass]="{
'bg-primary': item.data.statusFrom.code == '1',
......@@ -265,9 +268,11 @@
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="pmsMasfromEvaluation.edesc">
<label for="input-label" class="ti-form-label mt-2rem">ปีการประเมิน<span class="text-danger">*</span></label>
<input type="text" id="input-label" class="ti-form-input w-1/2"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="pmsMasfromEvaluation.apsyear">
<!-- <input type="text" id="input-label" class="ti-form-input w-1/2"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="pmsMasfromEvaluation.apsyear"> -->
<select class="ti-form-select" [(ngModel)]="pmsMasfromEvaluation.apsyear">
<option *ngFor="let item of yearList" [ngValue]="item">{{ item }}</option>
</select>
<label for="input-label" class="ti-form-label mt-2rem">เริ่มวันที่<span class="text-danger">*</span></label>
<input type="date" id="input-label" class="ti-form-input w-1/2"
[(ngModel)]="pmsMasfromEvaluation.apsPeriodStart">
......
src/app/components/performance-management-evaluation/evaluation-cycle-performance/management-evaluation-cycle/management-evaluation-cycle.component.ts
......@@ -23,7 +23,7 @@ export class ManagementCycleComponent {
currentPage = 1
page = Array.from({ length: 1 }, (_, i) => i + 1);
search = ""
modalStatus: 'createForm'|'add' | 'edit' | 'delete' | 'deleteGroup' = 'add'
modalStatus: 'createForm' | 'add' | 'edit' | 'delete' | 'deleteGroup' = 'add'
pmsMasfromEvaluationlist: { check: boolean, data: PmsMasfromEvaluationModel }[] = []
pmsMasfromEvaluation: PmsMasfromEvaluationModel = new MyPmsMasfromEvaluationModel({})
dataLoading = false
......@@ -41,7 +41,20 @@ export class ManagementCycleComponent {
}
pl: { loading: boolean, selectIndex: number, dataList: PLModel[] } = { loading: false, selectIndex: -1, dataList: [] }
currentDate = new Date()
yearList = [
(this.currentDate.getFullYear() - 5) + "",
(this.currentDate.getFullYear() - 4) + "",
(this.currentDate.getFullYear() - 3) + "",
(this.currentDate.getFullYear() - 2) + "",
(this.currentDate.getFullYear() - 1) + "",
(this.currentDate.getFullYear()) + "",
(this.currentDate.getFullYear() + 1) + "",
(this.currentDate.getFullYear() + 2) + "",
(this.currentDate.getFullYear() + 3) + "",
(this.currentDate.getFullYear() + 4) + "",
(this.currentDate.getFullYear() + 5) + "",
]
constructor(private pmsMasfromEvaluationCycleService: PmsMasfromEvaluationCycleService,
private toastr: ToastrService,
private cdr: ChangeDetectorRef,
......@@ -224,27 +237,27 @@ export class ManagementCycleComponent {
this.modal.currentPage = 1
this.modal.page = Array.from({ length: Math.ceil(dataList.length / 10) }, (_, i) => i + 1);
}
createForm() {
createForm() {
const body = new MyPmsMasfromEvaluationModel(this.pmsMasfromEvaluation)
body.active = 1
this.dataLoading = true
this.pmsMasfromEvaluationCycleService.post(body).subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmsMasfromEvaluationCycleList()
} else {
this.dataLoading = false
this.showAlert(response.message, 'error')
this.cdr.detectChanges()
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmsMasfromEvaluationCycleList()
} else {
this.dataLoading = false
this.showAlert(response.message, 'error')
this.cdr.detectChanges()
}
}, error: error => {
this.showAlert(error.message, 'error')
this.dataLoading = false
this.cdr.detectChanges()
}
}, error: error => {
this.showAlert(error.message, 'error')
this.dataLoading = false
this.cdr.detectChanges()
}
})
}
}
}
src/app/components/performance-management-evaluation/setting-performance-evalution/assessment-system-configuration/assessment-system-configuration.component.html
......@@ -26,8 +26,11 @@
</div>
<div class="grid grid-cols-3 gap-6">
<div class="col-span-1">
<input type="text" class="ti-form-input w-2/3 pr-10" oninput="this.value = this.value.replace(/\D/g, '')"
[(ngModel)]="setting.data.apsyear">
<!-- <input type="text" class="ti-form-input w-2/3 pr-10" oninput="this.value = this.value.replace(/\D/g, '')"
[(ngModel)]="setting.data.apsyear"> -->
<select class="ti-form-select" [(ngModel)]="setting.data.apsyear">
<option *ngFor="let item of yearList" [ngValue]="item">{{ item }}</option>
</select>
</div>
</div>
<label for="hs-trailing-button-add-on-with-icon" class="ti-form-label mt-10">จัดการสมรรถนะกับกลุ่ม <span
......
src/app/components/performance-management-evaluation/setting-performance-evalution/assessment-system-configuration/assessment-system-configuration.component.ts
......@@ -9,6 +9,20 @@ import { PmsSettingAssessmentService } from 'src/app/shared/services/pms-setting
})
export class AssessmentSystemConfigurationComponent {
setting: { loading: boolean, data: PmsSettingAssessmentModel } = { loading: false, data: new MyPmsSettingAssessmentModel() }
currentDate = new Date()
yearList = [
(this.currentDate.getFullYear() - 5) + "",
(this.currentDate.getFullYear() - 4) + "",
(this.currentDate.getFullYear() - 3) + "",
(this.currentDate.getFullYear() - 2) + "",
(this.currentDate.getFullYear() - 1) + "",
(this.currentDate.getFullYear()) + "",
(this.currentDate.getFullYear() + 1) + "",
(this.currentDate.getFullYear() + 2) + "",
(this.currentDate.getFullYear() + 3) + "",
(this.currentDate.getFullYear() + 4) + "",
(this.currentDate.getFullYear() + 5) + "",
]
constructor(private pmsSettingAssessmentService: PmsSettingAssessmentService,
private toastr: ToastrService,
private cdr: ChangeDetectorRef
......
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