Commit graph

976 commits

Author SHA1 Message Date
Bright
99e93b59cd ปรับฟิลด์หน่วยงานบรรจุ 2024-06-06 17:57:47 +07:00
Bright
e0356202d2 Merge branch 'develop' into develop-Bright 2024-06-06 17:53:26 +07:00
Bright
987e2900c5 api ทะเบียนประวัติลูกจ้างชั่วคราว 2024-06-06 17:53:03 +07:00
594371d23f fix 2024-06-06 17:18:05 +07:00
7938797e9a fix format date 2024-06-06 16:55:58 +07:00
1253acd1f4 fix 2024-06-06 14:48:23 +07:00
12bfddaa3b Merge branch 'develop' into adiDev 2024-06-06 14:40:40 +07:00
b415035aeb fix format report data 2024-06-06 14:39:41 +07:00
Kittapath
87550b158b migrate 2024-06-06 14:16:00 +07:00
Kittapath
9bb3d3ccd9 migrate 2024-06-06 14:11:49 +07:00
8f7f8eaab6 no message 2024-06-06 11:20:37 +07:00
9aada985a9 fix path 2024-06-06 11:17:18 +07:00
441295aae4 Merge branch 'develop' into adiDev 2024-06-06 11:16:08 +07:00
e4aa7fcc6d test import data 2024-06-06 11:15:26 +07:00
Bright
fb4732a724 no message 2024-06-05 16:27:26 +07:00
Bright
e4c08a5dc5 ปรับเพิ่ม/แก้ไขลูกจ้าง 2024-06-05 13:49:58 +07:00
Bright
9d205caa1f เพิ่ม/แก้ไขตำแหน่ง ปรับให้ส่ง null บางฟิลด์ได้ 2024-06-04 16:49:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
43a1dfe8d2 fix bug getListUser 2024-05-31 13:53:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c30f4eb572 Merge branch 'nice' into develop 2024-05-31 11:53:33 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ecaab4fc5c เพิ่ม role=> description 2024-05-31 11:53:26 +07:00
AnandaTon
9f7203b798 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-31 10:48:03 +07:00
AnandaTon
0ab26752b6 แก้ไขวันที่ใน profile training /education 2024-05-31 10:47:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
438c153651 getRoleUSer 2024-05-31 10:39:12 +07:00
Bright
77c7574809 Merge branch 'develop-Bright' into develop 2024-05-30 17:52:36 +07:00
Bright
7af21b6fe2 addRole User 2024-05-30 17:52:31 +07:00
Bright
ef3ff21ffd Merge branch 'develop-Bright' into develop 2024-05-30 17:13:59 +07:00
Bright
ef4d34d333 mapData 2024-05-30 17:13:48 +07:00
abd8327d17 Merge branch 'develop' into adiDev 2024-05-30 16:06:19 +07:00
773a43c7f4 fix 2024-05-30 16:05:00 +07:00
Bright
7fdd950c85 paging getList 2024-05-30 15:24:38 +07:00
Bright
aef313bac7 errorMessage 2024-05-30 14:16:00 +07:00
AnandaTon
bb9407ad38 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-29 18:18:46 +07:00
AnandaTon
fb4b4c16c6 แก้ไข profile employee 2024-05-29 18:18:32 +07:00
Bright
893eda098a no message 2024-05-29 18:11:30 +07:00
AnandaTon
20703b6afb แก้ไข profile 2024-05-29 18:04:56 +07:00
AnandaTon
0e8be06181 แก้ไข education ใน profile 2024-05-29 16:59:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
548e58fec2 Merge branch 'nice' into develop 2024-05-29 16:18:14 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
27500667a3 keycloak get role 2024-05-29 16:17:53 +07:00
AnandaTon
f56e1541a3 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-29 15:52:28 +07:00
AnandaTon
d96a6319b6 แก้ไข profile เพิ่มเติม 2024-05-29 15:51:58 +07:00
f8c0d7a2e9 Merge branch 'develop' into adiDev 2024-05-29 15:39:47 +07:00
0828365ab1 profileid/retire/{year} 2024-05-29 15:38:56 +07:00
Bright
857b0624f4 เพิ่มเงินเดือนล่าสุด 2024-05-29 15:04:42 +07:00
AnandaTon
a0b4bef3a4 Update ProfileController.ts 2024-05-29 14:55:13 +07:00
13e565d2d4 updated env example 2024-05-29 14:29:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f65efbd42e Merge branch 'nice' into develop 2024-05-29 14:20:58 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2fb1f4f841 keycloak 2024-05-29 14:20:37 +07:00
AnandaTon
3a258897fb เพิ่ม Extension.ToThaiNumber ใน profile 2024-05-29 14:20:06 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7c1bcebcb8 Merge branch 'nice' into develop 2024-05-29 14:01:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
9004721331 UserController 2024-05-29 14:01:53 +07:00