Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mySkill-x
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
angular
mySkill-x
Commits
0214dcf8
Commit
0214dcf8
authored
Feb 20, 2025
by
Nakarin Luankla
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UPDATE การจัดการรายละเอียดงาน > ลักษณะงาน
parent
65385195
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
251 additions
and
120 deletions
+251
-120
import-data.component.html
...-detail-management/import-data/import-data.component.html
+1
-1
sub-job-qualifications.component.html
...-job-qualifications/sub-job-qualifications.component.html
+117
-72
sub-job-qualifications.component.ts
...ub-job-qualifications/sub-job-qualifications.component.ts
+121
-47
job-code.model.ts
src/app/shared/model/job-code.model.ts
+12
-0
No files found.
src/app/components/job-detail-components/job-detail-management/import-data/import-data.component.html
View file @
0214dcf8
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
data-hs-overlay=
"#sub-job-competency-component-modal-edit"
>
data-hs-overlay=
"#sub-job-competency-component-modal-edit"
>
ย้อนกลับ
ย้อนกลับ
</button>
</button>
<button
class=
"ti-btn ti-btn-success {{checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId
? 'ti-btn-disabled' : ''}}"
[
disabled
]="
checkJobCodeId
&&
modalStatus=
='add'||!selectJob.jobcodeId
"
<button
class=
"ti-btn ti-btn-success {{checkJobCodeId&&modalStatus=='add'||!selectJob.jobcodeId
||!selectJob.tdesc ? 'ti-btn-disabled' : ''}}"
[
disabled
]="
checkJobCodeId
&&
modalStatus=
='add'||!selectJob.jobcodeId||!selectJob.tdesc
"
data-hs-overlay=
"#company-registration-page-alert-modal"
>
data-hs-overlay=
"#company-registration-page-alert-modal"
>
บันทึกข้อมูล
บันทึกข้อมูล
</button>
</button>
...
...
src/app/components/job-detail-components/job-qualifications/sub-job-qualifications/sub-job-qualifications.component.html
View file @
0214dcf8
...
@@ -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,7 +18,7 @@
...
@@ -18,7 +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"
>
placeholder=
"Search by No. or Name"
[(
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"
>
...
@@ -26,13 +26,13 @@
...
@@ -26,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="#sub-command-structure-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>
...
@@ -43,7 +43,6 @@
...
@@ -43,7 +43,6 @@
</div>
</div>
</div>
</div>
<div
class=
"page px-rem"
>
<div
class=
"page px-rem"
>
<div
class=
"overflow-auto shadow-md rounded-t-md"
>
<div
class=
"overflow-auto shadow-md rounded-t-md"
>
<table
class=
"ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered"
>
<table
class=
"ti-custom-table ti-custom-table-head ti-custom-table-hover table-bordered"
>
...
@@ -60,26 +59,43 @@
...
@@ -60,26 +59,43 @@
</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
class=
"text-center"
>
{{item[0]}}
</td>
</td>
<td
class=
"text-center"
>
{{item[1]}}
</td>
</tr>
<td
>
{{item[2]}}
</td>
</tbody>
<td
>
{{item[3]}}
</td>
<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"
>
{{((currentPage-1) * pageSize)+(i+1)}}
</td>
<td
class=
"text-center"
>
{{item.jobcodeId}}
</td>
<td>
{{item.tdesc}}
</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"
data-hs-overlay=
"#sub-job-qualifications-component-modal-edit"
></i>
<i
class=
"ti ti-edit cursor-pointer i-gray fs-l px-1"
(
click
)="
modalStatus=
'edit'
;
edit
(
item
)"
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
data-hs-overlay=
"#sub-job-qualifications-component-alert-delete-modal"
></i>
data-hs-overlay=
"#sub-job-competency-component-modal-edit"
></i>
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
(
click
)="
modalStatus=
'delete'
;
edit
(
item
)"
data-hs-overlay=
"#company-registration-page-alert-modal"
></i>
</td>
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
</div>
</div>
<nav
class=
"pagination-style-3 overflow-auto my-5"
>
<nav
class=
"pagination-style-3 overflow-auto my-5"
*
ngIf=
"page.length"
>
<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);"
...
@@ -109,14 +125,27 @@
...
@@ -109,14 +125,27 @@
<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>
<div
id=
"sub-job-qualifications
-component-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"
>
...
@@ -124,7 +153,7 @@
...
@@ -124,7 +153,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=
"#sub-job-qualifications
-component-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>
...
@@ -133,7 +162,7 @@
...
@@ -133,7 +162,7 @@
<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"
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)"
>
...
@@ -159,46 +188,46 @@
...
@@ -159,46 +188,46 @@
</div>
</div>
<div
class=
"ti-modal-body"
style=
"padding-top: 0px;"
>
<div
class=
"ti-modal-body"
style=
"padding-top: 0px;"
>
<label
for=
"input-label"
class=
"ti-form-label mt-1rem"
>
รหัสงาน
</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
value=
"001
"
>
<input
type=
"text"
id=
"input-label"
class=
"ti-form-input bg-input-readonly"
readonly
[(
ngModel
)]="
selectJob
.
jobcodeId
"
>
<label
for=
"detail_th"
class=
"ti-form-label mt-1rem"
>
ชื่อลักษณะงาน (ไทย)
</label>
<label
for=
"detail_th"
class=
"ti-form-label mt-1rem"
>
ชื่อลักษณะงาน (ไทย)
</label>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input w-2/3 bg-input-readonly"
readonly
value=
"Department Manager1
"
>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input bg-input-readonly"
readonly
[(
ngModel
)]="
selectJob
.
tdesc
"
>
<label
for=
"detail_eng"
class=
"ti-form-label mt-1rem"
>
ชื่อลักษณะงาน (อังกฤษ)
</label>
<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=
"Department Manager1
"
>
<input
type=
"text"
id=
"detail_eng"
class=
"ti-form-input bg-input-readonly"
readonly
[(
ngModel
)]="
selectJob
.
edesc
"
>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
การศึกษา/ประสบการณ์ (Education/Experience)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
การศึกษา/ประสบการณ์ (Education/Experience)
</label>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold w-2/3"
rows=
"4"
cols=
"50
"
></textarea>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"4"
cols=
"50"
[(
ngModel
)]="
selectJob
.
educationExperienceText
"
></textarea>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
ใบประกาศนียบัตร (Certificate)/ใบประกอบวิชาชีพ (Licensed Professional)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
ใบประกาศนียบัตร (Certificate)/ใบประกอบวิชาชีพ (Licensed Professional)
</label>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"4"
cols=
"50
"
></textarea>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"4"
cols=
"50"
[(
ngModel
)]="
selectJob
.
cerLicensedText
"
></textarea>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
การฝึกอบรมที่จำเป็นต่อการปฏิบัติงาน (Especially Training Course)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
การฝึกอบรมที่จำเป็นต่อการปฏิบัติงาน (Especially Training Course)
</label>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"4"
cols=
"50
"
></textarea>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"4"
cols=
"50"
[(
ngModel
)]="
selectJob
.
especiallyTrainingText
"
></textarea>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
ความสามารถอื่นๆ (Other Abillities)
</label>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
ความสามารถอื่นๆ (Other Abillities)
</label>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"5"
cols=
"50
"
></textarea>
<textarea
type=
"text"
id=
"detail_eng"
class=
"ti-form-input font-bold"
rows=
"5"
cols=
"50"
[(
ngModel
)]="
selectJob
.
otherAbilitiesText
"
></textarea>
<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=
"#sub-job-
qualifications
-component-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=
"#
sub-job-qualifications-component-alert-edi
t-modal"
>
data-hs-overlay=
"#
company-registration-page-aler
t-modal"
>
บันทึกข้อมูล
บันทึกข้อมูล
</a>
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div
id=
"sub-job-qualifications-component-alert-edi
t-modal"
class=
"hs-overlay hidden ti-modal"
>
<div
id=
"company-registration-page-aler
t-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-aler
t w-full"
>
<div
class=
"max-h-full overflow-hidden ti-modal-conten
t 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"
>
<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=
"#sub-job-qualifications-component-alert-edi
t-modal"
>
data-hs-overlay=
"#company-registration-page-aler
t-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>
...
@@ -206,56 +235,72 @@
...
@@ -206,56 +235,72 @@
</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=
"#sub-job-qualifications-component-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=
"#sub-job-qualifications-component-alert-edit-modal"
(
click
)="
editBu1
();
showSuccessEdit
()"
>
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=
"sub-job-qualifications-component-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
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=
"#sub-job-qualifications-component-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=
"#sub-job-qualifications-component-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=
"#sub-job-qualifications-component-alert-delete-modal"
(
click
)="
editBu1
();
showSuccessDelete
()"
>
data-hs-overlay=
"#company-registration-page-alert-modal"
(
click
)="
deleteJob
()"
>
ลบข้อมูล
ลบข้อมูล
</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-qualifications/sub-job-qualifications/sub-job-qualifications.component.ts
View file @
0214dcf8
import
{
C
omponent
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
C
hangeDetectorRef
,
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
({
...
@@ -11,70 +13,142 @@ import { JobModel, MyJobModel } from 'src/app/shared/model/job.model';
...
@@ -11,70 +13,142 @@ import { JobModel, MyJobModel } from 'src/app/shared/model/job.model';
export
class
SubJobQualificationsComponent
{
export
class
SubJobQualificationsComponent
{
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
)
}
clearValue
(){
this
.
selectJob
.
educationExperienceText
=
''
this
.
selectJob
.
cerLicensedText
=
''
this
.
selectJob
.
especiallyTrainingText
=
''
this
.
selectJob
.
otherAbilitiesText
=
''
}
}
jobListFilter
()
{
save
(){
return
this
.
jobList
.
filter
(
x
=>
x
.
jobid
.
includes
(
this
.
search
)
||
this
.
jobcodeService
.
post
(
this
.
selectJob
).
subscribe
((
response
:
any
)
=>
{
x
.
tdesc
.
includes
(
this
.
search
)
||
if
(
response
.
success
)
{
x
.
edesc
.
includes
(
this
.
search
))
this
.
showAlert
(
response
.
message
,
'success'
)
this
.
selectJob
=
new
MyJobCodeModel
({})
this
.
getListJob
();
}
else
{
this
.
showAlert
(
response
.
message
,
'error'
)
}
}
selectJob
(
job
:
JobModel
)
{
this
.
cdr
.
detectChanges
()
// this.showSuccess()
})
this
.
job
=
new
MyJobModel
(
job
)
}
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
||
"กรุณาเลือกไฟล์"
}
}
showSuccessAdd
()
{
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
,
'IMPORT_PROPERTY'
).
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
}
})
}
}
showSuccessEdit
()
{
this
.
toastr
.
success
(
'เเก้ไขข้อมูลสำเร็จ'
,
'เเจ้งเตือน'
,
{
downloadFile
()
{
timeOut
:
3000
,
const
fileName
=
'IMPORT_MJOBCODEV2.xlsx'
positionClass
:
'toast-top-right'
,
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'
)
}
}
})
showSuccessDelete
()
{
}
this
.
toastr
.
success
(
'ลบข้อมูลสำเร็จ'
,
'เเจ้งเตือน'
,
{
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()
// }
// })
}
editBu1
()
{
// 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
View file @
0214dcf8
...
@@ -45,6 +45,10 @@ export interface JobCodeModel {
...
@@ -45,6 +45,10 @@ export interface JobCodeModel {
otherWorkText
:
string
otherWorkText
:
string
otherWorkPercent
:
number
otherWorkPercent
:
number
kpiWorkText
:
string
kpiWorkText
:
string
educationExperienceText
:
string
cerLicensedText
:
string
especiallyTrainingText
:
string
otherAbilitiesText
:
string
}
}
export
class
MyJobCodeModel
implements
JobCodeModel
{
export
class
MyJobCodeModel
implements
JobCodeModel
{
...
@@ -84,6 +88,10 @@ export class MyJobCodeModel implements JobCodeModel {
...
@@ -84,6 +88,10 @@ export class MyJobCodeModel implements JobCodeModel {
otherWorkText
:
string
otherWorkText
:
string
otherWorkPercent
:
number
otherWorkPercent
:
number
kpiWorkText
:
string
kpiWorkText
:
string
educationExperienceText
:
string
cerLicensedText
:
string
especiallyTrainingText
:
string
otherAbilitiesText
:
string
constructor
(
data
:
Partial
<
JobCodeModel
>
)
{
constructor
(
data
:
Partial
<
JobCodeModel
>
)
{
this
.
jobcodeId
=
data
.
jobcodeId
||
""
this
.
jobcodeId
=
data
.
jobcodeId
||
""
this
.
tdesc
=
data
.
tdesc
||
""
this
.
tdesc
=
data
.
tdesc
||
""
...
@@ -121,6 +129,10 @@ export class MyJobCodeModel implements JobCodeModel {
...
@@ -121,6 +129,10 @@ export class MyJobCodeModel implements JobCodeModel {
this
.
otherWorkText
=
data
.
otherWorkText
||
""
this
.
otherWorkText
=
data
.
otherWorkText
||
""
this
.
otherWorkPercent
=
data
.
otherWorkPercent
??
0
this
.
otherWorkPercent
=
data
.
otherWorkPercent
??
0
this
.
kpiWorkText
=
data
.
kpiWorkText
||
""
this
.
kpiWorkText
=
data
.
kpiWorkText
||
""
this
.
educationExperienceText
=
data
.
educationExperienceText
||
""
this
.
cerLicensedText
=
data
.
cerLicensedText
||
""
this
.
especiallyTrainingText
=
data
.
especiallyTrainingText
||
""
this
.
otherAbilitiesText
=
data
.
otherAbilitiesText
||
""
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment