Commit graph

77 commits

Author SHA1 Message Date
e9e2fb5fd6 Merge branch 'adiDev' into develop 2024-02-12 15:45:20 +07:00
ff057c6824 fix org_053 2024-02-12 15:44:34 +07:00
Bright
59d3734184 posMasterOrder เพิ่มตำแหน่ง 2024-02-12 15:00:30 +07:00
2809626c45 fix word 2024-02-12 12:23:37 +07:00
2bfc926f4b fix default sortName 2024-02-12 12:08:43 +07:00
44fa203add fix bug 2024-02-12 11:02:42 +07:00
1ed37b770c fix api org_053 isAll ทำงานผิดพลาด 2024-02-12 10:57:35 +07:00
Kittapath
b2d8fa6bf8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-09 22:56:00 +07:00
Kittapath
bc86f4d2d9 no message 2024-02-09 22:55:42 +07:00
Bright
0e71ba98ea ปรับ api ตำแหน่งทั้งหมด 2024-02-09 16:35:01 +07:00
3bfbb93691 fullNameCurrentHolder และ fullNameNextHolder สลับกัน org_053 (master/list) 2024-02-09 09:27:11 +07:00
Kittapath
81ae8876d4 no message 2024-02-08 15:47:22 +07:00
Bright
4127b76bc0 fix แสดงเลขที่ตำแหน่ง 2024-02-08 15:07:55 +07:00
Kittapath
d33569005a no message 2024-02-07 14:01:39 +07:00
Kittapath
148fa2c81c no message 2024-02-07 12:43:49 +07:00
Kittapath
60f5203ff4 no message 2024-02-07 12:01:12 +07:00
Kittapath
c06904c41d Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-07 11:10:58 +07:00
Kittapath
a36d871ed1 no message 2024-02-07 11:08:55 +07:00
74507f2299 Merge branch 'adiDev' into develop 2024-02-07 11:03:46 +07:00
8f6517a6ab fix ORG_061 2024-02-07 11:03:12 +07:00
Kittapath
89e97798fd no message 2024-02-07 08:27:15 +07:00
Kittapath
c8d9011578 no message 2024-02-06 16:37:56 +07:00
Kittapath
0610ebacfb no message 2024-02-06 16:28:44 +07:00
Kittapath
523991674c no message 2024-02-06 16:23:33 +07:00
Kittapath
08f2c8753e Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-06 15:44:16 +07:00
Kittapath
1163194b10 แก้ select คนครอง 2024-02-06 12:04:42 +07:00
Kittapath
53621bbef1 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-06 12:01:23 +07:00
31a7357c19 add field org_053 2024-02-06 11:30:41 +07:00
Kittapath
f9bafbb4f1 แก้searchตำแหน่ง 2024-02-05 18:45:57 +07:00
bd6ac8ae3c checkpoint 2024-02-05 11:35:35 +07:00
Kittapath
1de27691f8 no message 2024-02-03 13:09:44 +07:00
Bright
971c611c5d api ตำแหน่งทั้งหมด 2024-02-02 16:15:51 +07:00
Bright
f6bf6ef536 move get 2024-02-02 13:31:59 +07:00
Bright
e51ac2dd09 api ประเภทตำแหน่ง 2024-02-02 12:54:57 +07:00
04874676f8 7table and PosExecutive (elementary) 2024-02-02 10:47:19 +07:00
Kittapath
e90e3a27c6 ประวัติอัตรากำลัง 2024-02-01 20:05:26 +07:00
c574726522 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 17:37:11 +07:00
a0f8c05134 Merge branch 'adiDev' into develop
# Conflicts:
#	src/controllers/PositionController.ts
2024-02-01 17:36:54 +07:00
Bright
5e11dbba03 comment validate fields PosExecutiveId 2024-02-01 17:31:55 +07:00
009e315378 org_053 v.queryBuilder ยังไม่เสร็จ 2024-02-01 17:28:47 +07:00
Kittapath
91222163d3 no message 2024-02-01 17:12:10 +07:00
Kittapath
c90319d010 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 15:44:50 +07:00
Kittapath
7b67c6f63e no message 2024-02-01 15:44:32 +07:00
be71b978bf Merge branch 'adiDev' into develop 2024-02-01 15:22:11 +07:00
73bd1bc604 bug search org_053 2024-02-01 15:21:23 +07:00
Kittapath
ede2e91be6 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 15:07:23 +07:00
Kittapath
a37405ee48 sort master/list 2024-02-01 15:06:28 +07:00
Kittapath
a92f7eca09 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 13:30:05 +07:00
Kittapath
3e741527fe Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 13:29:41 +07:00
6cf283e6f3 Merge branch 'adiDev' into develop 2024-02-01 13:29:37 +07:00