Commit graph

890 commits

Author SHA1 Message Date
eb85bdcb45 fix and add profile by key cloak 2024-05-24 18:06:54 +07:00
7b480b1247 api history/user 2024-05-24 13:13:52 +07:00
63d357ea30 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileController.ts
#	src/controllers/ProfileEmployeeController.ts
2024-05-24 11:09:26 +07:00
eea123fbad add field profile and profile-employee search-personal 2024-05-24 11:06:43 +07:00
Kittapath
85f8fbb03a get profile by token 2024-05-24 01:11:47 +07:00
Bright
58fe2f08fd get ข้อมูล by keycloak (ลูกจ้าง) 2024-05-23 18:30:16 +07:00
Kittapath
24c5cbef55 แก้ค้นหาประวัติ by token 2024-05-23 17:20:15 +07:00
Kittapath
ff0be7af48 get ข้อมูล by keycloak 2024-05-23 16:44:37 +07:00
Kittapath
f6bcd35e14 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ProfileController.ts
2024-05-23 15:38:18 +07:00
Kittapath
852525c8f5 แก้ค้นหาลูกจ้าง 2024-05-23 15:37:13 +07:00
Bright
86fd868adf ปรับ query report 2024-05-23 15:28:49 +07:00
Kittapath
689d48aadc no message 2024-05-23 14:10:50 +07:00
bda7c1328f Merge branch 'develop' into adiDev 2024-05-23 10:28:58 +07:00
2c64ee1220 fix 2024-05-23 10:26:43 +07:00
Bright
f75c6237aa Merge branch 'develop' into develop-Bright 2024-05-23 10:11:23 +07:00
Bright
2149b799dc report ประวัติแบบย่อ 2024-05-23 10:11:08 +07:00
Bright
bbd8c1c0e9 report ประวัติแบบย่อ 2024-05-23 10:08:41 +07:00
732467965e Merge branch 'develop' into adiDev 2024-05-23 10:07:50 +07:00
cd050b2032 fix sort 2024-05-23 10:07:07 +07:00
Kittapath
8c03528ff3 profile/search เพิ่ม profileId 2024-05-21 15:00:55 +07:00
c56ffece73 fix 2024-05-21 13:55:26 +07:00
40d2a37b34 fix 2024-05-21 13:30:25 +07:00
3b68f7670f api profile/search 2024-05-21 13:23:42 +07:00
Kittapath
f6bdfce063 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-20 15:27:56 +07:00
Kittapath
7763544a93 no message 2024-05-20 15:25:18 +07:00
Bright
77e3248a3a ค้นหาประวัติการครองตำแหน่ง ขรก./ลูกจ้าง 2024-05-20 15:23:26 +07:00
8f74e3a366 Merge branch 'develop' into adiDev 2024-05-20 11:13:18 +07:00
d052f67454 fix edu 2024-05-20 11:12:23 +07:00
Kittapath
1961c05172 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-17 17:16:35 +07:00
Kittapath
2cfef7abd6 get profile by keycloak 2024-05-17 17:14:41 +07:00
AnandaTon
9b85f0d021 แก้ไข return null เมื่อวันที่ไม่สอดคล้อง 2024-05-17 15:34:21 +07:00
Kittapath
71cbecdce0 migrate 2024-05-17 14:24:20 +07:00
AnandaTon
391501b665 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-17 14:22:05 +07:00
AnandaTon
ae947a48c0 เพิ่มฟิว governant 2024-05-17 14:21:53 +07:00
Kittapath
92a865fd3c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-17 14:17:09 +07:00
Kittapath
2869430083 no message 2024-05-17 14:16:40 +07:00
884fe694d0 Merge branch 'develop' into adiDev 2024-05-17 13:36:27 +07:00
25285af736 add dateRetireLaw profile 2024-05-17 13:35:36 +07:00
Bright
a529207692 เช็คเลขบัตร ปชช. 2024-05-17 12:54:18 +07:00
Kittapath
68394fe07c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-17 11:27:49 +07:00
Kittapath
77e0cee23e migrate 2024-05-17 11:27:28 +07:00
eb50563dfe Merge branch 'develop' into adiDev 2024-05-17 11:23:23 +07:00
9045b9ec90 fix 2024-05-17 11:22:31 +07:00
Bright
c306c85504 ค้นหาตำแหน่งในระบบสมัครสอบ ลูกจ้าง 2024-05-17 11:16:39 +07:00
5361184bfd Merge branch 'develop' into adiDev 2024-05-17 11:09:49 +07:00
b456b5ca72 fix 2024-05-17 11:09:04 +07:00
AnandaTon
06db1a6c68 fix swap direction 2024-05-17 11:03:27 +07:00
AnandaTon
0f217da42c Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-17 10:11:40 +07:00
AnandaTon
fdb5844ad8 แก้ไข patch salary employee 2024-05-17 10:11:30 +07:00
Kittapath
5254eaa9c9 migrate 2024-05-17 10:00:21 +07:00