Commit graph

1688 commits

Author SHA1 Message Date
41c8b8263b Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/CommandController.ts
#	src/controllers/ProfileController.ts
2024-11-07 13:30:56 +07:00
3b3b6e605e เงินเดือนล่าสุดดึงจาก profile #760 2024-11-07 13:27:29 +07:00
kittapath
ff6b246143 no message 2024-11-07 11:46:41 +07:00
13ae3987c7 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-07 10:58:52 +07:00
37b68c0a4b order view workflow 2024-11-07 10:58:40 +07:00
kittapath
19c332af57 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-07 10:52:01 +07:00
kittapath
6d50bd3b2f no message 2024-11-07 10:51:50 +07:00
Bright
dd05bb1e41 กรองคนที่พ้นสภาพ 2024-11-07 10:14:19 +07:00
kittapath
7d8c278710 no message 2024-11-07 09:56:47 +07:00
kittapath
03a9b1fb6f no message 2024-11-06 17:12:06 +07:00
kittapath
bce6b46eb7 no message 2024-11-06 16:56:35 +07:00
kittapath
f4ef62e0e0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-06 16:24:22 +07:00
kittapath
490c76060d รักษาการ 2024-11-06 16:23:46 +07:00
kittapath
147cf17b38 add director 2024-11-06 16:22:11 +07:00
Bright
2e6a4c88f3 fix คำสั่งผ่านทดลองาน 2024-11-06 16:20:53 +07:00
kittapath
fa420d10ab profile emp 2024-11-06 10:34:55 +07:00
kittapath
2f6fa989d6 no message 2024-11-06 10:32:02 +07:00
Bright
ba063f8fea fix ฝ่าย/สังกัด 2024-11-06 09:50:58 +07:00
Bright
0816d6b0e3 fix แนบท้ายคำสั่งรักษาการ 2024-11-05 22:45:44 +07:00
kittapath
cf3604929f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-05 22:05:55 +07:00
kittapath
a425fb4848 no message 2024-11-05 22:05:12 +07:00
37fc689ecc สร้าง user ประจำของ keycloak #759 2024-11-05 17:26:42 +07:00
458fb90187 Merge branch 'develop' into adiDev 2024-11-05 15:37:19 +07:00
23b5a12804 fix #1124 2024-11-05 15:36:26 +07:00
kittapath
44c1b8b903 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-05 15:00:46 +07:00
kittapath
24038b9597 add director 2024-11-05 14:56:14 +07:00
66774818ca Merge branch 'develop' into adiDev 2024-11-05 14:23:37 +07:00
669783b65f เพิ่มฟิว posNo 2024-11-05 14:22:39 +07:00
kittapath
9e65b57fdf no message 2024-11-05 13:34:40 +07:00
kittapath
0d1734f497 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-05 10:46:36 +07:00
kittapath
aa2d930d75 no message 2024-11-05 10:46:26 +07:00
96b3c216cc เก็บเงินเดือนล่าสุดเพิ่ม #758 2024-11-05 10:00:18 +07:00
kittapath
b5384b6d46 profileemp add amount 2024-11-05 09:37:44 +07:00
kittapath
1f7fa3160e รักษาการ 2024-11-05 09:32:59 +07:00
kittapath
d6f5b87eee updata_table_profile_add_salary 2024-11-05 09:26:15 +07:00
48ce332d19 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileController.ts
2024-11-04 17:23:40 +07:00
69826b394d ปีที่อัพโหลดรูป kk1 2024-11-04 17:20:07 +07:00
kittapath
f61290b49d delete view 2024-11-04 17:17:03 +07:00
kittapath
999e77582e หมายเหตุออกคำสั่ง 2024-11-04 17:12:00 +07:00
kittapath
4a036a5dd9 add commander-director-act 2024-11-04 16:09:05 +07:00
kittapath
8a2d5cce38 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-04 13:29:41 +07:00
kittapath
d2974a12ab no message 2024-11-04 13:29:30 +07:00
087b2ddfd6 Merge branch 'develop' into adiDev 2024-11-04 12:16:49 +07:00
e3bcb0c52c sort step and fix return report kp7 , kk1 and kk1-emp 2024-11-04 12:15:16 +07:00
c1d35afbbf updated 2024-11-04 12:03:09 +07:00
af38addf46 เพิ่มฟิวแสดงผล Get /api/v1/org/command/step/{commandId} 2024-11-04 11:16:37 +07:00
2701359a88 Merge branch 'develop' into adiDev 2024-11-04 10:58:50 +07:00
7570d2678c checkpoint kk1 officer 2024-11-04 10:57:17 +07:00
kittapath
016fb3da91 digital sign 2024-11-01 19:53:26 +07:00
kittapath
0b2650e17c table sign 2024-11-01 17:21:57 +07:00