Commit graph

1531 commits

Author SHA1 Message Date
Bright
9ed7447095 update #802 2024-11-21 17:05:01 +07:00
Bright
27f82f3652 เช็ค update role keycloak #802 2024-11-21 16:22:08 +07:00
2d2f35847a Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileController.ts
2024-11-21 16:01:33 +07:00
4d081fc47a fix expire token 2024-11-21 15:58:49 +07:00
kittapath
d220430325 no message 2024-11-21 15:39:38 +07:00
kittapath
a40a2a7f2b no message 2024-11-21 11:49:14 +07:00
fb3dd54518 Merge branch 'develop' into adiDev 2024-11-21 11:39:21 +07:00
657d885e32 sort and verify email 2024-11-21 11:38:24 +07:00
kittapath
fb5a30c699 no message 2024-11-21 11:33:35 +07:00
kittapath
04406080dc หมายเหตุเงื่อนไข 2024-11-21 11:11:16 +07:00
kittapath
15a9f6a376 no message 2024-11-21 10:54:09 +07:00
Bright
396440e4bc fix แนบท้ายคำสั่งรักษาการ 2024-11-20 18:57:03 +07:00
Bright
a30821acc3 REPORT 4 2024-11-20 18:17:17 +07:00
kittapath
9db1ca7492 no message 2024-11-20 16:40:00 +07:00
kittapath
dc6e157ffe Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-20 16:08:11 +07:00
kittapath
31fbfaed3b no message 2024-11-20 16:06:48 +07:00
6abb33ccff fix 2024-11-20 15:07:17 +07:00
854785434f fix 2024-11-20 15:05:18 +07:00
be2afbde3a Merge branch 'develop' into adiDev 2024-11-20 14:03:12 +07:00
9dac11934b checkpoint,แก้ไขชื่อฟิว 2024-11-20 14:02:01 +07:00
Bright
b85de85d7e no message 2024-11-19 18:13:08 +07:00
Bright
3803e593a5 Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 18:09:28 +07:00
Bright
b1c88e9872 no message 2024-11-19 18:07:06 +07:00
8eae807a64 Merge branch 'develop' into adiDev 2024-11-19 14:35:38 +07:00
b456fe46ff sort data #798 2024-11-19 14:34:33 +07:00
kittapath
a967afeb87 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ReportController.ts
2024-11-19 12:57:14 +07:00
kittapath
3cd0b4e9da no message 2024-11-19 12:56:19 +07:00
Bright
ef01602285 no message 2024-11-19 11:46:53 +07:00
Bright
ab07e0485f update report4 2024-11-19 11:45:10 +07:00
kittapath
b089d9279a no message 2024-11-19 10:43:25 +07:00
kittapath
8f0624d27b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 18:20:18 +07:00
kittapath
0e16114d60 no message 2024-11-18 18:20:07 +07:00
Bright
ae47c72569 mock report4 2024-11-18 17:51:26 +07:00
kittapath
5e4ea343dc no message 2024-11-18 17:40:38 +07:00
kittapath
5fcaf51908 no message 2024-11-18 17:29:36 +07:00
kittapath
9e78cf7345 no message 2024-11-18 17:23:40 +07:00
kittapath
3c9698f606 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-18 14:34:14 +07:00
kittapath
58c371b888 draft org 2024-11-18 14:34:01 +07:00
Bright
8f2b8568ef add salary 2024-11-18 13:38:41 +07:00
kittapath
8001a4b138 get detail profile 2024-11-18 10:45:05 +07:00
Bright
5bc6101e12 change profile.salary 2024-11-15 16:57:20 +07:00
Bright
c7c32be069 no message 2024-11-15 16:35:18 +07:00
Bright
722dc85509 fix 2024-11-15 16:26:26 +07:00
kittapath
f757e5aeeb Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 15:34:49 +07:00
kittapath
d4ef9e0702 add commander 2024-11-15 15:34:37 +07:00
3cb06d9e19 Merge branch 'develop' into adiDev 2024-11-15 15:14:59 +07:00
a130cc71a1 testRabbit 2024-11-15 15:10:34 +07:00
kittapath
23d3cabc88 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:57:08 +07:00
Bright
7e87cec833 api อัพเดทเงินเดือน 2024-11-15 14:55:59 +07:00
kittapath
b94c5c2f09 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-15 14:55:56 +07:00