Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
myAppraisal
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
myAppraisal
Commits
e7d75044
Commit
e7d75044
authored
Dec 04, 2024
by
Natthaphat Pankiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
api ประเภทพนักงาน
parent
c86e6a62
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
203 additions
and
17 deletions
+203
-17
dashboard.module.ts
src/app/components/dashboard/dashboard.module.ts
+2
-1
employee-categories.component.html
...on/employee-categories/employee-categories.component.html
+85
-16
employee-categories.component.ts
...tion/employee-categories/employee-categories.component.ts
+62
-0
employee-type.model.ts
src/app/shared/model/employee-type.model.ts
+21
-0
employee-type.service.ts
src/app/shared/services/employee-type.service.ts
+33
-0
No files found.
src/app/components/dashboard/dashboard.module.ts
View file @
e7d75044
...
...
@@ -48,6 +48,7 @@ import { Bu5Service } from 'src/app/shared/services/bu5.service';
import
{
Bu6Service
}
from
'src/app/shared/services/bu6.service'
;
import
{
Bu7Service
}
from
'src/app/shared/services/bu7.service'
;
import
{
EmpGroupService
}
from
'src/app/shared/services/emp_group.service'
;
import
{
EmpTypeService
}
from
'src/app/shared/services/employee-type.service'
;
@
NgModule
({
declarations
:
[
...
...
@@ -95,7 +96,7 @@ import { EmpGroupService } from 'src/app/shared/services/emp_group.service';
HttpClientModule
,
FormsModule
],
providers
:
[
Bu1Service
,
Bu2Service
,
Bu3Service
,
Bu4Service
,
Bu5Service
,
Bu6Service
,
Bu7Service
,
EmpGroupService
,{
providers
:
[
Bu1Service
,
Bu2Service
,
Bu3Service
,
Bu4Service
,
Bu5Service
,
Bu6Service
,
Bu7Service
,
EmpGroupService
,
EmpTypeService
,
{
provide
:
HTTP_INTERCEPTORS
,
useClass
:
HttpRequestInterceptor
,
multi
:
true
,
...
...
src/app/components/job-description/employee-categories/employee-categories.component.html
View file @
e7d75044
...
...
@@ -2,7 +2,8 @@
<div
class=
"px-1"
>
<div
class=
"relative shadow-md"
>
<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
()"
>
<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>
...
...
@@ -73,24 +74,54 @@
</ng-container>
</tr>
</thead>
<tbody>
<tr
*
ngFor=
"let item of[
['01','พนักงานประจำรายเดือน', 'พนักงานประจำรายเดือน'],
['02','พนักงานประจำรายวัน', 'พนักงานประจำรายวัน']];let i = index"
>
<td
style=
"font-size: 12px; "
class=
"flex justify-center"
>
<tbody
*
ngIf=
"!emp_typeListFilter().length"
>
<tr>
<td
class=
"text-center"
colspan=
"100%"
>
ไม่พบข้อมูล
</td>
</tr>
</tbody>
<tbody
*
ngIf=
"emp_typeListFilter().length"
>
<tr
*
ngFor=
"let item of emp_typeListFilter() | slice:((currentPage-1) * 10) : (((currentPage-1) * 10) + 10);let i = index"
>
<td
class=
"flex justify-center"
>
<input
type=
"checkbox"
style=
"margin-right: 20px; transform:scale(0.7)"
>
{{item
[0]
}}
{{item
.codeId
}}
</td>
<td
style=
"text-align: center; font-size: 12px;"
>
{{item[1]
}}
</td>
<td
style=
"text-align: center; font-size: 12px;padding-left: 9.2%; padding-right: 50%;"
>
{{item[2]
}}
</td>
<td
class=
"text-center"
>
{{item.tdesc
}}
</td>
<td
class=
"text-center"
>
{{item.edesc
}}
</td>
<td
class=
"flex justify-center"
>
<i
class=
"ti ti-edit cursor-pointer i-gray fs-l px-1"
data-hs-overlay=
"#employee-categories-modal-edit"
></i>
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
></i>
<i
class=
"ti ti-edit cursor-pointer i-gray fs-l px-1"
(
click
)="
selectEmp_type
(
item
)"
data-hs-overlay=
"#employee-categories-modal-edit"
></i>
<i
class=
"ti ti-trash cursor-pointer i-gray fs-l px-1"
(
click
)="
deleteEmp_type
(
item
)"
></i>
</td>
</tr>
</tbody>
</table>
</div>
<nav
class=
"pagination-style-3 overflow-auto my-5"
*
ngIf=
"page.length"
>
<ul
class=
"ti-pagination"
>
<li>
<a
aria-label=
"anchor"
class=
"page-link"
href=
"javascript:void(0);"
(
click
)="
currentPage =
(currentPage-1
||
1
)"
>
<i
class=
"ri-arrow-left-s-line align-middle rtl:rotate-180"
></i>
</a>
</li>
<li
*
ngFor=
"let item of page"
>
<a
class=
"page-link"
href=
"javascript:void(0);"
[
class
.
active
]="
item=
=currentPage"
(
click
)="
currentPage=
item"
>
{{item}}
</a>
<!-- <a aria-label="anchor" class="page-link" href="javascript:void(0);"><i class="ri-more-line"></i>
</a> -->
</li>
<li>
<a
aria-label=
"anchor"
class=
"page-link"
href=
"javascript:void(0);"
(
click
)="
currentPage =
(currentPage
>
page.length-1 ? currentPage: currentPage+1 )">
<i
class=
"ri-arrow-right-s-line align-middle rtl:rotate-180"
></i>
</a>
</li>
</ul>
</nav>
</div>
</div>
...
...
@@ -147,7 +178,8 @@
data-hs-overlay=
"#employee-categories-modal-add"
>
ย้อนกลับ
</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=
"#employee-categories-alert-modal"
>
บันทึกข้อมูล
</a>
</div>
...
...
@@ -196,18 +228,55 @@
</div>
<div
class=
"ti-modal-body"
style=
"margin-top: 40px;"
>
<label
for=
"input-label"
class=
"ti-form-label mt-2rem"
>
รหัสประเภทพนักงาน
</label>
<input
type=
"text"
id=
"input-label"
class=
"ti-form-input w-1/2 bg-input-readonly"
style=
"background-color: #B3B3B3;"
placeholder=
"
"
readonly
>
<input
type=
"text"
id=
"input-label"
class=
"ti-form-input w-1/2 bg-input-readonly"
style=
"background-color: #B3B3B3;"
[(
ngModel
)]="
emp_type
.
codeId
"
readonly
>
<label
for=
"detail_th"
class=
"ti-form-label mt-2rem"
>
รายละเอียด (ไทย)
</label>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input h-16"
placeholder=
"
"
>
<input
type=
"text"
id=
"detail_th"
class=
"ti-form-input h-16"
[(
ngModel
)]="
emp_type
.
tdesc
"
>
<label
for=
"detail_eng"
class=
"ti-form-label mt-2rem"
>
รายละเอียด (อังกฤษ)
</label>
<input
type=
"text"
id=
"detail_eng"
class=
"ti-form-input h-16"
placeholder=
"
"
>
<input
type=
"text"
id=
"detail_eng"
class=
"ti-form-input h-16"
[(
ngModel
)]="
emp_type
.
edesc
"
>
<div
class=
"flex justify-end mt-2rem mb-1rem space-x-4"
>
<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=
"#employee-categories-modal-edit"
>
ย้อนกลับ
</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=
"#employee-categories-alert-modal"
>
บันทึกข้อมูล
</a>
</div>
</div>
</div>
</div>
</div>
<div
id=
"employee-categories-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=
"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=
"#employee-group-unit-component-alert-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"
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=
"#employee-categories-alert-modal"
>
ย้อนกลับ
</button>
<a
class=
"ti-btn ti-btn-success"
href=
"javascript:void(0);"
data-hs-overlay=
"#employee-categories-alert-modal"
(
click
)="
addEmp_type
()"
>
บันทึกข้อมูล
</a>
</div>
...
...
src/app/components/job-description/employee-categories/employee-categories.component.ts
View file @
e7d75044
import
{
Component
,
EventEmitter
,
Input
,
Output
}
from
'@angular/core'
;
import
{
ToastrService
}
from
'ngx-toastr'
;
import
{
EmpTypeModel
,
MyEmpTypeModel
}
from
'src/app/shared/model/employee-type.model'
;
import
{
EmpTypeService
}
from
'src/app/shared/services/employee-type.service'
;
@
Component
({
selector
:
'app-employee-categories'
,
...
...
@@ -15,6 +18,19 @@ export class EmployeeCategories {
this
.
sendPathTitle
.
emit
([
'การจัดการข้อมูลองค์กร'
,
'ข้อมูลลักษณะงาน'
,
tab
.
text
])
this
.
activeTab
=
tab
.
id
;
}
currentPage
=
1
page
=
Array
.
from
({
length
:
1
},
(
_
,
i
)
=>
i
+
1
);
emp_typeList
:
EmpTypeModel
[]
=
[]
emp_type
:
EmpTypeModel
=
new
MyEmpTypeModel
({})
search
=
""
constructor
(
private
EmpTypeService
:
EmpTypeService
,
private
toastr
:
ToastrService
)
{
}
ngOnInit
():
void
{
this
.
getEmpTypeList
()
}
modalOptions
:
{
[
nameModal
:
string
]:
{
// ชื่อตรวจสอบการเปิดปิด
isModalOpen
:
boolean
;
// เปิด/ปิด
...
...
@@ -31,6 +47,11 @@ export class EmployeeCategories {
isModalOpen
:
false
,
modalSize
:
'm'
,
backdropClose
:
true
,
},
"upload"
:{
isModalOpen
:
false
,
modalSize
:
'm'
,
backdropClose
:
true
,
}
}
...
...
@@ -53,5 +74,46 @@ export class EmployeeCategories {
// Logic ตรวจสอบว่า Modal อื่นยังเปิดอยู่หรือไม่
return
Object
.
values
(
this
.
modalOptions
).
some
(
modal
=>
modal
.
isModalOpen
);
// หากไม่มี Modal อื่นเปิด
}
getEmpTypeList
()
{
this
.
EmpTypeService
.
getList
().
subscribe
(
response
=>
{
this
.
emp_typeList
=
response
this
.
searchChange
()
})
}
searchChange
()
{
this
.
currentPage
=
1
this
.
page
=
Array
.
from
({
length
:
Math
.
ceil
(
this
.
emp_typeListFilter
().
length
/
10
)
},
(
_
,
i
)
=>
i
+
1
);
}
emp_typeListFilter
()
{
return
this
.
emp_typeList
.
filter
(
x
=>
x
.
codeId
.
toLowerCase
().
includes
(
this
.
search
)
||
x
.
tdesc
.
toLowerCase
().
includes
(
this
.
search
)
||
x
.
edesc
.
toLowerCase
().
includes
(
this
.
search
))
}
selectEmp_type
(
emp_type
:
EmpTypeModel
)
{
// this.showSuccess()
this
.
emp_type
=
new
MyEmpTypeModel
(
emp_type
)
}
showSuccess
()
{
this
.
toastr
.
success
(
'This is an example of tip'
,
'TIP'
,
{
timeOut
:
3000
,
positionClass
:
'toast-top-right'
,
});
}
addEmp_type
()
{
// this.emp_typeService.post(this.emp_type).subscribe((response:any) => {
// if (response.success) {
// this.getemp_typeList()
// }
// })
}
deleteEmp_type
(
emp_type
:
EmpTypeModel
)
{
// this.emp_typeService.delete(new MyEmpTypeModel(emp_type)).subscribe((response:any) => {
// if (response.success) {
// this.getemp_typeList()
// }
// })
}
}
src/app/shared/model/employee-type.model.ts
0 → 100644
View file @
e7d75044
export
interface
EmpTypeModel
{
codeId
:
string
;
tdesc
:
string
;
edesc
:
string
;
companyId
:
string
;
}
export
class
MyEmpTypeModel
implements
EmpTypeModel
{
codeId
:
string
;
tdesc
:
string
;
edesc
:
string
;
companyId
:
string
;
constructor
(
data
:
Partial
<
EmpTypeModel
>
)
{
this
.
codeId
=
data
.
codeId
||
""
this
.
tdesc
=
data
.
tdesc
||
""
this
.
edesc
=
data
.
edesc
||
""
this
.
companyId
=
data
.
companyId
||
""
}
}
src/app/shared/services/employee-type.service.ts
0 → 100644
View file @
e7d75044
import
{
HttpClient
,
HttpHeaders
}
from
'@angular/common/http'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
Observable
}
from
'rxjs'
;
import
{
environment
}
from
'src/environments/environment'
;
import
{
EmpTypeModel
}
from
'../model/employee-type.model'
;
@
Injectable
({
providedIn
:
'root'
})
export
class
EmpTypeService
{
api
=
"/employee-type"
urlApi
=
environment
.
baseUrl
+
this
.
api
constructor
(
private
http
:
HttpClient
)
{
}
getList
():
Observable
<
EmpTypeModel
[]
>
{
return
this
.
http
.
get
<
EmpTypeModel
[]
>
(
this
.
urlApi
+
"/lists"
)
}
getById
(
codeId
:
string
):
Observable
<
EmpTypeModel
>
{
return
this
.
http
.
get
<
EmpTypeModel
>
(
this
.
urlApi
+
"/"
+
codeId
)
}
// post(body: Bu1Model) {
// return this.http.post(this.urlApi, body)
// }
// delete(body: Bu1Model) {
// const options = {
// headers: new HttpHeaders({
// "Content-Type": "application/json",
// }),
// body: body
// };
// return this.http.delete(this.urlApi, options)
// }
}
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