Commit graph

923 commits

Author SHA1 Message Date
Kittapath
4d9053dcdc no message 2024-05-29 10:14:11 +07:00
AnandaTon
0f82f9ae78 Update ProfileController.ts 2024-05-29 09:40:58 +07:00
Bright
9ee8240b1c OrgDotnetController (update) 2024-05-28 16:23:09 +07:00
AnandaTon
d8f2f59044 แก้ไขชื่อตัวแปร 2024-05-28 16:06:09 +07:00
Kittapath
a592b45769 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-28 15:29:35 +07:00
Kittapath
9d9b2b0db1 no message 2024-05-28 15:22:14 +07:00
e75f41fe2a Merge branch 'develop' into adiDev 2024-05-28 15:02:07 +07:00
96646eb1e1 add field search-personal 2024-05-28 15:01:15 +07:00
Kittapath
69d1d797a4 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-28 14:18:22 +07:00
Kittapath
bc49bb1e90 no message 2024-05-28 14:17:45 +07:00
2b0c20556d Merge branch 'develop' into adiDev 2024-05-28 13:35:59 +07:00
4e3235ec2b checkpoint 2024-05-28 13:35:01 +07:00
AnandaTon
b1d6888f58 แก้ไขเพิ่มเติม kk1 2024-05-28 12:52:08 +07:00
AnandaTon
5532d82a43 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-05-28 12:05:25 +07:00
AnandaTon
f3318a9bab แก้ไข id เป็น profileId 2024-05-28 12:05:12 +07:00
Kittapath
3debbe1602 แก้ list report 2024-05-28 12:02:41 +07:00
Kittapath
dcd324fd37 migrate 2024-05-28 10:47:34 +07:00
Bright
2dac48cb81 add fields 2024-05-28 10:31:18 +07:00
a66f582c25 add api history/user done 2024-05-28 10:20:50 +07:00
10377150dd Merge branch 'develop' into adiDev 2024-05-28 09:30:55 +07:00
8d1de6365a เพิ่้มและลบ api history/user 2024-05-28 09:30:14 +07:00
Bright
ccffbe6c4d OrgDotnetController 2024-05-27 17:57:16 +07:00
Kittapath
59cefbeec5 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-05-27 16:50:20 +07:00
Kittapath
9d81bdb470 no message 2024-05-27 16:48:50 +07:00
abc4aee8a4 api api/v1/org/profile/leave/search 2024-05-27 16:30:14 +07:00
7126d64d7e add api history/user 2024-05-27 15:17:27 +07:00
3438b450ba Merge branch 'develop' into adiDev 2024-05-27 11:38:11 +07:00
3167fe271e API checkRole and history/user 2024-05-27 11:36:55 +07:00
Kittapath
c2f71acad9 เพิ่มเหตุผลเกษียณ 2024-05-27 08:58:44 +07:00
38871bcc80 Merge branch 'adiDev' into develop 2024-05-24 18:08:17 +07:00
eb85bdcb45 fix and add profile by key cloak 2024-05-24 18:06:54 +07:00
AnandaTon
0f846df20e fix kk1employee 2024-05-24 16:48:33 +07:00
AnandaTon
ee030a0e2d เพิ่ม report kk1 employee 2024-05-24 15:57:29 +07:00
AnandaTon
a242f7bbdd เพิ่ม report kk1 2024-05-24 13:42:59 +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