Commit graph

1568 commits

Author SHA1 Message Date
dca044eeae edit phoneNUmber add field email 2024-10-18 12:09:46 +07:00
bd3cb33a5e Merge branch 'develop' into adiDev 2024-10-17 16:40:35 +07:00
f0e5a83d02 log admin , master (ยกเว้น menu ข้อมูลปฎิทินวันหยุด) 2024-10-17 16:39:42 +07:00
kittapath
3d8b66d3cc สกจ มอบหมาย 2024-10-17 15:13:59 +07:00
kittapath
41e82a92f9 no message 2024-10-17 13:51:57 +07:00
kittapath
5947b19f9e check state 2024-10-17 12:10:23 +07:00
Suphonchai Phoonsawat
9370c9e72b Merge branch 'develop' into working 2024-10-17 11:34:32 +07:00
Suphonchai Phoonsawat
6ab149f7a3 add org search 2024-10-17 11:34:03 +07:00
kittapath
b4e188e7dd แก้ workflow 2024-10-17 11:33:35 +07:00
kittapath
c579011021 แก้ ินกั 2024-10-17 11:06:58 +07:00
Suphonchai Phoonsawat
f770b9214a Merge branch 'develop' into working 2024-10-17 10:47:48 +07:00
Suphonchai Phoonsawat
d91a0bb9d9 add comment 2024-10-17 10:47:10 +07:00
kittapath
a53cf4212f report 10 2024-10-17 10:38:32 +07:00
kittapath
437632f39c no message 2024-10-17 09:55:06 +07:00
kittapath
7cada3195d หาผู้บังคับบัญชา 2024-10-17 09:46:55 +07:00
kittapath
b933666c8d delete user in state 2024-10-16 17:49:55 +07:00
kittapath
4c800c2ef4 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-10-16 17:16:08 +07:00
kittapath
238ab9dba2 สร้าง workflow 2024-10-16 17:15:55 +07:00
Bright
a0398c9354 fix ออกคำสั่ง, email keycloak 2024-10-16 16:34:36 +07:00
e59f4f13e2 Merge branch 'develop' into adiDev 2024-10-16 15:12:10 +07:00
b60b364b2a fix type field develop create update function 2024-10-16 15:11:13 +07:00
kittapath
2b9cd85532 no message 2024-10-16 14:40:37 +07:00
kittapath
f67dab02a0 no message 2024-10-16 12:00:22 +07:00
kittapath
3ea2c7c3b0 no message 2024-10-16 11:55:45 +07:00
Bright
ad97270752 fix noti ติด promise 2024-10-15 17:20:25 +07:00
bce74cca54 Merge branch 'develop' into adiDev 2024-10-15 16:55:09 +07:00
766888d01c เพิ่มเงื่อนไขการสร้างแบบร่างโครงสร้าง #1024 2024-10-15 16:54:18 +07:00
Bright
5dc3e25aca fix แต่งตั้ง-เลื่อน-ย้าย ไม่ส่งเงินเดือนปัจจุบัน 2024-10-15 13:56:29 +07:00
kittapath
cd9f17867a Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-10-11 13:39:53 +07:00
kittapath
4933ce8599 noti 2024-10-11 13:39:41 +07:00
0cc21ebb0f Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/CommandController.ts
2024-10-11 11:10:04 +07:00
608c8967bc rabbitMQ command 2024-10-11 11:05:31 +07:00
kittapath
2af5598aae migrate workflow 2024-10-11 10:47:15 +07:00
Bright
2e406b14ab fix Error รายการคำร้องขอแก้ไข #658 2024-10-11 10:37:53 +07:00
kittapath
fac7d762aa no message 2024-10-11 10:17:44 +07:00
kittapath
d10c38d1b9 no message 2024-10-11 10:10:50 +07:00
kittapath
87a69017bc no message 2024-10-10 20:50:21 +07:00
kittapath
fd0c421dd9 no message 2024-10-10 20:05:25 +07:00
Bright
b7ae2e35a4 fix #656, #657 2024-10-10 17:58:34 +07:00
kittapath
ee3975c934 no message 2024-10-10 17:42:20 +07:00
kittapath
439564f04e แก้สิด admin 2024-10-10 15:22:47 +07:00
kittapath
ec036d4c59 no message 2024-10-10 14:50:52 +07:00
kittapath
de8944dbc9 no message 2024-10-10 14:35:26 +07:00
kittapath
729f322bf1 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-10-10 13:52:46 +07:00
kittapath
5df50e673c ขอแก้ไขเพิ่มเลขบัตร 2024-10-10 13:50:34 +07:00
Bright
7c8b5d70ed no message 2024-10-10 13:48:20 +07:00
Bright
c92a0516c7 Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/CommandController.ts
2024-10-10 13:28:56 +07:00
Bright
7e33bb8571 Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-10-10 13:07:23 +07:00
Bright
8eb643c435 no message 2024-10-10 13:07:10 +07:00
kittapath
07858809b9 no message 2024-10-10 11:15:33 +07:00