Skip to content

M
mySkill-x
Commit 6041af56 by Nattana Chaiyamat
Options

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

parents 8a0f2a39 61d7f206
Showing with 302 additions and 204 deletions
src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.ts
...@@ -236,7 +236,7 @@ export class ImportDataComponent { ...@@ -236,7 +236,7 @@ export class ImportDataComponent {
const formData = new FormData(); const formData = new FormData();
formData.append('file', this.selectedFile); formData.append('file', this.selectedFile);
this.loading = true this.loading = true
this.fileService.uploadExcel(formData, 'MJOBCODE_COMPETENCY').subscribe({ this.fileService.uploadExcel(formData, 'MJOBCODE_GENERAL').subscribe({
next: response => { next: response => {
if (response.success) { if (response.success) {
this.showAlert(response.message, 'success') this.showAlert(response.message, 'success')
......
src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.html
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<div class="flex pr-2"> <div class="flex pr-2">
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md" <button type="button" class="ti-btn ti-btn-soft-secondary h-20px m-0 shadow-md"
data-hs-overlay="#company-registration-page-upload-modal"> data-hs-overlay="#supjob-upload-modal" (click)="fileInput.value = '';selectedFile=null;selectedFileName = 'กรุณาเลือกไฟล์'">
<i class="ri-add-line"></i> <i class="ri-add-line"></i>
นำเข้าข้อมูล นำเข้าข้อมูล
</button> </button>
<a class="mx-2 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" <a class="mx-2 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"
href="javascript:void(0);"> href="javascript:void(0);" (click)="downloadFile()">
ดาวน์โหลดตัวอย่างไฟล์ ดาวน์โหลดตัวอย่างไฟล์
</a> </a>
</div> </div>
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
<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 " class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 "
placeholder="Search by No. or Name" [(ngModel)]="search" placeholder="Search by No. or Name" [(ngModel)]="search" (ngModelChange)="searchChange()" >
(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">
...@@ -27,13 +26,13 @@ ...@@ -27,13 +26,13 @@
</div> </div>
</div> </div>
</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-45px m-0 shadow-md"
data-hs-overlay="#work-detail-alert-delete-modal"> data-hs-overlay="#sub-command-structure-alert-delete-modal">
<i class="ri-delete-bin-6-line"></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-45px m-0 shadow-md">
<i class="ti ti-book fs-l"></i> <i class="ti ti-book fs-l"></i>
...@@ -50,7 +49,7 @@ ...@@ -50,7 +49,7 @@
<thead> <thead>
<tr> <tr>
<ng-container <ng-container
*ngFor="let item of ['ลำดับ','รหัสงาน','ชื่อลักษณะงาน (ไทย) *','ชื่อลักษณะงาน (อังกฤษ)','การจัดการ']; 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 !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">
...@@ -60,24 +59,37 @@ ...@@ -60,24 +59,37 @@
</ng-container> </ng-container>
</tr> </tr>
</thead> </thead>
<tbody> <tbody *ngIf="loading">
<tr *ngFor="let item of[ <tr>
['01','001', 'Department Manager 1','Department Manager 1'], <td class="text-center" colspan="100%">
['02','002', 'Department Manager 2','Department Manager 2'], <div *ngFor="let item of [1,2,3]" class="ti-spinner w-8 h-8 text-secondary mx-1" role="status"
['03','003', 'Department 1-HRD','Department 1-HRD'], aria-label="loading">
['04','004', 'Department Manager 3','Department Manager 3'], <span class="sr-only">Loading...</span>
['05','005', 'Department Manager 4','Department Manager 4']];let i = index"> </div>
</td>
</tr>
</tbody>
<tbody *ngIf="!loading&&!jobcodeFilter().length">
<tr>
<td class="text-center" colspan="100%">
ไม่พบข้อมูล
</td>
</tr>
</tbody>
<tbody *ngIf="!loading&&jobcodeFilter().length">
<tr
*ngFor="let item of jobcodeFilter() |slice:((currentPage-1) * pageSize) : (((currentPage-1) * pageSize) + pageSize);let i = index">
<td class="text-center"> <td class="text-center">
{{i+1}} {{((currentPage-1) * pageSize)+(i+1)}}
</td> </td>
<td class="text-center">{{item[1]}}</td> <td class="text-center">{{item.jobcodeId}}</td>
<td>{{item[2]}}</td> <td>{{item.tdesc}}</td>
<td>{{item[3]}}</td> <td>{{item.edesc}}</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';edit(item)"
data-hs-overlay="#work-detail-modal-edit"></i> data-hs-overlay="#sub-job-competency-component-modal-edit"></i>
<i class="ti ti-trash cursor-pointer i-gray fs-l px-1" <i class="ti ti-trash cursor-pointer i-gray fs-l px-1" (click)="modalStatus='delete';edit(item)"
data-hs-overlay="#work-detail-alert-delete-modal"></i> data-hs-overlay="#company-registration-page-alert-modal"></i>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -93,8 +105,7 @@ ...@@ -93,8 +105,7 @@
</li> </li>
<li *ngFor="let item of page;let f = first;let l = last"> <li *ngFor="let item of page;let f = first;let l = last">
<ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3"> <ng-container *ngIf="item==3&&currentPage!=1&&currentPage!=2&&currentPage!=3">
<a aria-label="anchor" class="page-link" href="javascript:void(0);"><i <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
class="ri-more-line"></i>
</a> </a>
</ng-container> </ng-container>
<ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)"> <ng-container *ngIf="(f||l)||(item==currentPage-1||item==currentPage||item==currentPage+1)">
...@@ -104,8 +115,7 @@ ...@@ -104,8 +115,7 @@
</ng-container> </ng-container>
<ng-container <ng-container
*ngIf="item==page.length-2&&currentPage!=page.length&&currentPage!=page.length-1&&currentPage!=page.length-2"> *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 <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
class="ri-more-line"></i>
</a> </a>
</ng-container> </ng-container>
</li> </li>
...@@ -115,88 +125,35 @@ ...@@ -115,88 +125,35 @@
<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>
<li>
<select class="ti-form-select" [(ngModel)]="pageSize" (ngModelChange)="searchChange()">
<option [value]="10">10</option>
<option [value]="20">20</option>
<option [value]="50">50</option>
<option [value]="100">100</option>
</select>
</li>
</ul>
<ul class="nav-tabs mt-3">
<span>Show {{((currentPage-1) * pageSize)+1}} to {{(jobcodeFilter().length < pageSize) ?jobcodeFilter().length:
(currentPage==page.length ? ((currentPage * pageSize) - ((currentPage * pageSize) - jobcodeFilter().length) )
:(currentPage * pageSize) ) }} of {{jobcodeFilter().length}} items</span>
</ul> </ul>
</nav> </nav>
</div>
<div id="work-detail-modal-add" 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="max-h-full overflow-hidden ti-modal-content">
<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"
data-hs-overlay="#work-detail-modal-add">
<span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i>
</button>
</div>
</div>
<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 ">
<label for="input-label" class="ti-form-label mt-2rem">ฝ่าย</label>
<input type="text" id="input-label" class="ti-form-input w-1/2" [(ngModel)]="job.jobid">
<label for="detail_th" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (ไทย)</label>
<input type="text" id="detail_th" class="ti-form-input h-16" [(ngModel)]="job.tdesc">
<label for="detail_eng" class="ti-form-label mt-2rem">รายละเอียดฝ่าย (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input h-16" [(ngModel)]="job.edesc">
<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="#work-detail-modal-add">
ย้อนกลับ
</button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);"
data-hs-overlay="#work-detail-alert-add-modal">
บันทึกข้อมูล
</a>
</div>
</div>
</div>
</div>
</div> </div>
<div id="work-detail-modal-edit" class="hs-overlay hidden ti-modal">
<div id="sub-job-competency-component-modal-edit" 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">
แก้ไขข้อมูลรายละเอียดของงาน เเก้ไขข้อมูลความสามารถในตำเเหน่งงาน
</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="#work-detail-modal-edit"> data-hs-overlay="#sub-job-competency-component-modal-edit">
<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>
...@@ -205,13 +162,12 @@ ...@@ -205,13 +162,12 @@
<div class="ti-modal-center"> <div class="ti-modal-center">
<div class="flex justify-end" style="padding-right: 1rem;"> <div class="flex justify-end" style="padding-right: 1rem;">
<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)="clearValue()">
<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" xmlns="http://www.w3.org/2000/svg" fill="none" stroke="#595BEA" stroke-width="3.84"
stroke-width="3.84" transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)"> transform="rotate(45)matrix(-1, 0, 0, 1, 0, 0)">
<g id="SVGRepo_bgCarrier" stroke-width="0"></g> <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"> <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g>
</g>
<g id="SVGRepo_iconCarrier"> <g id="SVGRepo_iconCarrier">
<path d="M15 49A24 24 0 0 1 32 8"></path> <path d="M15 49A24 24 0 0 1 32 8"></path>
<path d="M49 15a24 24 0 0 1-17 41"></path> <path d="M49 15a24 24 0 0 1-17 41"></path>
...@@ -223,35 +179,31 @@ ...@@ -223,35 +179,31 @@
</button> </button>
</div> </div>
<div class="px-1"> <div class="px-1">
<button href="javascript:void(0);" <button href="javascript:void(0);" class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
class="ti-btn ti-btn-soft-warning h-45px m-0 shadow-md">
<i class="ti ti-book fs-l"></i> <i class="ti ti-book fs-l"></i>
Help Help
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div class="ti-modal-body mt-1"> <div class="ti-modal-body" style="padding-top: 0px;">
<label for="input-label" class="ti-form-label">รหัสงาน*</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 bg-input-readonly" readonly <input type="text" id="input-label" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.jobcodeId">
value="001"> <label for="detail_th" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (ไทย)</label>
<label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (ไทย)</label> <input type="text" id="detail_th" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.tdesc">
<input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อลักษณะงาน (อังกฤษ)</label>
value="Department Manager 1"> <input type="text" id="detail_eng" class="ti-form-input bg-input-readonly" readonly [(ngModel)]="selectJob.edesc">
<label for="input-label" class="ti-form-label mt-2rem">ชื่อลักษณะงาน (อังกฤษ)</label>
<input type="text" id="input-label" class="ti-form-input h-10 bg-input-readonly" readonly
value="Department Manager 1">
<div class="flex space-x-4 justify-center"> <div class="flex space-x-4 justify-center">
<!-- label และ textarea แรก --> <!-- label และ textarea แรก -->
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<label for="input-label" class="ti-form-label mt-2rem">ABC</label> <label for="input-label" class="ti-form-label mt-2rem">งานบริหาร (Management) </label>
<textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"></textarea> <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.serviceWorkText"></textarea>
</div> </div>
<!-- label และ input ที่สอง --> <!-- label และ input ที่สอง -->
<div class="flex flex-col w-1/2"> <div class="flex flex-col w-1/2">
<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-auto" value="10.0"> <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9.]/g, '');" onclick="value = value=='0'?'':value" [(ngModel)]="selectJob.serviceWorkPercent">
</div> </div>
</div> </div>
<div class="flex space-x-4 justify-center"> <div class="flex space-x-4 justify-center">
...@@ -259,26 +211,26 @@ ...@@ -259,26 +211,26 @@
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<label for="input-label" class="ti-form-label mt-2rem">งานที่รับผิดชอบ <label for="input-label" class="ti-form-label mt-2rem">งานที่รับผิดชอบ
(งานปฏิบัติ)</label> (งานปฏิบัติ)</label>
<textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"></textarea> <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.responsibleWorkText"></textarea>
</div> </div>
<!-- label และ input ที่สอง --> <!-- label และ input ที่สอง -->
<div class="flex flex-col w-1/2"> <div class="flex flex-col w-1/2">
<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-auto" value="10.0"> <input type="text" id="input-label" class="ti-form-input w-auto"oninput="value = value.replace(/[^0-9.]/g, '');" [(ngModel)]="selectJob.responsibleWorkPercent">
</div> </div>
</div> </div>
<div class="flex space-x-4 justify-center"> <div class="flex space-x-4 justify-center">
<!-- label และ textarea แรก --> <!-- label และ textarea แรก -->
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<label for="input-label" class="ti-form-label mt-2rem">งานที่ได้รับมอบหมายพิเศษ</label> <label for="input-label" class="ti-form-label mt-2rem">งานที่ได้รับมอบหมายพิเศษ</label>
<textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"></textarea> <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.specialWorkText"></textarea>
</div> </div>
<!-- label และ input ที่สอง --> <!-- label และ input ที่สอง -->
<div class="flex flex-col w-1/2"> <div class="flex flex-col w-1/2">
<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-auto" value="10.0"> <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.specialWorkPercent">
</div> </div>
</div> </div>
<div class="flex space-x-4 justify-center"> <div class="flex space-x-4 justify-center">
...@@ -286,45 +238,46 @@ ...@@ -286,45 +238,46 @@
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<label for="input-label" <label for="input-label"
class="ti-form-label mt-2rem">งานที่ทุกตำแหน่งต้องปฏิบัติ</label> class="ti-form-label mt-2rem">งานที่ทุกตำแหน่งต้องปฏิบัติ</label>
<textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"></textarea> <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.allPositionWorkText"></textarea>
</div> </div>
<!-- label และ input ที่สอง --> <!-- label และ input ที่สอง -->
<div class="flex flex-col w-1/2"> <div class="flex flex-col w-1/2">
<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-auto" value="10.0"> <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.allPositionWorkPercent">
</div> </div>
</div> </div>
<div class="flex space-x-4 justify-center"> <div class="flex space-x-4 justify-center">
<!-- label และ textarea แรก --> <!-- label และ textarea แรก -->
<div class="flex flex-col w-full"> <div class="flex flex-col w-full">
<label for="input-label" class="ti-form-label mt-2rem">อื่นๆ</label> <label for="input-label" class="ti-form-label mt-2rem">อื่นๆ</label>
<textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50"></textarea> <textarea id="input-label" class="ti-form-input w-80" rows="4" cols="50" [(ngModel)]="selectJob.otherWorkText"></textarea>
</div> </div>
<!-- label และ input ที่สอง --> <!-- label และ input ที่สอง -->
<div class="flex flex-col w-1/2"> <div class="flex flex-col w-1/2">
<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-auto" value="10.0"> <input type="text" id="input-label" class="ti-form-input w-auto" oninput="value = value.replace(/[^0-9]/g, '');" [(ngModel)]="selectJob.otherWorkPercent" >
</div> </div>
</div> </div>
<div class="flex justify-end mt-3rem mb-1rem space-x-4"> <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="#work-detail-modal-edit"> data-hs-overlay="#sub-job-competency-component-modal-edit">
ย้อนกลับ ย้อนกลับ
</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="#work-detail-alert-add-modal"> data-hs-overlay="#company-registration-page-alert-modal">
บันทึกข้อมูล บันทึกข้อมูล
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="work-detail-alert-add-modal" class="hs-overlay hidden ti-modal"> <div id="company-registration-page-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">
<div class="ti-modal-header"> <div class="ti-modal-header">
...@@ -333,7 +286,7 @@ ...@@ -333,7 +286,7 @@
</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="#work-detail-alert-add-modal"> data-hs-overlay="#company-registration-page-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>
...@@ -341,57 +294,73 @@ ...@@ -341,57 +294,73 @@
</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="#work-detail-modal-edit"> data-hs-overlay="#company-registration-page-alert-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="#work-detail-alert-add-modal" (click)="addBu1();showSuccessAdd()"> data-hs-overlay="#company-registration-page-alert-modal" (click)="save()">
บันทึกข้อมูล บันทึกข้อมูล
</a> </a>
</div> </ng-container>
</div> <ng-container *ngIf="modalStatus=='delete'||modalStatus=='deleteGroup'">
</div>
</div>
</div>
<div id="work-detail-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 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"
data-hs-overlay="#work-detail-alert-delete-modal">
<span class="sr-only">Close</span>
<i class="ti ti-circle-x fs-xxl"></i>
</button>
</div>
</div>
<div class="ti-modal-body ">
<p class="mt-1 text-gray-800 dark:text-white/70">
ยืนยันการลบข้อมูลหรือไม่!
</p>
<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="#work-detail-alert-delete-modal"> data-hs-overlay="#company-registration-page-alert-modal">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <a class="ti-btn ti-btn-danger" href="javascript:void(0);"
data-hs-overlay="#work-detail-alert-delete-modal" data-hs-overlay="#company-registration-page-alert-modal" (click)="deleteJob()">
(click)="addBu1();showSuccessDelete()">
ลบข้อมูล ลบข้อมูล
</a> </a>
</ng-container>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="supjob-upload-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="ti-modal-header bg-primary !rounded-none !rounded-t-sm">
<h5 class="text-xxl font-bold text-white">
นำเข้า Job Competency
</h5>
</div>
<div class="ti-modal-body max-h-full overflow-hidden ti-modal-content !rounded-t-none !rounded-b-sm">
<h1 class="mt-2" style="text-align: center;">ไฟล์</h1>
<div class="mt-2 p-2">
<div class="flex rounded-md">
<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>
</div>
<div class="flex justify-center mt-2rem mb-1rem space-x-4">
<button type="submit" class="ti-btn ti-btn-secondary"
data-hs-overlay="#section-registration-upload-modal" (click)="uploadFile()"
[class.ti-btn-disabled]="!selectedFile" [disabled]="!selectedFile">
อัปโหลด
</button>
</div> </div>
</div>
</div>
</div>
</div>
src/app/components/job-detail-components/job-detail/work-detail/work-detail.component.ts
import { Component } from '@angular/core'; import { ChangeDetectorRef, Component} from '@angular/core';
import { ToastrService } from 'ngx-toastr'; import { ToastrService } from 'ngx-toastr';
import { JobModel, MyJobModel } from 'src/app/shared/model/job.model'; import { JobCodeModel, MyJobCodeModel } from 'src/app/shared/model/job-code.model';
import { FileService } from 'src/app/shared/services/file.service';
import { JobCodeService } from 'src/app/shared/services/job-code.service';
@Component({ @Component({
selector: 'app-work-detail', selector: 'app-work-detail',
...@@ -10,62 +14,158 @@ import { JobModel, MyJobModel } from 'src/app/shared/model/job.model'; ...@@ -10,62 +14,158 @@ import { JobModel, MyJobModel } from 'src/app/shared/model/job.model';
export class WorkDetailComponent { export class WorkDetailComponent {
currentPage = 1 currentPage = 1
page = Array.from({ length: 1 }, (_, i) => i + 1); page = Array.from({ length: 1 }, (_, i) => i + 1);
jobList: JobModel[] = [] pageSize=10
job: JobModel = new MyJobModel({})
search = "" search = ""
jobCodeList:JobCodeModel[]=[]
loading = false
selectedFile: File | null = null;
selectedFileName: string = 'กรุณาเลือกไฟล์';
selectJob:JobCodeModel=new MyJobCodeModel({})
modalStatus=''
constructor( constructor(
private toastr: ToastrService private toastr: ToastrService,
private fileService: FileService,
private jobcodeService: JobCodeService,
private cdr: ChangeDetectorRef,
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
this.getListJob();
}
getListJob(){
this.loading = false
this.jobcodeService.getList().subscribe({
next: response => {
this.jobCodeList = response.map((x: any) => new MyJobCodeModel(x))
this.jobCodeList = this.jobCodeList.sort((a, b) => a.jobcodeId.localeCompare(b.jobcodeId))
this.loading = false
this.searchChange()
this.cdr.detectChanges()
}, error: error => {
this.loading = false
this.cdr.detectChanges()
}
})
} }
searchChange() { searchChange() {
this.currentPage = 1 this.currentPage = 1
this.page = Array.from({ length: Math.ceil(this.jobListFilter().length / 10) }, (_, i) => i + 1); this.page = Array.from({ length: Math.ceil(this.jobcodeFilter().length / this.pageSize) }, (_, i) => i + 1);
}
edit(item :JobCodeModel){
this.selectJob = new MyJobCodeModel({})
this.selectJob = new MyJobCodeModel(item)
} }
jobListFilter() { clearValue(){
return this.jobList.filter(x => x.jobid.includes(this.search) || this.selectJob.competencyWorkText = ''
x.tdesc.includes(this.search) || this.selectJob.serviceWorkText=''
x.edesc.includes(this.search)) this.selectJob.serviceWorkPercent = 0
this.selectJob.responsibleWorkText =''
this.selectJob.responsibleWorkPercent = 0
this.selectJob.specialWorkText =''
this.selectJob.specialWorkPercent = 0
this.selectJob.allPositionWorkText =''
this.selectJob.allPositionWorkPercent = 0
this.selectJob.otherWorkText=''
this.selectJob.otherWorkPercent = 0
} }
selectJob(job: JobModel) { toNumber(value: string | number): number {
// this.showSuccess() return typeof value === 'string' ? parseInt(value) : value;
this.job = new MyJobModel(job)
} }
save(){
this.selectJob.serviceWorkPercent = this.toNumber(this.selectJob.serviceWorkPercent)
this.selectJob.responsibleWorkPercent = this.toNumber(this.selectJob.responsibleWorkPercent)
this.selectJob.specialWorkPercent = this.toNumber(this.selectJob.specialWorkPercent)
this.selectJob.allPositionWorkPercent = this.toNumber(this.selectJob.allPositionWorkPercent)
this.selectJob.otherWorkPercent = this.toNumber(this.selectJob.otherWorkPercent)
showSuccessAdd() { this.jobcodeService.post(this.selectJob).subscribe((response:any) => {
this.toastr.success('บันทึกข้อมูลสำเร็จ', 'เเจ้งเตือน', { if (response.success) {
timeOut: 3000, this.showAlert(response.message, 'success')
positionClass: 'toast-top-right', this.selectJob = new MyJobCodeModel({})
}); this.getListJob();
} else {
this.showAlert(response.message, 'error')
}
this.cdr.detectChanges()
})
}
deleteJob(){
this.jobcodeService.delete(this.selectJob).subscribe((response:any) => {
if (response.success) {
this.showAlert(response.message, 'success')
this.selectJob = new MyJobCodeModel({})
this.getListJob();
} else {
this.showAlert(response.message, 'error')
}
this.cdr.detectChanges()
})
}
jobcodeFilter() {
return this.jobCodeList.filter(x =>
x.tdesc.toLowerCase().includes(this.search.toLowerCase()) ||
x.edesc.toLowerCase().includes(this.search.toLowerCase()) ||
x.jobcodeId.toLowerCase().includes(this.search.toLowerCase())
)
}
onFileSelected(event: any) {
this.selectedFile = event.target.files.length > 0 ? event.target.files[0] : null;
this.selectedFileName = this.selectedFile?.name || "กรุณาเลือกไฟล์"
} }
showSuccessEdit() { uploadFile() {
this.toastr.success('เเก้ไขข้อมูลสำเร็จ', 'เเจ้งเตือน', { if (!this.selectedFile) {
timeOut: 3000, alert('กรุณาเลือกไฟล์ก่อนอัปโหลด')
positionClass: 'toast-top-right', return
}); }
const formData = new FormData();
formData.append('file', this.selectedFile);
this.loading = true
this.fileService.uploadExcel(formData, 'MJOBCODE_COMPETENCY').subscribe({
next: response => {
if (response.success) {
this.showAlert(response.message, 'success')
this.getListJob();
} else {
this.showAlert(response.message, 'error')
this.loading = false
} }
}, error: error => {
this.showAlert(error.message, 'error')
this.loading = false
}
})
}
showSuccessDelete() { downloadFile() {
this.toastr.success('ลบข้อมูลสำเร็จ', 'เเจ้งเตือน', { const fileName = 'IMPORT_MJOBCODEV2.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')
}
})
}
showAlert(text: string, type: 'success' | 'error') {
this.toastr[type](text, 'แจ้งเตือน', {
timeOut: 3000, timeOut: 3000,
positionClass: 'toast-top-right', positionClass: 'toast-top-right',
}); })
}
addBu1() {
// this.bu1Service.post(this.bu1).subscribe((response:any) => {
// if (response.success) {
// this.getBu1List()
// }
// })
}
deleteJob(job: JobModel) {
// this.bu1Service.delete(new MyBu1Model(bu1)).subscribe((response:any) => {
// if (response.success) {
// this.getBu1List()
// }
// })
} }
} }
src/app/shared/model/job-code.model.ts
...@@ -34,6 +34,16 @@ export interface JobCodeModel { ...@@ -34,6 +34,16 @@ export interface JobCodeModel {
supervisor: string supervisor: string
competencyWorkText: string competencyWorkText: string
supervisorPosition:PositionModel supervisorPosition:PositionModel
serviceWorkText: string
serviceWorkPercent: number
responsibleWorkText: string
responsibleWorkPercent: number
specialWorkText: string
specialWorkPercent: number
allPositionWorkText: string
allPositionWorkPercent: number
otherWorkText: string
otherWorkPercent: number
} }
export class MyJobCodeModel implements JobCodeModel { export class MyJobCodeModel implements JobCodeModel {
...@@ -62,6 +72,16 @@ export class MyJobCodeModel implements JobCodeModel { ...@@ -62,6 +72,16 @@ export class MyJobCodeModel implements JobCodeModel {
supervisor: string supervisor: string
competencyWorkText: string competencyWorkText: string
supervisorPosition:PositionModel supervisorPosition:PositionModel
serviceWorkText: string
serviceWorkPercent: number
responsibleWorkText: string
responsibleWorkPercent: number
specialWorkText: string
specialWorkPercent: number
allPositionWorkText: string
allPositionWorkPercent: number
otherWorkText: string
otherWorkPercent: number
constructor(data: Partial<JobCodeModel>) { constructor(data: Partial<JobCodeModel>) {
this.jobcodeId = data.jobcodeId || "" this.jobcodeId = data.jobcodeId || ""
this.tdesc = data.tdesc || "" this.tdesc = data.tdesc || ""
...@@ -88,7 +108,16 @@ export class MyJobCodeModel implements JobCodeModel { ...@@ -88,7 +108,16 @@ export class MyJobCodeModel implements JobCodeModel {
this.supervisor = data.supervisor || "" this.supervisor = data.supervisor || ""
this.competencyWorkText = data.competencyWorkText || "" this.competencyWorkText = data.competencyWorkText || ""
this.supervisorPosition = new MyPositionModel(data.supervisorPosition || {}) this.supervisorPosition = new MyPositionModel(data.supervisorPosition || {})
this.serviceWorkText = data.serviceWorkText || ""
this.serviceWorkPercent = data.serviceWorkPercent ?? 0
this.responsibleWorkText = data.responsibleWorkText || ""
this.responsibleWorkPercent = data.responsibleWorkPercent ?? 0
this.specialWorkText = data.specialWorkText || ""
this.specialWorkPercent = data.specialWorkPercent ?? 0
this.allPositionWorkText = data.allPositionWorkText || ""
this.allPositionWorkPercent = data.allPositionWorkPercent ?? 0
this.otherWorkText = data.otherWorkText || ""
this.otherWorkPercent = data.otherWorkPercent ?? 0
} }
} }
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