Commit graph

1782 commits

Author SHA1 Message Date
da9e89147c Merge branch 'develop' into adiDev 2024-11-12 17:11:31 +07:00
87ca9aa73a add commander name 2024-11-12 17:08:43 +07:00
kittapath
0324205206 noti all admin 2024-11-12 16:51:48 +07:00
kittapath
23f351a135 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-12 16:51:19 +07:00
kittapath
8d5b125dd0 noti admin 2024-11-12 16:51:06 +07:00
Bright
0f757f10e7 fix issue #708 2024-11-12 14:09:20 +07:00
kittapath
07e1a94da0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-12 13:38:20 +07:00
kittapath
5f947d4924 no message 2024-11-12 13:38:07 +07:00
Bright
97eae36fff สร้าง/ลบ userKeycloak เพิ่มเก็บ/ลบ role user 2024-11-12 10:46:33 +07:00
kittapath
d3f65bd4c8 update role user 2024-11-12 09:11:39 +07:00
Bright
855639bd7f api จัดการผู้ใช้งาน 2024-11-11 18:13:11 +07:00
kittapath
6320f4d7db no message 2024-11-11 18:08:13 +07:00
kittapath
3724b2c0a6 no message 2024-11-11 18:04:21 +07:00
kittapath
a87b03262d Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-11 14:53:21 +07:00
kittapath
ae249ebc8e no message 2024-11-11 14:48:14 +07:00
Bright
96957663e5 fix ประวัติการศึกษา 2024-11-11 14:42:31 +07:00
kittapath
6055802f10 add relation profile edit 2024-11-11 13:32:44 +07:00
7f6a07483f fixing return org chart 2024-11-08 17:41:05 +07:00
7378e86244 fix bug & org chart query 2024-11-08 16:57:40 +07:00
kittapath
52ae434f02 no message 2024-11-08 16:34:03 +07:00
Bright
f825914ec2 filter command-type 2024-11-08 15:29:39 +07:00
Bright
f8672b081f fix รายชื่อผู้รับสำเนาคำสั่งไม่แสดง 2024-11-08 14:51:28 +07:00
d7c18c07df Merge branch 'develop' into adiDev
# Conflicts:
#	src/entities/view/viewDirector.ts
#	src/entities/view/viewDirectorActing.ts
2024-11-08 14:08:56 +07:00
f24ff9fa3f viewDirector 2024-11-08 14:05:31 +07:00
Bright
6d13f7b598 add field commandDate & education 2024-11-08 12:11:01 +07:00
kittapath
fb40df8a2a query รักษาการ 2024-11-08 11:46:27 +07:00
kittapath
80a245a033 no message 2024-11-08 10:19:11 +07:00
b4f11cef1f Merge branch 'develop' into adiDev 2024-11-07 16:17:59 +07:00
cd68062867 บันทึกค่า datestart #764 2024-11-07 16:16:46 +07:00
kittapath
2c1e1dd8ff เพิ่มเวลาลูกจ้าง 2024-11-07 15:55:23 +07:00
Bright
b1c365a4da no message 2024-11-07 14:03:40 +07:00
Bright
e2d202d17c Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2024-11-07 13:55:01 +07:00
Bright
3c651fe419 fix คำสั่งให้โอนไม่ปลดตำแหน่ง 2024-11-07 13:53:52 +07:00
kittapath
e701287969 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-11-07 13:48:43 +07:00
kittapath
7efe5261b8 แก้ไขนามสกุลเดิมแม่ 2024-11-07 13:48:30 +07:00
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