Commit graph

521 commits

Author SHA1 Message Date
Kittapath
b7b7e1bbd8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-18 17:30:08 +07:00
Kittapath
e6cfe03a6b เพิ่มตำแหน่งลูกจ้าง 2024-03-18 17:29:51 +07:00
Net
a2dfd6bff7 Merge branch 'net-dav' into develop 2024-03-18 17:25:18 +07:00
Net
efb60a0c04 fix: ลบ type 2024-03-18 17:25:04 +07:00
Net
169fada8ae fix: เเก้ รับ date null 2024-03-18 17:23:59 +07:00
Methapon2001
9b0a5e9194 Merge branch 'dev/methapon' into develop 2024-03-18 16:02:44 +07:00
Methapon2001
c264558a2c feat: add migration 2024-03-18 16:02:37 +07:00
Methapon2001
b53078016d fix: add missing column isDate 2024-03-18 16:02:30 +07:00
Kittapath
8b04567991 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-18 15:34:30 +07:00
Kittapath
5908cac8fa no message 2024-03-18 15:24:28 +07:00
Methapon2001
863512ed2d Merge branch 'dev/methapon' into develop 2024-03-18 15:20:42 +07:00
Methapon2001
340289a670 chore: add migration 2024-03-18 15:20:34 +07:00
Methapon2001
93c20a4c96 feat: add note to history 2024-03-18 15:15:16 +07:00
Methapon2001
be29cbc465 Merge branch 'dev/methapon' into develop 2024-03-18 15:11:36 +07:00
Methapon2001
991e954580 chore: format 2024-03-18 15:11:27 +07:00
Methapon2001
7bc2915788 fix: add note to create interface 2024-03-18 15:11:17 +07:00
Methapon2001
7d862c076f chore: add note to example 2024-03-18 15:07:22 +07:00
Kittapath
42fd0084aa migrate db 2024-03-18 14:56:08 +07:00
Kittapath
018bff61fc Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-18 14:53:39 +07:00
Kittapath
8afaff0d6b no message 2024-03-18 14:53:24 +07:00
Methapon2001
4fdb9a25ab Merge branch 'dev/methapon' into develop 2024-03-18 14:49:44 +07:00
Methapon2001
7f3e4dcc5f feat: add entity field "note" 2024-03-18 14:45:14 +07:00
Kittapath
ce7f814061 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-18 13:51:29 +07:00
Kittapath
23754e849c เพิ่มขั้นเงินเดือน 2024-03-18 13:51:10 +07:00
AnandaTon
e4248c09f8 เพิ่มเงื่อนไข posTypeRank 2024-03-18 13:28:48 +07:00
Kittapath
85ba718bbd no message 2024-03-18 11:35:36 +07:00
Kittapath
8acd2a97c7 no message 2024-03-18 11:11:14 +07:00
Kittapath
222a2a5b6b sort ตำแหน่งลูกจ้าง 2024-03-18 10:40:28 +07:00
Bright
2972d6ef5e fix แก้ไขตำแหน่งทางการบริหาร 2024-03-18 09:50:23 +07:00
Kittapath
29f95d3ae2 เงินเดือนลูกจ้าง 2024-03-16 12:05:45 +07:00
Kittapath
4f178cffa0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/EmployeePositionController.ts
2024-03-15 16:04:22 +07:00
Kittapath
21c044223c เพิ่มtableลูกจ้าง 2024-03-15 14:32:08 +07:00
b86e623d16 fix 2024-03-15 14:23:26 +07:00
Kittapath
912a8237e6 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-15 11:46:45 +07:00
Kittapath
aa74de2517 ลูกจ้างบันทึกข้อมูลโครงสร้างลงในล่างสุด 2024-03-15 11:45:42 +07:00
29f4326e9b fix 2024-03-15 11:42:28 +07:00
Kittapath
36e8a796c7 no message 2024-03-15 11:31:23 +07:00
Kittapath
1e465d049c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-03-15 10:50:32 +07:00
Kittapath
bec8ef3664 no message 2024-03-15 10:50:18 +07:00
Bright
57eb47dee0 แก้ค้นหาตำแหน่งลูกจ้าง 2024-03-15 10:32:22 +07:00
Kittapath
19e23bd8b1 no message 2024-03-14 21:53:19 +07:00
966d565ac6 fix 2024-03-14 17:52:23 +07:00
e59bb66a50 fix 2024-03-14 17:41:22 +07:00
74c8abf010 Merge branch 'develop' into adiDev 2024-03-14 17:35:15 +07:00
8e71d8e616 fix edit 2024-03-14 17:34:24 +07:00
Methapon2001
dede3d5048 Merge branch 'dev/methapon' into develop 2024-03-14 17:32:48 +07:00
Methapon2001
30d098577f fix: undefined history in post request 2024-03-14 17:32:33 +07:00
Bright
08bbeff5a7 เพิ่ม posTypeId, posLeveId 2024-03-14 15:11:58 +07:00
6dc30ecf14 Merge branch 'develop' into adiDev 2024-03-14 14:19:15 +07:00
d0319fd024 checkpoint 2024-03-14 14:18:36 +07:00