Commit graph

2276 commits

Author SHA1 Message Date
kittapath
3fb433dbe3 no message 2025-02-18 10:49:58 +07:00
kittapath
3173904ea1 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-18 10:34:53 +07:00
kittapath
54c847cdd6 find isCommission 2025-02-18 10:34:31 +07:00
Bright
3a35b91a59 migrate + update view 2025-02-18 10:22:33 +07:00
kittapath
e1e400a24a มอบหมายตำแหน่งว่าง 2025-02-18 09:38:11 +07:00
kittapath
d6b4d8bdba Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-17 22:35:12 +07:00
kittapath
e0be0fbb82 no message 2025-02-17 22:34:41 +07:00
edf224d758 Merge branch 'develop' into adiDev 2025-02-17 17:47:30 +07:00
fb7cce3a06 convert point 2025-02-17 17:46:29 +07:00
kittapath
e3a4ad4ed7 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-17 17:14:49 +07:00
kittapath
573d2788be no message 2025-02-17 17:14:24 +07:00
108d2356b9 fix 2025-02-17 17:12:50 +07:00
a05e6178fa update 2025-02-17 14:46:25 +07:00
Bright
188a028bec migrate 2025-02-17 12:07:22 +07:00
7b9172c93f Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ReportController.ts
2025-02-17 11:01:39 +07:00
ee71e985ab add viewProfileEmp 2025-02-17 10:57:03 +07:00
kittapath
b94d4e1b93 edit dna 2025-02-14 09:58:51 +07:00
kittapath
408a3a7644 update report 2025-02-12 11:22:03 +07:00
kittapath
a3167520af Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-12 10:43:19 +07:00
kittapath
33ec55250c import 2025-02-12 10:43:01 +07:00
Bright
86b1e55aee fix issue #1184 รายการปรับระดับชั้นงาน+ย้าย (ตัวย่อระดับชั้นงานแสดงไม่ครบ) 2025-02-11 19:53:28 +07:00
Bright
7878d912b1 fix 2025-02-11 14:06:55 +07:00
Bright
5edcb127f9 fix 2025-02-11 13:14:33 +07:00
Bright
a7e12be51f fix issue #1175 (ข้อมูลตัวย่อตำแหน่ง ไม่บันทึกลงทะเบียนประวัติหลังจากออกคำสั่ง) 2025-02-10 17:32:19 +07:00
Bright
ec14148d72 fix ปรับระดับชั้นงานลูกจ้าง (ข้อมูลระดับชั้นงานแสดงไม่ครบ) #1172 2025-02-10 16:19:34 +07:00
kittapath
8ab3cb26b5 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-10 16:16:32 +07:00
kittapath
6c65552dc5 nis code list 2025-02-10 16:16:20 +07:00
db3c9583f6 Merge branch 'develop' into adiDev 2025-02-10 12:14:12 +07:00
08a17bb24d fix 2025-02-10 12:12:15 +07:00
kittapath
36ac1d146d Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-10 12:07:21 +07:00
kittapath
939c121ac4 add mis 2025-02-10 12:07:09 +07:00
8c72f7df87 fix command 2025-02-10 11:53:39 +07:00
cf64091612 add api calculateEvaluation 2025-02-10 10:48:15 +07:00
e9120f63ba update viewProfileEva 2025-02-10 09:26:12 +07:00
d4f440295c Merge branch 'adiDev' into develop 2025-02-07 18:05:04 +07:00
edd21d8777 add feild viewProfileEva 2025-02-07 18:04:12 +07:00
Bright
bfe3f7c84c fix ส่งชื่อไปพักราชการแต่ถูกปลดกิ่ง 2025-02-07 12:03:58 +07:00
kittapath
f01ed53d47 no message 2025-02-07 10:57:14 +07:00
Bright
0a93160a4f update phone, telephoneNumber 2025-02-07 10:12:08 +07:00
Bright
537aa87475 migrate view 2025-02-07 09:50:20 +07:00
ca4cc8d18b fix 2025-02-07 09:41:36 +07:00
kittapath
4b31153a36 no message 2025-02-06 18:09:39 +07:00
kittapath
436507747f no message 2025-02-06 17:42:26 +07:00
kittapath
3eee6bd69f Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-06 17:20:09 +07:00
kittapath
3b3352009c no message 2025-02-06 17:18:29 +07:00
5de59c1951 Merge branch 'develop' into adiDev 2025-02-06 17:17:14 +07:00
ef88894ea4 add view 2025-02-06 17:16:09 +07:00
kittapath
72fd4d62e3 add dna 2025-02-06 09:17:35 +07:00
kittapath
26a74c1bea add dna probation 2025-02-05 17:55:20 +07:00
kittapath
f02dd07366 add dna 2025-02-05 17:43:14 +07:00