Skip to content

M
mySkill-x
Commit 23e93f30 by Nakarin Luankla
Options

การประเมินสมรรถนะ > การจัดการรอบการประเมิน

parent 921acede
Showing with 121 additions and 146 deletions
src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/define-document-form.component.html
......@@ -66,43 +66,41 @@
</ng-container>
</tr>
</thead>
<tbody *ngIf="!dataListFilter().length">
<tbody *ngIf="!evaluation_cycleListFilter().length">
<tr>
<td class="text-center" colspan="100%">
ไม่พบข้อมูล
</td>
</tr>
</tbody>
<tbody *ngIf="dataListFilter().length">
<tbody *ngIf="evaluation_cycleListFilter().length">
<tr
*ngFor="let item of dataListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
<td class="flex justify-around">
<input type="checkbox" class="ti-form-checkbox cursor-pointer" [(ngModel)]="item.check"
(ngModelChange)="dataListCheck()">
<label>{{item.code}}</label>
</td>
<td>{{item.period}}</td>
<td>{{item.year}}</td>
<td>{{item.startDate}}</td>
<td>{{item.endDate}}</td>
*ngFor="let item of evaluation_cycleListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
<td class="text-center">
{{item.evaluationRoundId}}
</td>
<td>{{item.tdesc}}</td>
<td>{{item.apsyear}}</td>
<td>{{item.apsPeriodStart}}</td>
<td>{{item.apsPeriodEnd}}</td>
<td>
<span class="flex justify-center items-center rounded-full h-5 w-5 text-white"
[ngClass]="{'bg-success':item.status=='1','bg-warning':item.status=='2','bg-gray-400':item.status=='3'}">
<ng-container [ngSwitch]="item.status">
[ngClass]="{'bg-success':item.statusCode.code=='0','bg-warning':item.statusCode.code=='1','bg-gray-400':item.statusCode.code=='2'}">
<ng-container [ngSwitch]="item.statusCode.code">
<span class="hs-tooltip ti-main-tooltip flex items-center">
<i *ngSwitchCase="'1'" class="ti ti-clock hs-tooltip-toggle"></i>
<i *ngSwitchCase="'0'" class="ti ti-clock hs-tooltip-toggle"></i>
<span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
กำลังดำเนินการประเมิน
</span>
</span>
<span class="hs-tooltip ti-main-tooltip flex items-center">
<i *ngSwitchCase="'2'" class="ti ti-hourglass-empty hs-tooltip-toggle"></i>
<i *ngSwitchCase="'1'" class="ti ti-hourglass-empty hs-tooltip-toggle"></i>
<span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
รอดำเนินการ
</span>
</span>
<span class="hs-tooltip ti-main-tooltip flex items-center">
<i *ngSwitchCase="'3'" class="ti ti-check hs-tooltip-toggle"></i>
<i *ngSwitchCase="'2'" class="ti ti-check hs-tooltip-toggle"></i>
<span class="hs-tooltip-content ti-main-tooltip-content py-1 px-2 bg-primary text-white shadow-sm dark:bg-slate-700" role="tooltip">
สิ้นสุดช่วงเวลาประเมิน
</span>
......@@ -112,13 +110,12 @@
</span>
</td>
<td class="flex justify-center items-center">
<i *ngIf="item.status !== '2'" class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';dataListSelect(item);onEdit()"></i>
<i *ngIf="item.status !== '2'" class="ti ti-trash cursor-pointer i-gray fs-l px-1"
<i *ngIf="item.statusCode.code !== '2'" class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';onEdit()"></i>
<i *ngIf="item.statusCode.code !== '2'" class="ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay="#define-document-form-delete-modal"></i>
<span *ngIf="item.status === '2'" class="badge text-white m-1 cursor-pointer"
[ngClass]="{'bg-primary':item.status=='2','bg-gray-400':item.status!='2'}"
<span *ngIf="item.statusCode.code !== '2'" class="badge text-white m-1 cursor-pointer bg-primary"
(click)="basicAlert3()">สร้างแบบฟอร์ม</span>
</td>
......@@ -128,41 +125,47 @@
</div>
<nav class="pagination-style-3 overflow-auto my-5" *ngIf="page.length">
<ul class="ti-pagination">
<li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"
(click)="currentPage = (currentPage-1 || 1)">
<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">
<ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
</a>
</ng-container>
<ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
<a class="page-link" href="javascript:void(0);" [class.active]="item==currentPage"
(click)="currentPage=item">{{item}}
</a>
</ng-container>
<ng-container
*ngIf="item==page.length-2&&currentPage!=page.length&&currentPage!=page.length-1&&currentPage!=page.length-2">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
</a>
</ng-container>
</li>
<li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"
(click)="currentPage = (currentPage > page.length-1 ? currentPage: currentPage+1 )">
<i class="ri-arrow-right-s-line align-middle rtl:rotate-180"></i>
</a>
</li>
<li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"
(click)="currentPage = (currentPage-1 || 1)">
<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">
<ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
</a>
</ng-container>
<ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
<a class="page-link" href="javascript:void(0);" [class.active]="item==currentPage"
(click)="currentPage=item">{{item}}
</a>
</ng-container>
<ng-container
*ngIf="item==page.length-2&&currentPage!=page.length&&currentPage!=page.length-1&&currentPage!=page.length-2">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
</a>
</ng-container>
</li>
<li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"
(click)="currentPage = (currentPage > page.length-1 ? currentPage: currentPage+1 )">
<i class="ri-arrow-right-s-line align-middle rtl:rotate-180"></i>
</a>
</li>
</ul>
<ul class="nav-tabs mt-3">
<span>Show {{((currentPage-1) * 10)+1}} to {{evaluation_cycleListFilter().length<10
?evaluation_cycleListFilter().length: (currentPage==page.length ? ((currentPage * 10) - ((currentPage * 10) -
evaluation_cycleListFilter().length) ) :(currentPage * 10) ) }} of {{evaluation_cycleListFilter().length}}
items</span>
</ul>
</nav>
</nav>
</div>
<div id="define-document-form-modal" class="hs-overlay hidden ti-modal">
<div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
<div id="define-document-form-modal" class="hs-overlay hidden ti-modal ">
<div class=" ti-modal-box ease-out modal-md">
<div class="max-h-full overflow-hidden ti-modal-content">
<div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary">
......@@ -204,7 +207,7 @@
</div>
</div>
<div class="ti-modal-body padding-16px pt-0 overflow-y-0">
<label for="input-label" class="ti-form-label mt-2rem">รหัส รอบการประเมิน *</label>
<!-- <label for="input-label" class="ti-form-label mt-2rem">รหัส รอบการประเมิน *</label>
<input type="text" id="input-label" class="ti-form-input w-1/2"
[ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
[(ngModel)]="dataSelect.code">
......@@ -216,7 +219,7 @@
<input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="dataSelect.year">
<label for="input-label" class="ti-form-label mt-2rem">ช่วงเวลารอบการประเมิน</label>
<input type="text" name="daterange" id="inlinetime" ngxDaterangepickerMd
class="form-control ti-form-input focus:z-10 flatpickr-input" readonly />
class="form-control ti-form-input focus:z-10 flatpickr-input" readonly /> -->
<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"
......@@ -234,7 +237,7 @@
</div>
<div id="define-document-form-alert-modal" class="hs-overlay hidden ti-modal">
<div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
<div class="ti-modal-box ease-out flex items-center modal-md">
<div class="max-h-full overflow-hidden ti-modal-content w-full">
<div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary">
......
src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/define-document-form.component.ts
......@@ -7,18 +7,19 @@ import {
} from '@angular/core';
import { ToastrService } from 'ngx-toastr';
import { SwalService } from 'src/app/components/advanced/sweetalert/sweetalert.component';
import { MyStatusCodeModel, StatusCodeModel } from 'src/app/shared/model/status-code.model';
import { EvaluationCycleService } from 'src/app/shared/services/evaluation-cycle.service';
import Swal from 'sweetalert2';
export interface DataModel {
check: boolean;
code: string;
period: string;
year: string;
startDate: string;
endDate: string;
status: string;
evaluationRoundId: string;
tdesc: string;
edesc: string;
apsyear: string;
apsPeriodStart: string;
apsPeriodEnd: string;
statusCode: StatusCodeModel;
}
@Component({
selector: 'app-define-document-form',
templateUrl: './define-document-form.component.html',
......@@ -33,92 +34,53 @@ export class DefineDocumentFormComponent {
numDataListChecked = 0;
isDataListChecked = false;
isDataListCheckedAll = false;
dataList: DataModel[] = [
{
check: false,
code: 'Y67P2',
period: 'ช่วงเวลาที่ 2',
year: '2567',
startDate: '01-07-2567',
endDate: '31-12-2567',
status: '1',
},
{
check: false,
code: 'Y68P1',
period: 'ช่วงเวลาที่ 1',
year: '2568',
startDate: '01-01-2568',
endDate: '30-06-2568',
status: '2',
},
];
dataSelect: DataModel = {
check: false,
code: '',
period: '',
year: '',
startDate: '',
endDate: '',
status: '',
};
modalStatus: 'add' | 'edit' = 'add';
evaluation_cyclelist:DataModel[] = []
constructor(
private cdr: ChangeDetectorRef,
private swalService: SwalService,
private evaluationCycleService: EvaluationCycleService,
private toastr: ToastrService
) {}
onEdit() {
this.sendGroupShow.emit('2');
}
dataListSelect(data?: DataModel) {
this.dataSelect = data || {
check: false,
code: '',
period: '',
year: '',
startDate: '',
endDate: '',
status: '',
};
this.cdr.detectChanges();
ngOnInit(): void {
this.getEvaluationCycleList();
}
dataListFilter() {
return this.dataList.filter((x) => {
const match =
x.code.includes(this.search) || x.period.includes(this.search);
if (!match) x.check = false;
return match;
getEvaluationCycleList() {
this.evaluationCycleService.getList().subscribe({
next: response => {
this.evaluation_cyclelist = response.filter(x => x.statusCode&&x.statusCode.code != '2').map(x => ({
evaluationRoundId: x.evaluationRoundId,
tdesc: x.tdesc,
edesc: x.edesc,
apsyear: x.apsyear,
apsPeriodStart: x.apsPeriodStart,
apsPeriodEnd: x.apsPeriodEnd,
statusCode: new MyStatusCodeModel(x.statusCode || {})
}));
this.searchChange();
this.cdr.detectChanges();
},
error: err => {
console.error('Error fetching evaluation cycles:', err);
}
});
}
dataListCheck() {
const dataCheck = this.dataListFilter();
this.isDataListChecked = dataCheck.some((x) => x.check);
this.isDataListCheckedAll = dataCheck.length
? dataCheck.every((x) => x.check)
: false;
this.numDataListChecked = dataCheck.filter((x) => x.check).length;
searchChange() {
this.currentPage = 1
this.page = Array.from({ length: Math.ceil(this.evaluation_cycleListFilter().length / 10) }, (_, i) => i + 1);
}
dataListCheckAll() {
const selectAll = this.isDataListCheckedAll;
this.dataList.forEach((x) => (x.check = selectAll));
this.dataListCheck();
evaluation_cycleListFilter() {
return this.evaluation_cyclelist.filter(x =>
x.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
x.edesc.toLowerCase().includes(this.search.toLowerCase()) ||
x.evaluationRoundId.toLowerCase().includes(this.search.toLowerCase())
)
}
searchChange() {
this.currentPage = 1;
const filteredData = this.dataListFilter();
this.page = Array.from(
{ length: Math.ceil(filteredData.length / 10) },
(_, i) => i + 1
);
this.dataListCheck();
}
showSuccessDelete() {
this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', {
......
src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/edit-define-document-form/edit-define-document-form.component.html
......@@ -115,7 +115,7 @@
<td style="font-size: 12px;text-align: center;">{{item[3]}}</td>
<td class="flex justify-center items-center space-x-2">
<i class="ti ti-edit cursor-pointer i-gray fs-xl px-1"
data-hs-overlay="#edit-define-document-form-table-modal-edit"></i>
data-hs-overlay="#edit-define-document-form-table-modal-edit" (click)="openEdit()"></i>
<input type="checkbox" id="hs-small-switch"
class="ti-switch checked:bg-none checked:bg-green-600 checked:hover:bg-green-600 checked:focus:bg-green-600 focus:border-green-600 dark:checked:bg-green-600 checked:before:bg-green-200 dark:checked:before:bg-green-200 shrink-0 w-11 h-6 before:w-5 before:h-5">
</td>
......@@ -162,9 +162,8 @@
<div id="edit-define-document-form-table-modal-edit" class="hs-overlay hidden ti-modal">
<div
class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out lg:!max-w-4xl lg:w-full m-3 lg:mx-auto h-[calc(100%-3.5rem)] items-center">
<div #modalEdit id="edit-define-document-form-table-modal-edit" class="hs-overlay hidden ti-modal">
<div class="ti-modal-box ease-out lg:!max-w-4xl lg:w-full m-3 lg:mx-auto items-center ">
<div class="max-h-full overflow-hidden ti-modal-content">
<div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary">
......
src/app/components/competency-assessment/evaluation-cycle-manager/define-document-form/edit-define-document-form/edit-define-document-form.component.ts
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import { ToastrService } from 'ngx-toastr';
@Component({
......@@ -7,6 +7,7 @@ import { ToastrService } from 'ngx-toastr';
styleUrls: ['./edit-define-document-form.component.scss']
})
export class EditDefineDocumentFormComponent {
@ViewChild('modalEdit') modalEdit!: ElementRef;
@Input() pathTitle = ['การประเมินสมรรถนะ', 'การจัดการสมรรถนะ', 'จัดกลุ่มสมรรถนะ'];
@Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>();
@Output() sendGroupShow: EventEmitter<string> = new EventEmitter<string>();
......@@ -40,6 +41,14 @@ export class EditDefineDocumentFormComponent {
}
};
openEdit() {
const modalElement = this.modalEdit.nativeElement;
setTimeout(() => {
modalElement.setAttribute('aria-overlay', 'false');
}, 10);
}
openModal(name: string, size: string, closeOnBackdrop?: boolean) {
this.modalOptions[name].modalSize = size;
this.modalOptions[name].backdropClose = closeOnBackdrop || false;
......
src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle-manager.component.html
......@@ -14,16 +14,16 @@
(click)="activeTab='underline-1';pathTitle = ['การประเมินสมรรถนะ', 'การจัดการรอบการประเมิน', 'รอบการประเมิน']">
รอบการประเมิน
</a>
<!-- <a class="font-size-16px font-weight-500 hs-tab-active:font-weight-700 hs-tab-active:border-secondary hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 hover:text-secondary"
<a class="font-size-16px font-weight-500 hs-tab-active:font-weight-700 hs-tab-active:border-secondary hs-tab-active:text-secondary pb-3 px-1 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 hover:text-secondary"
href="javascript:void(0);" id="underline-item-2" data-hs-tab="#underline-2"
aria-controls="underline-2"
(click)="activeTab='underline-2';pathTitle = ['การประเมินสมรรถนะ', 'การจัดการรอบการประเมิน', 'กำหนดฟอร์มเอกสาร']">
กำหนดฟอร์มเอกสาร
</a> -->
</a>
</nav>
</div>
<div class="px-2rem" [ngClass]="{'pt-50px': groupShow !== '2'}">
<div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
<div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1" *ngIf="activeTab === 'underline-1'">
<app-evaluation-cycle></app-evaluation-cycle>
</div>
<div id="underline-2" role="tabpanel" aria-labelledby="underline-item-2"
......
src/app/components/competency-assessment/evaluation-cycle-manager/evaluation-cycle/evaluation-cycle.component.html
......@@ -9,12 +9,12 @@
{{numDataListChecked}} Selected</label>
</div>
<div class="mx-1 flex items-center">
<button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()"
<button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()" id="check-boxall"
class="focus:ring-2 focus:ring-primary rounded-sm flex item-center">
<i class="fs-l transition-all duration-200"
[ngClass]="{'ri-checkbox-multiple-line text-gray-500': !isDataListCheckedAll, 'ri-checkbox-multiple-fill text-primary': isDataListCheckedAll}"></i>
</button>
<label class="text-sm text-gray-500 ml-2">Select All</label>
<label class="text-sm text-gray-500 ml-2" for="check-boxall">Select All</label>
</div>
</div>
</div>
......@@ -60,10 +60,10 @@
<thead class="height-50px">
<tr class="font-size-12px">
<ng-container
*ngFor="let item of ['รหัส','รายละเอียด','รอบปีการประเมิน','วันที่เริ่มต้น','วันที่สิ้นสุด','สถานะ','การจัดการ']; 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>
<div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l">
<div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!f&&!l">
<i class="ti ti-dots-vertical fs-l"></i>
</div>
</th>
......@@ -93,6 +93,8 @@
<td class="text-center">
<input type="checkbox" class="ti-form-checkbox cursor-pointer"
id="checkbox-{{item.data.evaluationRoundId}}" [(ngModel)]="item.check" (ngModelChange)="dataListCheck()">
</td>
<td >
<label for="checkbox-{{item.data.evaluationRoundId}}">&nbsp;{{item.data.evaluationRoundId}}</label>
</td>
<td>{{item.data.tdesc}}</td>
......
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