Commit graph

1107 commits

Author SHA1 Message Date
Kittapath
014301dcc4 no message 2024-07-08 11:06:40 +07:00
Bright
16ca14fc51 แก้รายงาน ก.พ.7 2024-07-05 13:59:55 +07:00
Kittapath
538ec8f8a1 no message 2024-07-04 18:32:26 +07:00
Bright
ac42957b91 ออกคำสั่งไล่ออก (เพิ่มวินัย) 2024-07-04 17:59:31 +07:00
Kittapath
2e28488564 เหตุผลบช2 2024-07-04 00:11:06 +07:00
Kittapath
13f2b56d2b no message 2024-07-03 09:18:17 +07:00
Kittapath
2446c755e6 no message 2024-07-03 00:36:23 +07:00
928d806313 fix 2024-07-01 17:27:01 +07:00
Bright
54a743532b fix bug 2024-07-01 16:57:02 +07:00
Kittapath
d9f52301d4 no message 2024-07-01 01:29:52 +07:00
Kittapath
1a4af1a551 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-30 20:51:45 +07:00
Kittapath
149be41373 เผยแพร่ข้อมูลโครงสร้าง 2024-06-30 20:50:12 +07:00
83b407fe2f add search person in retirement 2024-06-29 21:06:01 +07:00
Kittapath
4f8bc677a0 no message 2024-06-27 14:28:23 +07:00
Kittapath
9bbbc4b14c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-26 15:14:31 +07:00
Kittapath
d12ccd88fb ค้นหา3 ระดับ 2024-06-26 15:14:12 +07:00
56a257e82f fix api commander 2024-06-26 15:10:07 +07:00
2128857d10 Merge branch 'adiDev' into develop 2024-06-26 09:38:07 +07:00
81a9196869 fix 2024-06-26 09:37:31 +07:00
Kittapath
c53431f25b Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-26 00:07:04 +07:00
Kittapath
7156eed4f9 no message 2024-06-26 00:06:51 +07:00
d5373fb62b Merge branch 'develop' into adiDev 2024-06-25 18:42:05 +07:00
d60a36f17d fix api 2 2024-06-25 18:41:08 +07:00
Kittapath
d0cf79d08f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-06-25 10:21:57 +07:00
Kittapath
568d326797 no message 2024-06-25 10:21:30 +07:00
Bright
d166162083 ดักNull 2024-06-25 10:20:09 +07:00
Kittapath
b11be3364f no message 2024-06-24 10:52:40 +07:00
5a634b4dd3 Merge branch 'develop' into adiDev 2024-06-21 18:07:13 +07:00
b8d65aee55 update 2024-06-21 18:06:23 +07:00
Bright
5812f9e56d change endPoint 2024-06-21 17:56:31 +07:00
Kittapath
5ca15d5433 แก้ tree org 2024-06-20 16:10:19 +07:00
Kittapath
7f21756928 ปรับโครงสร้าง root 2024-06-20 11:58:51 +07:00
Kittapath
9de005c7ae api รักษาการแทน 2024-06-19 23:03:54 +07:00
Bright
f7c553ec1d ออกคำสั่ง 19,20,25,26,27,28,29,30,31,32 2024-06-19 11:23:12 +07:00
7ad713116f fix 2024-06-18 17:42:47 +07:00
7871e18130 add function emp 2024-06-18 16:10:46 +07:00
2a4c3e745f add function leave/{id} with profile/salary 2024-06-18 15:43:25 +07:00
Bright
e2d5f7e13d Merge branch 'develop' into develop-Bright 2024-06-18 13:27:20 +07:00
Bright
cfe1eba3b0 ออกคำสั่ง C-PM-11, C-PM-12 2024-06-18 13:26:55 +07:00
Kittapath
aa23879b82 no message 2024-06-18 12:31:49 +07:00
Kittapath
c3cecbc763 no message 2024-06-18 12:08:03 +07:00
9bf37a2f1d fix 2024-06-18 10:01:48 +07:00
df05b9afaf add insigniaTypeId 2024-06-17 17:54:45 +07:00
063752f002 add pointSumTotal 2024-06-17 17:39:26 +07:00
7351c9b510 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
2024-06-17 14:35:49 +07:00
196f13cfbd เพิ่ม field /api/v1/org/profile-employee/report 2024-06-17 14:34:17 +07:00
Bright
6860d52d13 no message 2024-06-17 14:18:06 +07:00
Kittapath
61b56a0d62 no message 2024-06-17 13:27:11 +07:00
30286317c6 fix return 2024-06-14 16:30:46 +07:00
e14aef7202 Merge branch 'develop' into adiDev 2024-06-14 16:24:23 +07:00