Commit graph

1729 commits

Author SHA1 Message Date
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
Bright
322c2f3665 Merge branch 'develop' into develop-Bright 2024-11-01 16:57:42 +07:00
Bright
b27629a1d1 เพิ่ม body หน้าออกคำสั่ง 2024-11-01 16:57:18 +07:00
1280086ad1 Merge branch 'develop' into adiDev 2024-11-01 16:48:37 +07:00
4d0321e925 fix req update info 2024-11-01 16:47:01 +07:00
Bright
30df664aa7 เพิ่ม body คำสั่ง10 2024-11-01 15:50:52 +07:00
Bright
70ef98707a แก้ค้นหาตำแหน่งบรรจุ #747 2024-11-01 14:42:55 +07:00
kittapath
2b07acf656 add command code 2024-11-01 14:14:13 +07:00
c082ae8891 fix 2024-11-01 13:55:37 +07:00
e0f78a89e9 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/PositionController.ts
2024-11-01 10:47:38 +07:00
e8920ede29 fix search 2024-11-01 10:43:41 +07:00
kittapath
9ce1744885 add posnumber 2024-11-01 09:47:45 +07:00
kittapath
8b86a6120c Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-10-31 21:02:58 +07:00
kittapath
f7cf968870 ตำแหน่งติดเงื่อนไข 2024-10-31 20:59:14 +07:00
1b271b4d5a Merge branch 'develop' into adiDev 2024-10-31 17:49:01 +07:00
2725328dd0 API บันทึกข้อมูลทะเบียนประวัติ จากกรมการปกครอง #91 2024-10-31 17:47:01 +07:00
Bright
c3044ac0b4 fix #708 รายชื่อที่ถูกลบไม่แสดงในระบบโครงสร้าง 2024-10-31 15:18:46 +07:00
kittapath
e974821777 no message 2024-10-31 13:46:32 +07:00
kittapath
4aa3c979b8 no message 2024-10-31 12:53:45 +07:00