Skip to content

M
myAppraisal
Commit 320fefe6 by Nakarin Luankla
Options

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

parents 61908d0c 8ed17eef
Showing with 925 additions and 719 deletions
src/app/app.module.ts
...@@ -26,12 +26,12 @@ import { HttpClientModule } from '@angular/common/http'; ...@@ -26,12 +26,12 @@ import { HttpClientModule } from '@angular/common/http';
BrowserAnimationsModule, BrowserAnimationsModule,
StoreModule.forRoot({ data: dataReaducer }), StoreModule.forRoot({ data: dataReaducer }),
ToastrModule.forRoot(), ToastrModule.forRoot(),
AngularFireModule, // AngularFireModule,
AngularFireDatabaseModule, AngularFireDatabaseModule,
AngularFirestoreModule, AngularFirestoreModule,
AngularFireAuthModule, AngularFireAuthModule,
LeafletModule, LeafletModule,
AngularFireModule.initializeApp(environment.firebase), // AngularFireModule.initializeApp(environment.firebase),
ColorPickerModule, ColorPickerModule,
HttpClientModule HttpClientModule
], ],
......
src/app/authentication/login-page/login-page.component.ts
...@@ -59,22 +59,6 @@ export class LoginPageComponent { ...@@ -59,22 +59,6 @@ export class LoginPageComponent {
this._error = { name: '', message: '' }; this._error = { name: '', message: '' };
} }
login() {
// this.disabled = "btn-loading"
this.clearErrorMessage();
if (this.validateForm(this.email, this.password)) {
this.authservice
.loginWithEmail(this.email, this.password)
.then(() => {
this.router.navigate(['/self-evaluation']);
console.clear();
})
.catch((_error: any) => {
this._error = _error;
this.router.navigate(['/']);
});
}
}
validateForm(email: string, password: string) { validateForm(email: string, password: string) {
if (email.length === 0) { if (email.length === 0) {
......
src/app/components/company-components/company-registration/company-registration-page/company-registration-page.component.html
...@@ -35,9 +35,8 @@ ...@@ -35,9 +35,8 @@
<div class="flex justify-end"> <div class="flex justify-end">
<div class="px-1"> <div class="px-1">
<div class="relative shadow-md"> <div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon" <input type="text" class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name" placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()">
[(ngModel)]="search" (ngModelChange)="searchChange()">
<div <div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4"> class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
<i class="ri-search-line text-gray"></i> <i class="ri-search-line text-gray"></i>
...@@ -183,7 +182,8 @@ ...@@ -183,7 +182,8 @@
<div class="w-full flex justify-end"> <div class="w-full flex justify-end">
<div class="absolute flex"> <div class="absolute flex">
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearData()"> <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
(click)="clearData()">
<svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00" <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)"> transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
...@@ -322,8 +322,9 @@ ...@@ -322,8 +322,9 @@
</div> </div>
<div class="flex justify-center mt-2rem mb-1rem space-x-4"> <div class="flex justify-center mt-2rem mb-1rem space-x-4">
<button type="submit" class="ti-btn ti-btn-secondary" <button type="submit" class="ti-btn ti-btn-secondary"
data-hs-overlay="#company-registration-page-upload-modal" [class.ti-btn-disabled]="!selectedFile" data-hs-overlay="#company-registration-page-upload-modal"
(click)="uploadFile()" [disabled]="!selectedFile" [disabled]="!selectedFile"> [class.ti-btn-disabled]="!selectedFile" (click)="uploadFile()" [disabled]="!selectedFile"
[disabled]="!selectedFile">
อัปโหลด อัปโหลด
</button> </button>
</div> </div>
......
src/app/components/dashboard/dashboard.module.ts
...@@ -138,6 +138,8 @@ import { GroupAssessmentService } from 'src/app/shared/services/group-assessment ...@@ -138,6 +138,8 @@ import { GroupAssessmentService } from 'src/app/shared/services/group-assessment
import { GroupApproveService } from 'src/app/shared/services/group-approve.service'; import { GroupApproveService } from 'src/app/shared/services/group-approve.service';
import { UserService } from 'src/app/shared/services/user.service'; import { UserService } from 'src/app/shared/services/user.service';
import { ManageUserComponent } from '../company-components/account-settings/manage-user/manage-user.component'; import { ManageUserComponent } from '../company-components/account-settings/manage-user/manage-user.component';
import { PmstypeService } from 'src/app/shared/services/pmstype.service';
import { PmstopicService } from 'src/app/shared/services/pmstopic.service';
export const MY_DATE_FORMATS = { export const MY_DATE_FORMATS = {
parse: { parse: {
...@@ -306,6 +308,8 @@ export class CustomDateAdapter extends NativeDateAdapter { ...@@ -306,6 +308,8 @@ export class CustomDateAdapter extends NativeDateAdapter {
GroupAssessmentService, GroupAssessmentService,
GroupApproveService, GroupApproveService,
UserService, UserService,
PmstypeService,
PmstopicService,
{ {
provide: HTTP_INTERCEPTORS, provide: HTTP_INTERCEPTORS,
useClass: HttpRequestInterceptor, useClass: HttpRequestInterceptor,
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.html
<div class="w-full min-height-50px mb-10px justify-between items-center"> <div class="w-full min-height-50px mb-10px justify-between items-center">
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex pr-2"> <div class="flex">
<!-- Content ของ div แรก -->
<div class="flex gap-x-6">
<div class="flex items-center">
<input type="checkbox" class="ti-form-checkbox mt-0.5" id="hs-checkbox-group-1">
<label for="hs-checkbox-group-1" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70">0
Selected</label>
</div>
<div class="flex items-center"> <div class="flex items-center">
<i (click)="toggleCheckbox()" <input type="checkbox" class="ti-form-checkbox pointer-events-none" id="hs-default-checkbox"
[ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}" [(ngModel)]="isDataListChecked">
class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i> <label for="hs-default-checkbox" class="text-sm text-gray-500 mx-2 pointer-events-none">
<label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70" {{numDataListChecked}} Selected</label>
(click)="toggleCheckbox()">Select All</label> </div>
</div> <div class="mx-1 flex items-center">
<button (click)="isDataListCheckedAll = !isDataListCheckedAll;dataListCheckAll()"
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>
</div> </div>
</div> </div>
...@@ -25,31 +22,32 @@ ...@@ -25,31 +22,32 @@
<div class="relative shadow-md"> <div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon" <input type="text" id="hs-leading-icon" name="hs-leading-icon"
class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name" class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
style="height: 40px;"> [(ngModel)]="search" (ngModelChange)="searchChange()" style="height: 40px;">
<div <div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4"> class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
<i class="ri-search-line text-gray"></i> <i class="ri-search-line text-gray"></i>
</div> </div>
</div> </div>
</div> </div>
<div class="px-1"> <!-- <div class="px-1">
<button type="button" <button type="button"
class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md" class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
data-hs-overlay="#assessment-topics-modal-add"> data-hs-overlay="#assessment-topics-upload-modal"
(click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
<i class="ti ti-file-plus"></i> <i class="ti ti-file-plus"></i>
import import
</button> </button>
</div> </div> -->
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md" <button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md"
data-hs-overlay="#assessment-topics-modal-add"> data-hs-overlay="#assessment-topics-modal" (click)="modalStatus='add';selectPmstopic()">
<i class="ri-add-line"></i> <i class="ri-add-line"></i>
Add Add
</button> </button>
</div> </div>
<div class="px-1"> <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md" <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md"
data-hs-overlay="#assessment-topics-alert-delete-modal"> data-hs-overlay="#assessment-topics-alert-modal" (click)="modalStatus='deleteGroup';selectPmstopic()">
<i class="ri-delete-bin-6-line"></i> <i class="ri-delete-bin-6-line"></i>
Delete Delete
</button> </button>
...@@ -65,14 +63,12 @@ ...@@ -65,14 +63,12 @@
</div> </div>
<div class="page px-rem"> <div class="page px-rem">
<div class="overflow-auto table-bordered rounded-t-md"> <div class="overflow-auto shadow-md rounded-t-md">
<div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1"> <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
<div class="overflow-auto shadow-md">
<table class="ti-custom-table ti-custom-table-head ti-custom-table-hover">
<thead> <thead>
<tr> <tr>
<ng-container <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"> <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> <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="!l">
...@@ -82,89 +78,104 @@ ...@@ -82,89 +78,104 @@
</ng-container> </ng-container>
</tr> </tr>
</thead> </thead>
<tbody> <tbody *ngIf="pmstopic.loading">
<tr *ngFor="let item of[ <tr>
['HS-01', 'C1 CUSTOMER ORIENTED (SQCDME)','HOSHIN','5.0'], <td class="text-center" colspan="100%">
['HS-02', 'C2 MANUFACTURING OPTIMIZATION','HOSHIN','3.0'], <div *ngFor="let item of [1,2,3]" class="ti-spinner w-8 h-8 text-secondary mx-1" role="status"
['HS-03', 'C3 INCREASE EMPLOYEE ENGAGEMENT','HOSHIN','3.0'], aria-label="loading">
['HS-04', 'C4 HEALTHY FINANCIAL','HOSHIN','3.0'], <span class="sr-only">Loading...</span>
['HS-05', 'C5 RISK MANAGEMENT','HOSHIN','1.0'], </div>
['KP-01', 'ประสาทงานกับวิทยากร ผู้เข้ารับการอบรมทั้งภายในเเละภายนอกตามเเผนการฝึกอบรมพัฒนา','KPI','10.0'],
['KP-01', '2.1การบันทึกผลการฝึกอบรมระบบ 2020','KPI','2.0']];let i = index">
<td class="flex justify-center items-center" style="height: 40px; font-size: 12px; padding-right: 20px;">
<input type="checkbox" style="margin-right: 15px; transform: scale(0.7);">
<span style="display: inline-block;" class="w-10">{{ item[0] }}</span>
</td> </td>
<td class="detail-td">{{item[1]}}</td> </tr>
<td style="font-size: 12px; padding-left: 1.5rem; width: 20%;">{{item[2]}}</td> </tbody>
<td style="font-size: 12px; padding-left: 1.5rem;width: 10%;">{{item[3]}}</td> <tbody *ngIf="!pmstopic.loading&&!pmstopicListFilter().length">
<tr>
<td class="text-center" colspan="100%">
ไม่พบข้อมูล
</td>
</tr>
</tbody>
<tbody *ngIf="!pmstopic.loading&&pmstopicListFilter().length">
<tr
*ngFor="let item of pmstopicListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
<td class="text-center">
<input type="checkbox" class="ti-form-checkbox cursor-pointer" id="checkbox-{{item.data.pmsTopicId}}"
[(ngModel)]="item.check" (change)="dataListCheck()">
<label for="checkbox-{{item.data.pmsTopicId}}">&nbsp;{{item.data.pmsTopicId}}</label>
</td>
<td>{{item.data.tdesc}}</td>
<td class="text-center">{{item.data.pmsType.tdesc}}</td>
<td class="flex justify-center"> <td class="flex justify-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" <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-edit"></i> 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"
data-hs-overlay="#assessment-topics-alert-delete-modal"></i> (click)="modalStatus='delete';selectPmstopic(item.data)"
data-hs-overlay="#assessment-topics-alert-modal"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> <nav class="pagination-style-3 overflow-auto my-5" *ngIf="page.length">
</div>
<div class="body-content" style="margin-top: 20px;">
<ul class="nav-tabs">
<div class="px-1 py-1 bg-white rounded-2 shadow justify-content-center align-items-center">
<div class="box-body">
<nav class="pagination-style-3 overflow-auto">
<ul class="ti-pagination"> <ul class="ti-pagination">
<li> <li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"> <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> <i class="ri-arrow-left-s-line align-middle rtl:rotate-180"></i>
</a> </a>
</li> </li>
<li><a class="page-link active" href="javascript:void(0);" aria-current="page">1</a></li> <li *ngFor="let item of page;let f = first;let l = last">
<li><a class="page-link" href="javascript:void(0);">2</a></li> <ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3">
<li><a class="page-link" href="javascript:void(0);">3</a></li> <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
<li><a class="page-link" href="javascript:void(0);">4</a></li> </a>
<li><a class="page-link" href="javascript:void(0);">5</a></li> </ng-container>
<li><a class="page-link" href="javascript:void(0);">...</a></li> <ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
<li><a class="page-link" href="javascript:void(0);">31</a></li> <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> <li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"> <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> <i class="ri-arrow-right-s-line align-middle rtl:rotate-180"></i>
</a> </a>
</li> </li>
</ul> </ul>
</nav> <ul class="nav-tabs mt-3">
</div> <span>Show {{((currentPage-1) * 10)+1}} to {{pmstopicListFilter().length<10 ?pmstopicListFilter().length:
</div> (currentPage==page.length ? ((currentPage * 10) - ((currentPage * 10) - pmstopicListFilter().length) )
</ul> :(currentPage * 10) ) }} of {{pmstopicListFilter().length}} items</span>
<ul class="nav-tabs">
<p>Show 1 to 10 of 50 items</p>
</ul> </ul>
</div> </nav>
</div> </div>
<div id="assessment-topics-modal-add" class="hs-overlay hidden ti-modal"> <div id="assessment-topics-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 class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)]">
<div class="max-h-full overflow-hidden ti-modal-content"> <div class="max-h-full overflow-hidden ti-modal-content">
<div class="ti-modal-header"> <div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary"> <h3 class="text-xxl font-bold text-primary">
เพิ่มหัวข้อการประเมิน {{modalStatus=='add'?'เพิ่มหัวข้อการประเมิน':'แก้ไขหัวข้อการประเมิน'}}
</h3> </h3>
<div class="flex justify-end"> <div class="flex justify-end">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-topics-modal-add"> data-hs-overlay="#assessment-topics-modal">
<span class="sr-only">Close</span> <span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i> <i class="ti ti-circle-x fs-xxl"></i>
</button> </button>
</div> </div>
</div> </div>
<div class="ti-modal-center"> <div class="w-full flex justify-end">
<div class="flex justify-end" style="padding-right: 1rem;"> <div class="absolute flex">
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"> <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md" (click)="clearPmstopic(modalStatus)">
<svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00" <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)"> transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
...@@ -188,235 +199,260 @@ ...@@ -188,235 +199,260 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ti-modal-body" style="padding-top: 0px;"> <div class="ti-modal-body padding-16px pt-0 overflow-y-0">
<label for="detail_eng" class="ti-form-label mt-1rem">รหัส</label> <label class="ti-form-label mt-2rem">รหัส*</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3" value=""> <input type="text" class="ti-form-input w-1/2" [ngClass]="{'bg-input-readonly':modalStatus=='edit'}"
<label for="detail_th" class="ti-form-label mt-1rem">ประเภทการประเมินผล</label> [readonly]="modalStatus=='edit'" [(ngModel)]="pmstopic.select.pmsTopicId">
<label class="ti-form-label mt-2rem">ประเภทการประเมินผล*</label>
<div class="flex"> <div class="flex">
<div class="relative flex rounded-md w-2/3"> <div class="relative flex rounded-md">
<input type="text" id="hs-leading-button-add-on-with-icon-and-button" <input type="text" class="ti-form-input rounded-sm ltr:rounded-r-sm rtl:rounded-l-sm focus:z-10" readonly
name="hs-leading-button-add-on-with-icon-and-button" style="padding-right: 3.5rem;" [(ngModel)]="pmstopic.select.pmsType.tdesc">
class="ti-form-input rounded-md ltr:rounded-r-md rtl:rounded-l-md focus:z-10"
style="padding-right: 2.5rem;" value="">
<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"> <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 type="button" class="flex items-center text-red-500" (click)="selectPmstype()">
<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"
data-hs-overlay="#assigning-approvers-table-modal-edit"> data-hs-overlay="#assessment-topic-pmstype-table-modal">
<i class="ri-search-line cursor-pointer text-gray"></i> <i class="ri-search-line cursor-pointer text-gray"></i>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<label for="detail_eng" class="ti-form-label mt-2rem">ชื่อหัวข้อ (ไทย)</label> <label class="ti-form-label mt-2rem">ชื่อหัวข้อ*</label>
<textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"></textarea> <input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.tdesc">
<label for="detail_eng" class="ti-form-label mt-2rem">ชื่อหัวข้อ (อังกฤษ)</label> <label class="ti-form-label mt-2rem">ชื่อหัวข้อ (อังกฤษ)</label>
<textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"></textarea> <input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.edesc">
<label for="detail_eng" class="ti-form-label mt-2rem">ตัวชี้วัดผลงานหลัก</label> <label class="ti-form-label mt-2rem">ตัวชี้วัดผลงานหลัก</label>
<textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="4" cols="50"></textarea> <input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.indicatorsDetail">
<label for="detail_eng" class="ti-form-label mt-2rem">เป้าหมายงาน</label> <label class="ti-form-label mt-2rem">เป้าหมายผลงาน</label>
<textarea type="text" id="detail_eng" class="ti-form-input font-bold" rows="5" cols="50"></textarea> <input type="text" class="ti-form-input" [(ngModel)]="pmstopic.select.performanceGoalsDetail">
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <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" 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"
data-hs-overlay="#assessment-topics-modal-add"> data-hs-overlay="#assessment-topics-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <button type="button" class="ti-btn ti-btn-success" data-hs-overlay="#assessment-topics-alert-modal"
data-hs-overlay="#assessment-topics-alert-add-modal"> [class.ti-btn-disabled]="!pmstopic.select.pmsTopicId||!pmstopic.select.pmsType.pmsTypeId||!pmstopic.select.tdesc"
[disabled]="!pmstopic.select.pmsTopicId||!pmstopic.select.pmsType.pmsTypeId||!pmstopic.select.tdesc">
บันทึกข้อมูล บันทึกข้อมูล
</a> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="assessment-topics-modal-edit" class="hs-overlay hidden ti-modal"> <div id="assessment-topics-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)]"> <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
<div class="max-h-full overflow-hidden ti-modal-content"> <div class="max-h-full overflow-hidden ti-modal-content w-full">
<div class="ti-modal-header"> <div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary"> <h3 class="text-xxl font-bold text-primary">
แก้ไขหัวข้อการประเมิน แจ้งเตือน
</h3> </h3>
<div class="flex justify-end"> <div class="flex justify-end">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-topics-modal-edit"> data-hs-overlay="#assessment-topics-modal">
<span class="sr-only">Close</span> <span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i> <i class="ti ti-circle-x fs-xxl"></i>
</button> </button>
</div> </ng-container>
</div> <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
<div class="ti-modal-center">
<div class="flex justify-end" style="padding-right: 1rem;">
<div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md">
<svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
<g id="SVGRepo_iconCarrier">
<path d="M15 49A24 24 0 0 1 32 8"></path>
<path d="M49 15a24 24 0 0 1-17 41"></path>
<polyline points="15.03 40 15.03 48.97 8 48.97"></polyline>
<polyline points="48.97 24 48.97 15.03 56 15.03"></polyline>
</g>
</svg>
Clear
</button>
</div>
<div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
<i class="ti ti-book fs-l"></i>
Help
</button>
</div>
</div>
</div>
<div class="ti-modal-body" style="padding-top: 0px;">
<label for="detail_eng" class="ti-form-label mt-1rem">รหัส</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3 bg-input-readonly" readonly value="HS-01">
<label for="detail_th" class="ti-form-label mt-1rem">ประเภทการประเมินผล</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="HOSHIN">
<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 type="button" class="flex items-center text-gray-500 dark:text-white/70"
data-hs-overlay="#assigning-approvers-table-modal-edit">
<i class="ri-search-line cursor-pointer text-gray"></i>
</button>
</div>
</div>
</div>
<label for="detail_eng" class="ti-form-label mt-2rem">ชื่อหัวข้อ (ไทย)</label>
<textarea type="text" id="detail_eng" class="ti-form-input" rows="4" cols="50">C1 CUSTOMER ORIENTED (SQCDME)</textarea>
<label for="detail_eng" class="ti-form-label mt-2rem">ชื่อหัวข้อ (อังกฤษ)</label>
<textarea type="text" id="detail_eng" class="ti-form-input" rows="4" cols="50"></textarea>
<label for="detail_eng" class="ti-form-label mt-2rem">ตัวชี้วัดผลงานหลัก</label>
<textarea type="text" id="detail_eng" class="ti-form-input" rows="4" cols="50">CUSTOMER Satisfaction(QCDS)</textarea>
<label for="detail_eng" class="ti-form-label mt-2rem">เป้าหมายงาน</label>
<textarea type="text" id="detail_eng" class="ti-form-input" rows="5" cols="50">95.0</textarea>
<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"
data-hs-overlay="#assessment-topics-modal-add">
ย้อนกลับ
</button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#assessment-topics-alert-edit-modal">
บันทึกข้อมูล
</a>
</div>
</div>
</div>
</div>
</div>
<div id="assessment-topics-alert-add-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="max-h-full overflow-hidden ti-modal-content-alert w-full">
<div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary">
แจ้งเตือน
</h3>
<div class="flex justify-end">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-topics-alert-add-modal"> data-hs-overlay="#assessment-topics-alert-modal">
<span class="sr-only">Close</span> <span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i> <i class="ti ti-circle-x fs-xxl"></i>
</button> </button>
</ng-container>
</div> </div>
</div> </div>
<div class="ti-modal-body "> <div class="ti-modal-body ">
<p class="mt-1 text-gray-800 dark:text-white/70"> <p class="mt-1 text-gray-800 dark:text-white/70">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
ยืนยันการบันทึกข้อมูลหรือไม่ ยืนยันการบันทึกข้อมูลหรือไม่
</ng-container>
<ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
ยืนยันการลบข้อมูลหรือไม่
</ng-container>
</p> </p>
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
<button type="button" <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" 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"
data-hs-overlay="#assessment-topics-modal-add"> data-hs-overlay="#assessment-topics-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" data-hs-overlay="#assessment-topics-alert-add-modal" <a class="ti-btn ti-btn-success" href="javascript:void(0);" data-hs-overlay="#assessment-topics-alert-modal"
(click)="addUser();showSuccess()"> (click)="updatePmstopic('post')">
บันทึกข้อมูล บันทึกข้อมูล
</a> </a>
</ng-container>
<ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
<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"
data-hs-overlay="#assessment-topics-alert-modal">
ย้อนกลับ
</button>
<a class="ti-btn ti-btn-danger" href="javascript:void(0);" data-hs-overlay="#assessment-topics-alert-modal"
(click)="updatePmstopic('delete')">
ลบข้อมูล
</a>
</ng-container>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="assessment-topics-alert-edit-modal" class="hs-overlay hidden ti-modal"> <div id="assessment-topics-upload-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="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
<div class="max-h-full overflow-hidden ti-modal-content-alert w-full"> <div class="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
<div class="ti-modal-header"> <h5 class="text-xxl font-bold text-white">
<h3 class="text-xxl font-bold text-primary"> นำเข้าหัวข้อการประเมิน
แจ้งเตือน </h5>
</h3> </div>
<div class="flex justify-end"> <div class="ti-modal-body max-h-full overflow-hidden ti-modal-content !rounded-t-none !rounded-b-sm">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <h1 class="mt-2" style="text-align: center;">ไฟล์</h1>
data-hs-overlay="#assessment-topics-alert-edit-modal"> <div class="mt-2 p-2">
<span class="sr-only">Close</span> <div class="flex rounded-md">
<i class="ti ti-circle-x fs-xxl"></i> <input #fileInput id="fileInput" type="file" (change)="onFileSelected($event)" hidden>
<input type="text" [value]="selectedFileName" readonly (click)="fileInput.click()"
class="ti-form-input rounded-none ltr:rounded-l-md rtl:rounded-r-md focus:z-10 cursor-pointer">
<button type="button" (click)="fileInput.click()"
class="inline-flex flex-shrink-0 justify-center items-center h-[2.875rem] w-[2.875rem] ltr:rounded-r-md rtl:rounded-l-md border border-transparent font-semibold bg-secondary text-white hover:bg-secondary focus:z-10 focus:outline-none focus:ring-0 focus:ring-secondary transition-all text-sm">
<i class="ti ti-upload"></i>
</button> </button>
</div> </div>
<div class="flex justify-center mt-2rem ">
<h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
ดาวน์โหลดตัวอย่างไฟล์</h1>
</div> </div>
<div class="ti-modal-body "> <div class="flex justify-center mt-2rem mb-1rem space-x-4">
<p class="mt-1 text-gray-800 dark:text-white/70"> <button type="submit" class="ti-btn ti-btn-secondary" data-hs-overlay="#assessment-topics-upload-modal"
ยืนยันการเเก้ไขข้อมูลหรือไม่ [class.ti-btn-disabled]="!selectedFile" (click)="uploadFile()" [disabled]="!selectedFile"
</p> [disabled]="!selectedFile">
อัปโหลด
<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"
data-hs-overlay="#assessment-topics-modal-edit">
ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#assessment-topics-alert-edit-modal" (click)="addUser();showSuccessEdit()">
บันทึกข้อมูล
</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="assessment-topics-alert-delete-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="max-h-full overflow-hidden ti-modal-content-alert w-full">
<div id="assessment-topic-pmstype-table-modal" 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">
<div class="max-h-full overflow-hidden ti-modal-content">
<div class="ti-modal-header"> <div class="ti-modal-header">
<h3 class="text-xxl font-bold text-primary"> <h3 class="text-xxl font-bold text-primary">
แจ้งเตือน ข้อมูลประเภทการประเมิน
</h3> </h3>
<div class="flex justify-end"> <div class="flex justify-end">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-topics-alert-delete-modal"> data-hs-overlay="#assessment-topics-modal">
<span class="sr-only">Close</span> <span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i> <i class="ti ti-circle-x fs-xxl"></i>
</button> </button>
</div> </div>
</div> </div>
<div class="ti-modal-body "> <div class="ti-modal-body">
<p class="mt-1 text-gray-800 dark:text-white/70"> <div class="flex justify-end pb-1rem">
ยืนยันการลบข้อมูลหรือไม่! <div class="px-1">
</p> <div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon"
<div class="flex justify-end mt-2rem mb-1rem"> class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
[(ngModel)]="modal.search" (ngModelChange)="modalSearchChange(pmstypeListFilter())">
<div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
<i class="ri-search-line text-gray"></i>
</div>
</div>
</div>
</div>
<div class="overflow-auto border">
<table class="ti-custom-table ti-custom-table-head ti-custom-table-hover">
<thead>
<tr>
<ng-container *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">
<span class="text-sm">{{ item }}</span>
<div class="absolute top-1/2 transform -translate-y-1/2 right-0" *ngIf="!l">
<i class="ti ti-dots-vertical fs-l"></i>
</div>
</th>
</ng-container>
</tr>
</thead>
<tbody *ngIf="!pmstypeListFilter().length">
<tr>
<td class="text-center" colspan="100%">
ไม่พบข้อมูล
</td>
</tr>
</tbody>
<tbody *ngIf="pmstypeListFilter().length">
<tr
*ngFor="let item of pmstypeListFilter() | slice:((modal.currentPage-1) * 10) : (((modal.currentPage-1) * 10) + 10);let i = index"
class="cursor-pointer" (click)="selectPmstype(item.data)" data-hs-overlay="#assessment-topics-modal">
<td>{{item.data.pmsTypeId}}</td>
<td>{{item.data.tdesc}}</td>
<td>{{item.data.shortName}}</td>
</tr>
</tbody>
</table>
</div>
<nav class="pagination-style-3 overflow-auto my-5" *ngIf="modal.page.length">
<ul class="ti-pagination">
<li>
<a aria-label="anchor" class="page-link" href="javascript:void(0);"
(click)="modal.currentPage = (modal.currentPage-1 || 1)">
<i class="ri-arrow-left-s-line align-middle rtl:rotate-180"></i>
</a>
</li>
<li *ngFor="let item of modal.page;let f = first;let l = last">
<ng-container *ngIf="item==3&&modal.currentPage!=1&&modal.currentPage!=2&&modal.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==modal.currentPage-1||item==modal.currentPage||item==modal.currentPage+1)">
<a class="page-link" href="javascript:void(0);" [class.active]="item==modal.currentPage"
(click)="modal.currentPage=item">{{item}}
</a>
</ng-container>
<ng-container
*ngIf="item==modal.page.length-2&&modal.currentPage!=modal.page.length&&modal.currentPage!=modal.page.length-1&&modal.currentPage!=modal.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)="modal.currentPage = (modal.currentPage > modal.page.length-1 ? modal.currentPage: modal.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 {{((modal.currentPage-1) * 10)+1}} to {{pmstypeListFilter().length<10
?pmstypeListFilter().length: (modal.currentPage==modal.page.length ? ((modal.currentPage * 10) -
((modal.currentPage * 10) - pmstypeListFilter().length) ) :(modal.currentPage * 10) ) }} of
{{pmstypeListFilter().length}} items</span>
</ul>
</nav>
<div class="flex justify-end mt-2rem mb-1rem space-x-4">
<button type="button" <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" 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"
data-hs-overlay="#assessment-topics-alert-delete-modal"> data-hs-overlay="#assessment-topics-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#assessment-topics-alert-delete-modal" (click)="addUser();showSuccessDelete()">
ลบข้อมูล
</a>
</div> </div>
</div> </div>
</div> </div>
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.scss
.button-clear {
position: absolute;
top: 96px;
z-index: 1;
right: 41vw;
}
.button-help {
position: absolute;
top: 0px;
z-index: 1;
right: 0vw;
margin: 4.2rem;
margin-right: 10px; /* เพิ่มใหม่ 12/16*/
}
table.ti-custom-table thead {
height: 60px;
}
table.ti-custom-table thead th span {
font-size: 12px;
font-weight: bold;
}
.ti-custom-table td{
padding-left: 0.9rem;
padding-right: 1rem;
}
.ti-custom-table thead th:first-child {
width: 105px; /* ปรับความกว้างตามที่ต้องการ */
text-align: left; /* จัดตำแหน่งข้อความถ้าต้องการ */
}
.ti-custom-table thead th:last-child {
width: 150px; /* ปรับความกว้างตามที่ต้องการ */
}
a.custom-link {
padding: 10px 40px; /* ปรับ padding ให้เพิ่มขนาด */
}
/* สไตล์ของแถบเมนู */
.nav-tabs {
display: flex;
width: 100%;
cursor: pointer;
margin-bottom: 10px;
height: 20%;
}
.nav-item {
list-style: none;
margin-right: 10px; /* ช่องว่างระหว่างเมนู */
}
.nav-link {
text-decoration: none;
padding: 10px 20px;
display: inline-block;
font-size: large;
border-width: 2px 2px 0px 2px;
border-style: solid;
border-color: #ccc;
border-radius: 5px 5px 0px 0px;
}
.nav-link:hover {
background-color: #f0f0f0; /* เปลี่ยนสีเมื่อ hover */
}
.nav-link.active {
color: #ffffff; /* สีตัวอักษรในสถานะ active */
font-size: large;
border-bottom: 3.5px solid rgb(var(--color-primary)); /* เส้นใต้ */
background-color: rgb(var(--color-primary));
border-width: 2px 2px 0px 2px;
border-style: solid;
border-color: rgb(var(--color-primary));
border-radius: 5px 5px 0px 0px;
}
.tab-content {
margin-top: 20px;
}
.tab-pane.active {
display: block;
}
.nav-item-text {
list-style: none;
margin-right: 10px; /* ช่องว่างระหว่างเมนู */
}
.nav-link-text {
text-decoration: none;
display: inline-block;
font-size: large;
color: #569bf5;
border-bottom: 2px solid #569bf5;
line-height: 0.8;
}
.ti-pagination .page-link.active {
background-color: #569bf5;
color: white;
border-radius: 50%;
padding: 8px 12px;
}
.box-body{
padding: 0rem;
}
.page{
min-height: 0vh;
}
// .ti-modal-content {
// width: 70%;
// position: absolute;
// top: 50%;
// left: 50%;
// transform: translate(-50%, -50%);
// max-height: 90%; /* จำกัดความสูงให้อยู่ใน modal */
// overflow-y: auto; /* เปิดการเลื่อนแนวตั้ง */
// }
// .ti-modal-body-content {
// display: flex; /* ใช้ flexbox เพื่อจัดตำแหน่ง */
// justify-content: center; /* จัดฟอร์มให้อยู่กลางในแนวนอน */
// flex-direction: column; /* ทำให้ฟอร์มแสดงผลในรูปแบบคอลัมน์ */
// height: calc(100% - 50px); /* ให้ความสูงเป็น 100% ลบด้วยระยะห่างข้างบน */
// margin-left: calc(15% - 30px);
// margin-right: 20px;
// }
.ti-modal-content-alert{
width: 35%; /* ความกว้างที่คุณต้องการ */
position: absolute; /* ทำให้สามารถจัดตำแหน่งได้ */
top: 50%; /* ให้อยู่กลางในแนวตั้ง */
left: 50%; /* ให้อยู่กลางในแนวนอน */
transform: translate(-50%, -50%); /* เคลื่อนที่ modal กลับมาให้ตรงกลาง */
background-color: #ffffff;
}
// .header-title-type{
// width: 100%;
// height: 50px;
// margin-top: 10px;
// margin-bottom: 10px;
// }
.header-title-type {
width: 100%;
min-height: 50px; /* ใช้ min-height เพื่อให้มีความยืดหยุ่น */
// margin-top: 50px;
// margin-bottom: 10px;
justify-content: space-between; /* จัดเรียงองค์ประกอบภายใน */
align-items: center; /* จัดกลางแนวตั้ง */
padding-top: 50px;
padding-bottom: 1rem;
}
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-topics/assessment-topics.component.ts
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core';
import { ToastrService } from 'ngx-toastr'; import { ToastrService } from 'ngx-toastr';
import { PmstopicModel, MyPmstopicModel } from 'src/app/shared/model/pmstopic.model';
import { MyPmstypeModel, PmstypeModel } from 'src/app/shared/model/pmstype.model';
import { FileService } from 'src/app/shared/services/file.service';
import { PmstopicService } from 'src/app/shared/services/pmstopic.service';
import { PmstypeService } from 'src/app/shared/services/pmstype.service';
interface table {
currentPage: number,
page: number[],
search: string
}
@Component({ @Component({
selector: 'app-assessment-topics', selector: 'app-assessment-topics',
templateUrl: './assessment-topics.component.html', templateUrl: './assessment-topics.component.html',
styleUrls: ['./assessment-topics.component.scss'] styleUrls: ['./assessment-topics.component.scss']
}) })
export class AssessmentTopicsComponent { export class AssessmentTopicsComponent {
@Input() pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'การจัดการประเมิน', 'กำหนดผู้ประเมิน']; currentPage = 1
@Output() sendPathTitle: EventEmitter<string[]> = new EventEmitter<string[]>(); page = Array.from({ length: 1 }, (_, i) => i + 1);
activeTab: string = 'tab1'; // กำหนด tab เริ่มต้น search = ""
numDataListChecked = 0
isDataListChecked = false
// ฟังก์ชันในการเปลี่ยนแท็บ isDataListCheckedAll = false
changeTab(tab: { id: string, text: string }) { pmstopic: { loading: boolean, select: PmstopicModel, dataList: { check: boolean, data: PmstopicModel }[] } = { loading: false, select: new MyPmstopicModel(), dataList: [] }
this.sendPathTitle.emit(['การประเมินจัดการประสิทธิภาพ', 'การจัดการประเมิน', tab.text]); pmstype: { loading: boolean, select: PmstypeModel, dataList: { check: boolean, data: PmstypeModel }[] } = { loading: false, select: new MyPmstypeModel(), dataList: [] }
this.activeTab = tab.id; modal: table = {
currentPage: 1,
page: Array.from({ length: 1 }, (_, i) => i + 1),
search: ""
} }
modalStatus: "add" | "edit" | 'delete' | 'deleteGroup' = "add"
// การจัดการการเปิดปิด modal
modalOptions: { selectedFile: File | null = null;
[nameModal: string]: { selectedFileName: string = 'กรุณาเลือกไฟล์';
isModalOpen: boolean; constructor(private cdr: ChangeDetectorRef,
modalSize: string; private pmstopicService: PmstopicService,
backdropClose: boolean; private toastr: ToastrService,
}; private fileService: FileService,
} = { private pmstypeService: PmstypeService
"add": { ) {
isModalOpen: false,
modalSize: 'm',
backdropClose: true,
},
"edit": {
isModalOpen: false,
modalSize: 'm',
backdropClose: true,
}
};
openModal(name: string, size: string, closeOnBackdrop?: boolean) {
this.modalOptions[name].modalSize = size;
this.modalOptions[name].backdropClose = closeOnBackdrop || false;
this.modalOptions[name].isModalOpen = true;
this.currentModal = name; // ตั้งค่าค่าของ currentModal เป็น 'add' หรือ 'edit'
document.body.style.overflow = 'hidden';
} }
closeModal(name: string) { ngOnInit(): void {
this.modalOptions[name].isModalOpen = false; this.getPmstopicList()
if (!this.isAnyModalOpen()) { this.getPmstypeList()
document.body.style.overflow = ''; // คืนค่าการ Scroll เฉพาะเมื่อ Modal ทั้งหมดปิดแล้ว }
getPmstypeList() {
this.pmstype.loading = true
this.pmstypeService.getList().subscribe({
next: response => {
this.pmstype.dataList = response.map(x => ({ check: false, data: new MyPmstypeModel(x) }))
this.isDataListCheckedAll = false
this.dataListCheckAll()
this.pmstype.loading = false
this.searchChange()
this.cdr.detectChanges()
}, error: error => {
this.pmstype.loading = false
this.cdr.detectChanges()
}
})
}
pmstypeListFilter() {
return this.pmstype.dataList.filter(x => {
const data = x.data
const match = data.pmsTypeId.toLowerCase().includes(this.modal.search.toLowerCase()) ||
data.tdesc.toLowerCase().includes(this.modal.search.toLowerCase()) ||
data.shortName.toLowerCase().includes(this.modal.search.toLowerCase())
return match
})
}
selectPmstype(data?: PmstypeModel) {
this.pmstopic.select.pmsType = new MyPmstypeModel(data)
}
getPmstopicList() {
this.pmstopic.loading = true
this.pmstopicService.getList().subscribe({
next: response => {
this.pmstopic.dataList = response.map(x => ({ check: false, data: new MyPmstopicModel(x) }))
this.isDataListCheckedAll = false
this.dataListCheckAll()
this.pmstopic.loading = false
this.searchChange()
this.cdr.detectChanges()
}, error: error => {
this.pmstopic.loading = false
this.cdr.detectChanges()
}
})
}
pmstopicListFilter() {
return this.pmstopic.dataList.filter(x => {
const data = x.data
const match = data.pmsTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
data.tdesc.toLowerCase().includes(this.search.toLowerCase())
return match
})
}
selectPmstopic(data?: PmstopicModel) {
this.pmstopic.select = new MyPmstopicModel(data)
}
updatePmstopic(typeApi: 'post' | 'delete') {
let body: PmstopicModel | PmstopicModel[]
switch (this.modalStatus) {
case ('delete'): {
body = [new MyPmstopicModel(this.pmstopic.select)]
break;
}
case ('deleteGroup'): {
body = this.pmstopic.dataList.filter(x => x.check).map(x => new MyPmstopicModel(x.data))
break;
}
default: {
body = new MyPmstopicModel(this.pmstopic.select)
}
}
this.pmstopic.loading = true
this.pmstopicService[typeApi]((body as any)).subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmstopicList()
this.searchChange()
} else {
this.showAlert(response.message, 'error')
this.pmstopic.loading = false
}
this.cdr.detectChanges()
}, error: error => {
this.showAlert(error.message, 'error')
this.pmstopic.loading = false
this.cdr.detectChanges()
} }
})
} }
isAnyModalOpen(): boolean { showAlert(text: string, type: 'success' | 'error') {
return Object.values(this.modalOptions).some(modal => modal.isModalOpen); // ตรวจสอบว่า modal อื่นยังเปิดอยู่หรือไม่ this.toastr[type](text, 'แจ้งเตือน', {
timeOut: 3000,
positionClass: 'toast-top-right',
})
} }
// ฟังก์ชัน toggle checkbox
isChecked: boolean = false; // ใช้สำหรับตรวจสอบสถานะของ checkbox
toggleCheckbox() { onFileSelected(event: any) {
this.isChecked = !this.isChecked; // สลับสถานะ this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
} }
// ฟังก์ชันสำหรับการเพิ่ม ลบ หรือแก้ไข ข้อมูล uploadFile() {
addUser() { if (!this.selectedFile) {
console.log('เพิ่มผู้ใช้งาน'); alert('กรุณาเลือกไฟล์ก่อนอัปโหลด')
return
} }
const formData = new FormData();
deleteUser() { formData.append('file', this.selectedFile);
console.log('ลบผู้ใช้งาน'); this.pmstopic.loading = true
this.fileService.uploadExcel(formData, '').subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmstopicList()
} else {
this.showAlert(response.message, 'error')
this.pmstopic.loading = false
this.cdr.detectChanges()
}
}, error: error => {
this.showAlert(error.message, 'error')
this.pmstopic.loading = false
this.cdr.detectChanges()
}
})
} }
editUser() { downloadFile() {
console.log('แก้ไขผู้ใช้งาน'); const fileName = '.xlsx'
this.fileService.downloadTemplate(fileName).subscribe({
next: response => {
const url = window.URL.createObjectURL(response);
const a = document.createElement("a");
a.href = url;
a.download = fileName;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
window.URL.revokeObjectURL(url);
}, error: error => {
this.showAlert(error.message, 'error')
} }
})
currentModal = ""; }
constructor(private toastr: ToastrService) { }
showSuccess() { dataListCheckAll() {
this.toastr.success('บันทึกข้อมูลสำเร็จ', 'เเจ้งเตือน', { const selectAll = this.isDataListCheckedAll;
timeOut: 3000, this.pmstopic.dataList.filter(x => {
positionClass: 'toast-top-right', const data = x.data
}); const match = data.pmsTopicId.toLowerCase().includes(this.search.toLowerCase()) ||
data.tdesc.toLowerCase().includes(this.search.toLowerCase())
return match
}).forEach(x => x.check = selectAll);
this.dataListCheck();
} }
showSuccessEdit() { dataListCheck() {
this.toastr.success('เเก้ไขข้อมูลสำเร็จ', 'เเจ้งเตือน', { const dataCheck = this.pmstopicListFilter();
timeOut: 3000, this.isDataListCheckedAll = dataCheck.length ? dataCheck.every(x => x.check) : false;
positionClass: 'toast-top-right', this.numDataListChecked = this.pmstopic.dataList.filter(x => x.check).length;
}); this.isDataListChecked = Boolean(this.numDataListChecked)
} }
clearPmstopic(modalStatus: string) {
showSuccessDelete() { if (modalStatus == 'add') {
this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', { this.selectPmstopic()
timeOut: 3000, } else if (modalStatus == 'edit') {
positionClass: 'toast-top-right', this.selectPmstopic(new MyPmstopicModel({ pmsTopicId: this.pmstopic.select.pmsTopicId }))
}); }
}
searchChange() {
this.currentPage = 1
this.page = Array.from({ length: Math.ceil(this.pmstopicListFilter().length / 10) }, (_, i) => i + 1);
this.dataListCheck()
} }
modalSearchChange(dataList: any) {
this.modal.currentPage = 1
this.modal.page = Array.from({ length: Math.ceil(dataList.length / 10) }, (_, i) => i + 1);
}
} }
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.html
<div class="w-full min-height-50px mb-10px justify-between items-center"> <div class="w-full min-height-50px mb-10px justify-between items-center">
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex pr-2">
<div class="flex"> <div class="flex">
<!-- <div class="flex items-center"> <div class="flex items-center">
<input type="checkbox" class="ti-form-checkbox pointer-events-none" id="hs-default-checkbox" <input type="checkbox" class="ti-form-checkbox pointer-events-none" id="hs-default-checkbox"
[(ngModel)]="isDataListChecked"> [(ngModel)]="isDataListChecked">
<label for="hs-default-checkbox" class="text-sm text-gray-500 mx-2 pointer-events-none"> <label for="hs-default-checkbox" class="text-sm text-gray-500 mx-2 pointer-events-none">
...@@ -15,15 +14,15 @@ ...@@ -15,15 +14,15 @@
[ngClass]="{'ri-checkbox-multiple-line text-gray-500': !isDataListCheckedAll, 'ri-checkbox-multiple-fill text-primary': isDataListCheckedAll}"></i> [ngClass]="{'ri-checkbox-multiple-line text-gray-500': !isDataListCheckedAll, 'ri-checkbox-multiple-fill text-primary': isDataListCheckedAll}"></i>
</button> </button>
<label class="text-sm text-gray-500 ml-2">Select All</label> <label class="text-sm text-gray-500 ml-2">Select All</label>
</div> -->
</div> </div>
</div> </div>
<div class="flex justify-end"> <div class="flex justify-end">
<div class="px-1"> <div class="px-1">
<div class="relative shadow-md"> <div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon" <input type="text" id="hs-leading-icon" name="hs-leading-icon"
class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name" class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name"
[(ngModel)]="search" (ngModelChange)="searchChange()"> [(ngModel)]="search" (ngModelChange)="searchChange()" style="height: 40px;">
<div <div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4"> class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
<i class="ri-search-line text-gray"></i> <i class="ri-search-line text-gray"></i>
...@@ -31,21 +30,30 @@ ...@@ -31,21 +30,30 @@
</div> </div>
</div> </div>
<!-- <div class="px-1"> <!-- <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-secondary h-45px m-0 shadow-md" <button type="button"
(click)="modalStatus='add';dataListSelect()" data-hs-overlay="#assessment-types-modal"> class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-10 m-0 shadow-md"
data-hs-overlay="#assessment-typead-upload-modal"
(click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
<i class="ti ti-file-plus"></i>
import
</button>
</div> -->
<div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-secondary h-10 m-0 shadow-md"
data-hs-overlay="#assessment-types-modal" (click)="modalStatus='add';selectPmstype()">
<i class="ri-add-line"></i> <i class="ri-add-line"></i>
Add Add
</button> </button>
</div> </div>
<div class="px-1"> <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-45px m-0 shadow-md" <button href="javascript:void(0);" class="ti-btn ti-btn-soft-danger h-10 m-0 shadow-md"
data-hs-overlay="#assessment-types-delete-modal"> data-hs-overlay="#assessment-types-alert-modal" (click)="modalStatus='deleteGroup';selectPmstype()">
<i class="ti ti-trash fs-l"></i> <i class="ri-delete-bin-6-line"></i>
Delete Delete
</button> </button>
</div> --> </div>
<div class="px-1"> <div class="px-1">
<button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md"> <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> <i class="ti ti-book fs-l"></i>
Help Help
</button> </button>
...@@ -55,14 +63,13 @@ ...@@ -55,14 +63,13 @@
</div> </div>
<div class="page px-rem"> <div class="page px-rem">
<div class="overflow-auto rounded-top-0.65rem"> <div class="overflow-auto shadow-md rounded-t-md">
<table class="ti-custom-table ti-custom-table-head ti-custom-table-hover"> <table class="ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered">
<thead class="height-50px"> <thead>
<tr class="font-size-12px"> <tr>
<ng-container <ng-container
*ngFor="let item of ['รหัส','ชื่อปะเภท','ชื่อย่อ','Action']; let f = first; let l = last"> *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" <th scope="col" class="relative px-10px py-10px bg-soft-secondary text-primary !text-center">
[class.!text-center]="f||l">
<span class="font-size-12px font-weight-700">{{ item }}</span> <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="!l">
<i class="ti ti-dots-vertical fs-l"></i> <i class="ti ti-dots-vertical fs-l"></i>
...@@ -71,30 +78,40 @@ ...@@ -71,30 +78,40 @@
</ng-container> </ng-container>
</tr> </tr>
</thead> </thead>
<tbody *ngIf="!dataListFilter().length"> <tbody *ngIf="pmstype.loading">
<tr>
<td class="text-center" colspan="100%">
<div *ngFor="let item of [1,2,3]" class="ti-spinner w-8 h-8 text-secondary mx-1" role="status"
aria-label="loading">
<span class="sr-only">Loading...</span>
</div>
</td>
</tr>
</tbody>
<tbody *ngIf="!pmstype.loading&&!pmstypeListFilter().length">
<tr> <tr>
<td class="text-center" colspan="100%"> <td class="text-center" colspan="100%">
ไม่พบข้อมูล ไม่พบข้อมูล
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody *ngIf="dataListFilter().length"> <tbody *ngIf="!pmstype.loading&&pmstypeListFilter().length">
<tr <tr
*ngFor="let item of dataListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index"> *ngFor="let item of pmstypeListFilter()| slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index">
<!-- <td class="flex justify-around"> <td class="text-center">
<input type="checkbox" class="ti-form-checkbox cursor-pointer" [(ngModel)]="item.check" <input type="checkbox" class="ti-form-checkbox cursor-pointer"
(ngModelChange)="dataListCheck()"> id="checkbox-{{item.data.pmsTypeId}}" [(ngModel)]="item.check" (change)="dataListCheck()">
<label>{{item.code}}</label> <label for="checkbox-{{item.data.pmsTypeId}}">&nbsp;{{item.data.pmsTypeId}}</label>
</td> --> </td>
<td class="text-center">{{item.code}}</td> <td>{{item.data.tdesc}}</td>
<td>{{item.nameTypeTh}} ({{item.nameTypeEn}})</td> <td class="text-center">{{item.data.shortName}}</td>
<td>{{item.name}}</td> <td class="flex justify-center">
<td class="flex justify-center items-center">
<i class="ti ti-edit cursor-pointer i-gray fs-l px-1" <i class="ti ti-edit cursor-pointer i-gray fs-l px-1"
(click)="modalStatus='edit';dataListSelect(item)" (click)="modalStatus='edit';selectPmstype(item.data)"
data-hs-overlay="#assessment-types-modal"></i> data-hs-overlay="#assessment-types-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="#assessment-types-delete-modal"></i> --> (click)="modalStatus='delete';selectPmstype(item.data)"
data-hs-overlay="#assessment-types-alert-modal"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -131,6 +148,11 @@ ...@@ -131,6 +148,11 @@
</a> </a>
</li> </li>
</ul> </ul>
<ul class="nav-tabs mt-3">
<span>Show {{((currentPage-1) * 10)+1}} to {{pmstypeListFilter().length<10 ?pmstypeListFilter().length:
(currentPage==page.length ? ((currentPage * 10) - ((currentPage * 10) - pmstypeListFilter().length)
) :(currentPage * 10) ) }} of {{pmstypeListFilter().length}} items</span>
</ul>
</nav> </nav>
</div> </div>
...@@ -153,7 +175,8 @@ ...@@ -153,7 +175,8 @@
<div class="w-full flex justify-end"> <div class="w-full flex justify-end">
<div class="absolute flex"> <div class="absolute flex">
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"> <button type="button" class="ti-btn ti-btn-soft-indigo h-45px m-0 shadow-md"
(click)="clearPmstype(modalStatus)">
<svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00" <svg class="svg-indigo" width="16" height="16" viewBox="0 0 64.00 64.00"
xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)"> transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
...@@ -178,34 +201,38 @@ ...@@ -178,34 +201,38 @@
</div> </div>
</div> </div>
<div class="ti-modal-body padding-16px pt-0 overflow-y-0"> <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-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"
[ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'" [ngClass]="{'bg-input-readonly':modalStatus=='edit'}" [readonly]="modalStatus=='edit'"
[(ngModel)]="dataSelect.code"> [(ngModel)]="pmstype.select.pmsTypeId">
<label for="detail_th" class="ti-form-label mt-2rem">ชื่อประเภท (ไทย) *</label> <label for="detail_th" class="ti-form-label mt-1rem">ชื่อประเภท (ไทย)*</label>
<input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="dataSelect.nameTypeTh"> <input type="text" id="detail_th" class="ti-form-input w-2/3" [(ngModel)]="pmstype.select.tdesc">
<label for="detail_eng" class="ti-form-label mt-2rem">ชื่อประเภท (อังกฤษ)</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อประเภท (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="dataSelect.nameTypeEn"> <input type="text" id="detail_eng" class="ti-form-input w-2/3" [(ngModel)]="pmstype.select.edesc">
<label for="input-label" class="ti-form-label mt-2rem">ชื่อย่อ</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อย่อ</label>
<input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="dataSelect.name"> <input type="text" id="detail_eng" class="ti-form-input w-2/3" [(ngModel)]="pmstype.select.shortName">
<label for="input-label" class="ti-form-label mt-2rem">น้ำหนัก</label> <label for="detail_eng" class="ti-form-label mt-1rem">น้ำหนัก</label>
<input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="dataSelect.weight"> <input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;"
oninput="this.value = this.value.replace(/\D/g, '')" [(ngModel)]="pmstype.select.weight">
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <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" 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"
data-hs-overlay="#assessment-types-modal"> data-hs-overlay="#assessment-types-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <button type="button" class="ti-btn ti-btn-success" data-hs-overlay="#assessment-topics-alert-modal"
data-hs-overlay="#assessment-types-alert-modal"> data-hs-overlay="#assessment-types-alert-modal"
[class.ti-btn-disabled]="!pmstype.select.pmsTypeId||!pmstype.select.tdesc"
[disabled]="!pmstype.select.pmsTypeId||!pmstype.select.tdesc">
บันทึกข้อมูล บันทึกข้อมูล
</a> </button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="assessment-types-alert-modal" class="hs-overlay hidden ti-modal"> <div id="assessment-types-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="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out h-[calc(100%-3.5rem)] flex items-center">
<div class="max-h-full overflow-hidden ti-modal-content w-full"> <div class="max-h-full overflow-hidden ti-modal-content w-full">
...@@ -214,63 +241,91 @@ ...@@ -214,63 +241,91 @@
แจ้งเตือน แจ้งเตือน
</h3> </h3>
<div class="flex justify-end"> <div class="flex justify-end">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-types-modal"> data-hs-overlay="#assessment-types-modal">
<span class="sr-only">Close</span> <span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i> <i class="ti ti-circle-x fs-xxl"></i>
</button> </button>
</ng-container>
<ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger"
data-hs-overlay="#assessment-types-alert-modal">
<span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i>
</button>
</ng-container>
</div> </div>
</div> </div>
<div class="ti-modal-body "> <div class="ti-modal-body ">
<p class="mt-1 text-gray-800 dark:text-white/70"> <p class="mt-1 text-gray-800 dark:text-white/70">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
ยืนยันการบันทึกข้อมูลหรือไม่ ยืนยันการบันทึกข้อมูลหรือไม่
</ng-container>
<ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
ยืนยันการลบข้อมูลหรือไม่
</ng-container>
</p> </p>
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<ng-container *ngIf="modalStatus=='add'||modalStatus=='edit'">
<button type="button" <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" 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"
data-hs-overlay="#assessment-types-modal"> data-hs-overlay="#assessment-types-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#assessment-types-alert-modal"> data-hs-overlay="#assessment-types-alert-modal" (click)="updatePmstype('post')">
บันทึกข้อมูล บันทึกข้อมูล
</a> </a>
</ng-container>
<ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
<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"
data-hs-overlay="#assessment-types-alert-modal">
ย้อนกลับ
</button>
<a class="ti-btn ti-btn-danger" href="javascript:void(0);"
data-hs-overlay="#assessment-types-alert-modal" (click)="updatePmstype('delete')">
ลบข้อมูล
</a>
</ng-container>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="assessment-typead-upload-modal" class="hs-overlay hidden ti-modal">
<div id="assessment-types-delete-modal" class="hs-overlay hidden ti-modal"> <div class="hs-overlay-open:mt-7 ti-modal-box mt-0 ease-out rounded-md">
<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-header bg-primary !rounded-none !rounded-t-sm">
<div class="max-h-full overflow-hidden ti-modal-content w-full"> <h5 class="text-xxl font-bold text-white">
<div class="ti-modal-header"> นำเข้าประเภทการประเมิน
<h3 class="text-xxl font-bold text-primary"> </h5>
แจ้งเตือน </div>
</h3> <div class="ti-modal-body max-h-full overflow-hidden ti-modal-content !rounded-t-none !rounded-b-sm">
<div class="flex justify-end"> <h1 class="mt-2" style="text-align: center;">ไฟล์</h1>
<button type="button" class="hs-dropdown-toggle ti-modal-clode-btn text-danger" <div class="mt-2 p-2">
data-hs-overlay="#assessment-types-delete-modal"> <div class="flex rounded-md">
<span class="sr-only">Close</span> <input #fileInput id="fileInput" type="file" (change)="onFileSelected($event)" hidden>
<i class="ti ti-circle-x fs-xxl"></i> <input type="text" [value]="selectedFileName" readonly (click)="fileInput.click()"
class="ti-form-input rounded-none ltr:rounded-l-md rtl:rounded-r-md focus:z-10 cursor-pointer">
<button type="button" (click)="fileInput.click()"
class="inline-flex flex-shrink-0 justify-center items-center h-[2.875rem] w-[2.875rem] ltr:rounded-r-md rtl:rounded-l-md border border-transparent font-semibold bg-secondary text-white hover:bg-secondary focus:z-10 focus:outline-none focus:ring-0 focus:ring-secondary transition-all text-sm">
<i class="ti ti-upload"></i>
</button> </button>
</div> </div>
<div class="flex justify-center mt-2rem ">
<h1 class="cursor-pointer justify-center -mb-px inline-flex items-center gap-2 font-weight-500 font-size-12px
text-center text-secondary border-secondary border-b-2 align-items-end" (click)="downloadFile()">
ดาวน์โหลดตัวอย่างไฟล์</h1>
</div> </div>
<div class="ti-modal-body "> <div class="flex justify-center mt-2rem mb-1rem space-x-4">
<p class="mt-1 text-gray-800 dark:text-white/70"> <button type="submit" class="ti-btn ti-btn-secondary"
ยืนยันการลบข้อมูลหรือไม่ data-hs-overlay="#assessment-typead-upload-modal" [class.ti-btn-disabled]="!selectedFile"
</p> (click)="uploadFile()" [disabled]="!selectedFile" [disabled]="!selectedFile">
<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"
data-hs-overlay="#assessment-types-delete-modal">
ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#assessment-types-delete-modal">
ลบข้อมูล
</a>
</div> </div>
</div> </div>
</div> </div>
......
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.scss
/* สไตล์ของแถบเมนู */
.nav-tabs {
display: flex;
border-bottom: 2px solid #ccc; /* เส้นใต้ */
border-top: 2px solid #ccc;
width: 100%;
cursor: pointer;
border-top: 2px solid #ccc;
}
.nav-item {
list-style: none;
margin-right: 40px; /* ช่องว่างระหว่างเมนู */
}
.nav-link {
text-decoration: none;
padding: 10px 20px;
display: inline-block;
font-size: medium;
text-align: left;
padding-left: 0px;
padding-right: 0px;
}
.nav-link:hover {
background-color: #f0f0f0; /* เปลี่ยนสีเมื่อ hover */
}
.nav-link.active {
color: #569bf5; /* สีตัวอักษรในสถานะ active */
font-size: medium;
border-bottom: 3.5px solid #569bf5; /* เส้นใต้ */
}
.tab-content {
margin-top: 20px;
}
.tab-pane.active {
display: block;
}
.body-content {
margin-left: 10px;
}
\ No newline at end of file
src/app/components/performance-management-evaluation/name-registration-perfomance/assessment-types/assessment-types.component.ts
import { ChangeDetectorRef, Component } from '@angular/core'; import { ChangeDetectorRef, Component } from '@angular/core';
export interface DataModel { import { ToastrService } from 'ngx-toastr';
check: boolean, import { MyPmstypeModel, PmstypeModel } from 'src/app/shared/model/pmstype.model';
code: string, import { FileService } from 'src/app/shared/services/file.service';
nameTypeTh: string, import { PmstypeService } from 'src/app/shared/services/pmstype.service';
nameTypeEn: string,
name: string
weight: string
}
@Component({ @Component({
selector: 'app-assessment-types', selector: 'app-assessment-types',
templateUrl: './assessment-types.component.html', templateUrl: './assessment-types.component.html',
...@@ -21,91 +15,175 @@ export class AssessmentTypesComponent { ...@@ -21,91 +15,175 @@ export class AssessmentTypesComponent {
numDataListChecked = 0 numDataListChecked = 0
isDataListChecked = false isDataListChecked = false
isDataListCheckedAll = false isDataListCheckedAll = false
dataList: DataModel[] = [ pmstype: { loading: boolean, select: PmstypeModel, dataList: { check: boolean, data: PmstypeModel }[] } = { loading: false, select: new MyPmstypeModel(), dataList: [] }
{ modalStatus: "add" | "edit" | 'delete' | 'deleteGroup' = "add"
check: false,
code: "01", selectedFile: File | null = null;
nameTypeTh: "การบริหารแบบแผนปัญญา", selectedFileName: string = 'กรุณาเลือกไฟล์';
nameTypeEn: "Hoshin Kanri Management", constructor(private cdr: ChangeDetectorRef,
name: "Hoshin", private pmstypeService: PmstypeService,
weight: "1.2" private toastr: ToastrService,
}, private fileService: FileService
{ ) {
check: false, }
code: "02",
nameTypeTh: "ตัวชี้วัดความสำเร็จ", ngOnInit(): void {
nameTypeEn: "Key Performance Indicator", this.getPmstypeList()
name: "KPI",
weight: "1.2"
},
{
check: false,
code: "03",
nameTypeTh: "การบริหารทีมงานข้ามสายงาน",
nameTypeEn: "Cross Functional Management",
name: "Cross Functional",
weight: "1.2"
},
{
check: false,
code: "04",
nameTypeTh: "กิจกรรมพิเศษ",
nameTypeEn: "Special Activities",
name: "Special Activities",
weight: "1.2"
}
]
dataSelect: DataModel = {
check: false,
code: "",
nameTypeTh: "",
nameTypeEn: "",
name: "",
weight: ""
}
modalStatus: "add" | "edit" = "add"
constructor(private cdr: ChangeDetectorRef) {
} }
dataListSelect(data?: DataModel) { getPmstypeList() {
this.dataSelect = data || { this.pmstype.loading = true
check: false, this.pmstypeService.getList().subscribe({
code: "", next: response => {
nameTypeTh: "", this.pmstype.dataList = response.map(x => ({ check: false, data: new MyPmstypeModel(x) }))
nameTypeEn: "", this.isDataListCheckedAll = false
name: "", this.dataListCheckAll()
weight: "" this.pmstype.loading = false
this.searchChange()
this.cdr.detectChanges()
}, error: error => {
this.pmstype.loading = false
this.cdr.detectChanges()
}
})
}
pmstypeListFilter() {
return this.pmstype.dataList.filter(x => {
const data = x.data
const match = data.pmsTypeId.toLowerCase().includes(this.search.toLowerCase()) ||
data.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
data.shortName.toLowerCase().includes(this.search.toLowerCase())
return match
})
} }
selectPmstype(data?: PmstypeModel) {
this.pmstype.select = new MyPmstypeModel(data)
}
updatePmstype(typeApi: 'post' | 'delete') {
let body: PmstypeModel | PmstypeModel[]
switch (this.modalStatus) {
case ('delete'): {
body = [new MyPmstypeModel(this.pmstype.select)]
break;
}
case ('deleteGroup'): {
body = this.pmstype.dataList.filter(x => x.check).map(x => new MyPmstypeModel(x.data))
break;
}
default: {
body = new MyPmstypeModel(this.pmstype.select)
}
}
this.pmstype.loading = true
this.pmstypeService[typeApi]((body as any)).subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmstypeList()
this.searchChange()
} else {
this.showAlert(response.message, 'error')
this.pmstype.loading = false
}
this.cdr.detectChanges()
}, error: error => {
this.showAlert(error.message, 'error')
this.pmstype.loading = false
this.cdr.detectChanges() this.cdr.detectChanges()
} }
})
}
dataListFilter() { showAlert(text: string, type: 'success' | 'error') {
return this.dataList.filter(x => { this.toastr[type](text, 'แจ้งเตือน', {
const match = x.code.includes(this.search) || x.nameTypeTh.includes(this.search) || x.nameTypeEn.includes(this.search); timeOut: 3000,
if (!match) x.check = false; positionClass: 'toast-top-right',
return match; })
});
} }
dataListCheck() {
const dataCheck = this.dataListFilter(); onFileSelected(event: any) {
this.isDataListChecked = dataCheck.some(x => x.check); this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
this.isDataListCheckedAll = dataCheck.length ? dataCheck.every(x => x.check) : false; this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
this.numDataListChecked = dataCheck.filter(x => x.check).length; }
uploadFile() {
if (!this.selectedFile) {
alert('กรุณาเลือกไฟล์ก่อนอัปโหลด')
return
}
const formData = new FormData();
formData.append('file', this.selectedFile);
this.pmstype.loading = true
this.fileService.uploadExcel(formData, '').subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getPmstypeList()
} else {
this.showAlert(response.message, 'error')
this.pmstype.loading = false
this.cdr.detectChanges()
}
}, error: error => {
this.showAlert(error.message, 'error')
this.pmstype.loading = false
this.cdr.detectChanges()
}
})
}
downloadFile() {
const fileName = '.xlsx'
this.fileService.downloadTemplate(fileName).subscribe({
next: response => {
const url = window.URL.createObjectURL(response);
const a = document.createElement("a");
a.href = url;
a.download = fileName;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
window.URL.revokeObjectURL(url);
}, error: error => {
this.showAlert(error.message, 'error')
} }
})
}
dataListCheckAll() { dataListCheckAll() {
const selectAll = this.isDataListCheckedAll; const selectAll = this.isDataListCheckedAll;
this.dataList.forEach(x => x.check = selectAll); this.pmstype.dataList.filter(x => {
const data = x.data
const match = data.pmsTypeId.toLowerCase().includes(this.search.toLowerCase()) ||
data.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
data.shortName.toLowerCase().includes(this.search.toLowerCase())
return match
}).forEach(x => x.check = selectAll);
this.dataListCheck(); this.dataListCheck();
} }
dataListCheck() {
const dataCheck = this.pmstypeListFilter();
this.isDataListCheckedAll = dataCheck.length ? dataCheck.every(x => x.check) : false;
this.numDataListChecked = this.pmstype.dataList.filter(x => x.check).length;
this.isDataListChecked = Boolean(this.numDataListChecked)
}
clearPmstype(modalStatus: string) {
if (modalStatus == 'add') {
this.selectPmstype()
} else if (modalStatus == 'edit') {
this.selectPmstype(new MyPmstypeModel({ pmsTypeId: this.pmstype.select.pmsTypeId }))
}
}
searchChange() { searchChange() {
this.currentPage = 1; this.currentPage = 1
const filteredData = this.dataListFilter(); this.page = Array.from({ length: Math.ceil(this.pmstypeListFilter().length / 10) }, (_, i) => i + 1);
this.page = Array.from({ length: Math.ceil(filteredData.length / 10) }, (_, i) => i + 1); this.dataListCheck()
this.dataListCheck();
} }
} }
src/app/components/performance-management-evaluation/name-registration-perfomance/name-registration-perfomance.component.html
...@@ -11,22 +11,23 @@ ...@@ -11,22 +11,23 @@
<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 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 hover:text-secondary active" <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 inline-flex items-center gap-2 border-b-[3px] border-transparent whitespace-nowrap text-gray-500 hover:text-secondary active"
href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1" href="javascript:void(0);" id="underline-item-1" data-hs-tab="#underline-1"
aria-controls="underline-1" aria-controls="underline-1"
(click)="pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ','ประเภทการประเมิน']"> (click)="currentPath=1;pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ','ประเภทการประเมิน']">
ประเภทการประเมิน ประเภทการประเมิน
</a> </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" href="javascript:void(0);" id="underline-item-2" data-hs-tab="#underline-2"
aria-controls="underline-2" aria-controls="underline-2"
(click)="pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ','หัวข้อการประเมิน']"> (click)="currentPath=2;pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ','หัวข้อการประเมิน']">
หัวข้อการประเมิน หัวข้อการประเมิน
</a> </a>
</nav> </nav>
</div> </div>
<div class="px-2rem pt-50px"> <div class="px-2rem pt-50px">
<div id="underline-1" role="tabpanel" aria-labelledby="underline-item-1"> <div *ngIf="currentPath==1" id="underline-1" role="tabpanel" aria-labelledby="underline-item-1">
<app-assessment-types></app-assessment-types> <app-assessment-types></app-assessment-types>
</div> </div>
<div id="underline-2" class="hidden" role="tabpanel" aria-labelledby="underline-item-2"> <div *ngIf="currentPath==2" id="underline-2" class="hidden" role="tabpanel"
aria-labelledby="underline-item-2">
<app-assessment-topics></app-assessment-topics> <app-assessment-topics></app-assessment-topics>
</div> </div>
</div> </div>
......
src/app/components/performance-management-evaluation/name-registration-perfomance/name-registration-perfomance.component.ts
...@@ -7,4 +7,5 @@ import { Component } from '@angular/core'; ...@@ -7,4 +7,5 @@ import { Component } from '@angular/core';
}) })
export class NameRegistrationPerfomanceComponent { export class NameRegistrationPerfomanceComponent {
pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ', 'ประเภทการประเมิน'] pathTitle = ['การประเมินจัดการประสิทธิภาพ', 'ทะเบียนกำหนดชื่อ', 'ประเภทการประเมิน']
currentPath = 1
} }
src/app/shared/model/pmstopic.model.ts 0 → 100644
import { MyPmstypeModel, PmstypeModel } from "./pmstype.model"
export interface PmstopicModel {
pmsTopicId: string
pmsType: PmstypeModel
companyId: string
lineNo: number
edesc: string
tdesc: string
indicatorsDetail: string
performanceGoalsDetail: string
weight: number
detailUnit: string
completionDate: string
targetAdetail: string
targetBdetail: string
targetCdetail: string
targetDdetail: string
targetFdetail: string
}
export class MyPmstopicModel implements PmstopicModel {
pmsTopicId: string
pmsType: PmstypeModel
companyId: string
lineNo: number
edesc: string
tdesc: string
indicatorsDetail: string
performanceGoalsDetail: string
weight: number
detailUnit: string
completionDate: string
targetAdetail: string
targetBdetail: string
targetCdetail: string
targetDdetail: string
targetFdetail: string
constructor(data?: Partial<PmstopicModel>) {
this.pmsTopicId = data?.pmsTopicId || ""
this.pmsType = new MyPmstypeModel(data?.pmsType)
this.companyId = data?.companyId || ""
this.lineNo = data?.lineNo ?? 0
this.edesc = data?.edesc || ""
this.tdesc = data?.tdesc || ""
this.indicatorsDetail = data?.indicatorsDetail || ""
this.performanceGoalsDetail = data?.performanceGoalsDetail || ""
this.weight = data?.weight ?? 0
this.detailUnit = data?.detailUnit || ""
this.completionDate = data?.completionDate || ""
this.targetAdetail = data?.targetAdetail || ""
this.targetBdetail = data?.targetBdetail || ""
this.targetCdetail = data?.targetCdetail || ""
this.targetDdetail = data?.targetDdetail || ""
this.targetFdetail = data?.targetFdetail || ""
}
}
src/app/shared/model/pmstype.model.ts 0 → 100644
export interface PmstypeModel {
pmsTypeId: string
companyId: string
edesc: string
tdesc: string
shortName: string
weight: number
}
export class MyPmstypeModel implements PmstypeModel {
pmsTypeId: string
companyId: string
edesc: string
tdesc: string
shortName: string
weight: number
constructor(data?: Partial<PmstypeModel>) {
this.pmsTypeId = data?.pmsTypeId || ""
this.companyId = data?.companyId || ""
this.edesc = data?.edesc || ""
this.tdesc = data?.tdesc || ""
this.shortName = data?.shortName || ""
this.weight = data?.weight ?? 0
}
}
src/app/shared/services/auth.service.ts
...@@ -14,10 +14,7 @@ export class AuthService { ...@@ -14,10 +14,7 @@ export class AuthService {
urlApi = environment.baseUrl + this.api urlApi = environment.baseUrl + this.api
constructor(private afu: AngularFireAuth, private router: Router, private http: HttpClient) { constructor( private router: Router, private http: HttpClient) {
this.afu.authState.subscribe((auth: any) => {
this.authState = auth;
});
} }
refreshToken(): Observable<{ accessToken: string; refreshToken: string }> { refreshToken(): Observable<{ accessToken: string; refreshToken: string }> {
...@@ -56,32 +53,6 @@ export class AuthService { ...@@ -56,32 +53,6 @@ export class AuthService {
} }
} }
registerWithEmail(email: string, password: string) {
return this.afu
.createUserWithEmailAndPassword(email, password)
.then((user: any) => {
this.authState = user;
})
.catch((_error: any) => {
console.log(_error);
throw _error;
});
}
loginWithEmail(email: string, password: string) {
return this.afu
.signInWithEmailAndPassword(email, password)
.then((user: any) => {
this.authState = user;
})
.catch((_error: any) => {
console.log(_error);
throw _error;
});
}
loginWithUserPass(username: string, password: string): Observable<{ accessToken: string ,refreshToken:string}> { loginWithUserPass(username: string, password: string): Observable<{ accessToken: string ,refreshToken:string}> {
const body = { const body = {
username: username, username: username,
...@@ -92,8 +63,5 @@ export class AuthService { ...@@ -92,8 +63,5 @@ export class AuthService {
logout(){ logout(){
sessionStorage.clear() sessionStorage.clear()
} }
singout(): void {
this.afu.signOut();
this.router.navigate(['/login']);
}
} }
src/app/shared/services/pmstopic.service.ts 0 → 100644
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { AlertModel } from '../model/alert.model';
import { PmstopicModel } from '../model/pmstopic.model';
@Injectable({
providedIn: 'root'
})
export class PmstopicService {
api = "/pmstopic"
urlApi = environment.baseUrl + this.api
constructor(private http: HttpClient) {
}
getById(pmsTopicId: string): Observable<PmstopicModel> {
return this.http.get<PmstopicModel>(this.urlApi + "/" + pmsTopicId)
}
getList(): Observable<PmstopicModel[]> {
return this.http.get<PmstopicModel[]>(this.urlApi + "/lists")
}
post(body: PmstopicModel): Observable<AlertModel> {
return this.http.post<AlertModel>(this.urlApi, body)
}
delete(body: PmstopicModel | PmstopicModel[]): Observable<AlertModel> {
const options = {
headers: new HttpHeaders({
"Content-Type": "application/json",
}),
body: body
};
return this.http.delete<AlertModel>(this.urlApi, options)
}
}
\ No newline at end of file
src/app/shared/services/pmstype.service.ts 0 → 100644
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { environment } from 'src/environments/environment';
import { AlertModel } from '../model/alert.model';
import { PmstypeModel } from '../model/pmstype.model';
@Injectable({
providedIn: 'root'
})
export class PmstypeService {
api = "/pmstype"
urlApi = environment.baseUrl + this.api
constructor(private http: HttpClient) {
}
getById(pmsTypeId: string): Observable<PmstypeModel> {
return this.http.get<PmstypeModel>(this.urlApi + "/" + pmsTypeId)
}
getList(): Observable<PmstypeModel[]> {
return this.http.get<PmstypeModel[]>(this.urlApi + "/lists")
}
post(body: PmstypeModel): Observable<AlertModel> {
return this.http.post<AlertModel>(this.urlApi, body)
}
delete(body: PmstypeModel | PmstypeModel[]): Observable<AlertModel> {
const options = {
headers: new HttpHeaders({
"Content-Type": "application/json",
}),
body: body
};
return this.http.delete<AlertModel>(this.urlApi, options)
}
}
\ No newline at end of file
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