Commit graph

154 commits

Author SHA1 Message Date
ed4d07a439 Merge branch 'adiDev' into develop 2024-02-02 13:17:15 +07:00
a4786c4bb9 org_041-044 posExecutive 2024-02-02 13:16:40 +07:00
Bright
e51ac2dd09 api ประเภทตำแหน่ง 2024-02-02 12:54:57 +07:00
4adf3590f8 fix tags 2024-02-02 12:52:49 +07:00
ae6f7e85b0 Merge branch 'adiDev' into develop 2024-02-02 10:48:18 +07:00
04874676f8 7table and PosExecutive (elementary) 2024-02-02 10:47:19 +07:00
Kittapath
97b85acbd0 แก้ bug list tree 2024-02-02 10:15:03 +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
1c550a2f0c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 17:12:24 +07:00
Kittapath
91222163d3 no message 2024-02-01 17:12:10 +07:00
Bright
89e94b3006 เพิ่มฟิลด์ Total 2024-02-01 16:41:24 +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
38f44d8f36 add comment entity 2024-02-01 14:17:56 +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
Kittapath
2832ab2268 isAncestorDNA to ancestorDNA 2024-02-01 13:29:15 +07:00
b78d0618b4 fix org_053 2024-02-01 13:28:46 +07:00
Bright
5eede57794 api จัดลำดับตำแหน่ง 2024-02-01 13:07:54 +07:00
Kittapath
22b80868d4 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-02-01 11:34:35 +07:00
Kittapath
1845b489ba no message 2024-02-01 11:34:13 +07:00
9e14637ed6 Merge branch 'adiDev' into develop 2024-02-01 11:13:25 +07:00
ee15891310 org_053 รายการอัตรากำลัง 2024-02-01 11:12:44 +07:00
Kittapath
c89126a8a2 แก้ defult value 2024-02-01 11:02:35 +07:00
Kittapath
9ac7517518 สร้างโครงสร้าง+ตำแหน่ง 2024-02-01 09:27:38 +07:00
Kittapath
cd21c42710 เพิ่มselect detail tree 2024-01-31 18:24:38 +07:00
Kittapath
35ba5b91f3 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-01-31 18:03:39 +07:00
Kittapath
165d5e6837 no message 2024-01-31 18:02:50 +07:00
1b9f9a634e checkpoint ORG_053 2024-01-31 17:51:49 +07:00
923d75ebe3 Merge branch 'develop' into adiDev 2024-01-31 17:23:24 +07:00
2610bd74b4 checkpoint and fix bug 2024-01-31 17:22:45 +07:00
Kittapath
00447c7bce Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-01-31 17:20:41 +07:00
Kittapath
19dd52b4c4 แก้ model 2024-01-31 17:20:08 +07:00
Bright
e8f5f905bd api จัดลำดับโครงสร้าง 2024-01-31 17:12:38 +07:00
24d0d06b62 Merge branch 'develop' into adiDev 2024-01-31 16:16:29 +07:00
c81dacadc6 Entity Create Function 2024-01-31 16:15:55 +07:00
Kittapath
036281901d no message 2024-01-31 16:12:07 +07:00
Kittapath
277c60864d no message 2024-01-31 16:11:49 +07:00
d17e31fbad Merge branch 'adiDev' into develop 2024-01-31 15:31:57 +07:00
8cb8b449b4 relation posMaster to Root and Child1-4 2024-01-31 15:31:20 +07:00
Bright
bca7a94f26 แก้ path ลบตำแหน่ง 2024-01-31 15:24:28 +07:00