Commit graph

1772 commits

Author SHA1 Message Date
Suphonchai Phoonsawat
afb7b60a19 แก้เครื่องราชย์ 2025-05-15 10:06:08 +07:00
Suphonchai Phoonsawat
9af97134f4 Merge branch 'develop' into working 2025-05-15 06:40:41 +07:00
moss
5a33e4690d add isDeputy
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-14 15:26:08 +07:00
moss
a81b8d50fb ที่อยู่ระหว่างลา
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-14 12:35:26 +07:00
Bright
c7dd897909 fix ระบบลา >> แบบรายงาน (ลาประกอบพิธีฮัจญ์) #1493
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-14 12:04:42 +07:00
moss
741eccd933 บันทึกเรียนระบบลา
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-05-14 11:36:38 +07:00
Bright
3f31f68c60 fix บันทึกการพิจารณาของระบบขอลาออกกรณีเส้นอนุมัติ วันที่สิ้นสุดการยับยั้งต้องว่าง #1518
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-13 14:29:49 +07:00
Suphonchai Phoonsawat
2f1cd53493 แก้ ไปประชุม/อบรม/สัมมนา/ปฏิบัติงานที่บ้านนอกสถานที่ ให้ startTime เป็น 09:30 2025-05-13 12:46:25 +07:00
Suphonchai Phoonsawat
9e953cd5d6 fix คำนวนเครื่องราชย์ ลูกจ้าง 2025-05-13 12:27:19 +07:00
Suphonchai Phoonsawat
e653b0e40a Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-13 10:20:19 +07:00
Suphonchai Phoonsawat
847b89da23 fix issue : #1524 2025-05-13 10:16:05 +07:00
Bright
af9ae3e763 fix noti ถึงแก่กรรม #1523 2025-05-13 09:54:24 +07:00
Suphonchai Phoonsawat
f09cea096f fix code 2025-05-13 09:28:45 +07:00
Suphonchai Phoonsawat
4cc57322c0 fix ccode 2025-05-08 22:19:12 +07:00
Suphonchai Phoonsawat
496917c34c fix #1352 2025-05-08 21:06:26 +07:00
Suphonchai Phoonsawat
41bcc2a1ef ปรับการขอยกเลิกการลา ให้สถานะเป็น DELETING จนมีการอนุมัติ แล้วเปลี่ยนเป็น DELETE 2025-05-08 16:36:36 +07:00
Suphonchai Phoonsawat
0367e33768 fix leavereport วันลาพักผ่อน 2025-05-08 16:11:46 +07:00
Suphonchai Phoonsawat
f71cb56a40 fix #1519
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-08 15:30:34 +07:00
Suphonchai Phoonsawat
0451b9e3e1 fixc ลาพักผ่าน adminById
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-08 14:57:38 +07:00
Suphonchai Phoonsawat
c1597c4a5c แก้ format วันที่ภรรยาคลอดบุตร (แปลงเป็นวันที่จาก string)
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-08 14:14:13 +07:00
Suphonchai Phoonsawat
e277279f78 Add ProfileType
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-08 13:19:56 +07:00
moss
4815b43864 แก้แสดงสังกัด
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-08 09:05:39 +07:00
moss
d43d151e75 sort retire
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 23:30:12 +07:00
Bright
d3b22ecf48 fix สังกัดเบิ้ล issue #1394 #1401
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-05-07 17:59:38 +07:00
moss
e452bd9255 Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-05-07 17:14:07 +07:00
moss
64eb77674a เพิ่มวันที่ยับยั่ง 2025-05-07 17:13:57 +07:00
Suphonchai Phoonsawat
2d0475246a Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-05-07 16:45:16 +07:00
Suphonchai Phoonsawat
e351adb5fa add try catch 2025-05-07 16:42:05 +07:00
Bright
47e5df9ba9 [Fix SIT] บรรจุแต่งตั้ง ไม่เข้าทะเบียนประวัติ และไม่ลงโครงสร้าง #119
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 15:55:31 +07:00
Suphonchai Phoonsawat
eeb82dcbe1 Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-05-07 15:36:31 +07:00
Suphonchai Phoonsawat
f3d74681f3 fix #1512 2025-05-07 15:35:34 +07:00
moss
f2a0b754b3 retire add approver
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 15:24:24 +07:00
moss
9f3388eb20 save retire
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 15:19:41 +07:00
moss
95513f0e10 set env page redirect
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 15:16:04 +07:00
Suphonchai Phoonsawat
37bd6cf6ee Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 14:32:05 +07:00
Suphonchai Phoonsawat
48baf99adf fix #1511 และเปลี่ยน Env เพิ่ม VITE_URL_MGT 2025-05-07 14:23:39 +07:00
moss
4da9dc6946 Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 14:17:39 +07:00
moss
2b8713cbe0 retire add approve 2025-05-07 14:17:28 +07:00
Suphonchai Phoonsawat
0b407f3c68 change insigniaTypeId เป็น optional
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 14:05:08 +07:00
Suphonchai Phoonsawat
8ce58201e9 เพิ่มการแสดงรายการตามสิทธิ์
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-05-07 12:55:30 +07:00
Suphonchai Phoonsawat
3880ce6985 fix #1509
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 12:36:23 +07:00
Suphonchai Phoonsawat
e55001e234 fix permission
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 12:01:14 +07:00
Suphonchai Phoonsawat
8f8bcd9cc8 fix xml comment 2025-05-07 11:57:15 +07:00
Suphonchai Phoonsawat
01590c4894 issue #1291 2025-05-07 11:51:19 +07:00
Suphonchai Phoonsawat
e345331381 add field
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-07 06:33:33 +07:00
Suphonchai Phoonsawat
089e70c7c7 fix #901
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-06 19:40:22 +07:00
Suphonchai Phoonsawat
4d500fcdcd Merge branch 'develop' into working 2025-05-06 19:15:01 +07:00
Suphonchai Phoonsawat
fffa6bc374 fix #1414 2025-05-06 19:14:32 +07:00
Bright
21029ca9ce fix รายการลายังไม่แสดงตามสิทธิ์
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-05-06 19:04:17 +07:00
Bright
ed0bde9780 fix #1462, #1476
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-05-06 18:16:14 +07:00