Commit graph

938 commits

Author SHA1 Message Date
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
AnandaTon
4cfe61f0a2 แก้ไข type เพิ่ม Rank 2024-05-29 11:39:56 +07:00
Bright
dcca84ac96 all node 2024-05-29 11:34:49 +07:00
AnandaTon
c64ffd8ea8 แก้ไข type เป๊น String 2024-05-29 11:00:13 +07:00
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