Commit graph

1852 commits

Author SHA1 Message Date
Suphonchai Phoonsawat
ea25f5252b Merge branch 'working' into develop
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-06-19 13:07:42 +07:00
Suphonchai Phoonsawat
826aa8db19 fix employee insignia request cal 2025-06-19 13:06:22 +07:00
kittapath
b1ad88c37b ลบสิทธิ์ลาออก 2025-06-19 09:46:42 +07:00
Bright
9e84bddb65 update issue #1578
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-06-18 15:23:41 +07:00
Suphonchai Phoonsawat
ea55d21f51 add Dna Id Field to Process TimeStamp
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-06-18 13:43:46 +07:00
Bright
e790b50f58 fix bug report #1368, #1578 2025-06-17 18:07:41 +07:00
Suphonchai Phoonsawat
360580535a fix again
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-06-17 14:19:52 +07:00
Suphonchai Phoonsawat
9070378060 แก้ดึงข้อมูลเวลา มาใช้ process time stamp
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-06-17 13:22:39 +07:00
Suphonchai Phoonsawat
2d7459da25 fix Approve การลงเวลากรณีพิเศษ
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-06-17 11:02:42 +07:00
Suphonchai Phoonsawat
326a258e2b add migration placement and retire
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-06-16 14:40:38 +07:00
bc8b681900 update (positionExecutiveField) 2025-06-16 13:45:21 +07:00
706edbd0f0 update placement and retire 2025-06-16 12:10:50 +07:00
Bright
b528f0a81d ปรับเหตุผลคำสั่งลาออก,โอนออก issue #1572 2025-06-11 12:05:46 +07:00
kittapath
afb2cfa189 remove workflow retire 2025-06-11 10:58:47 +07:00
kittapath
61407c342b Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
# Conflicts:
#	BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs
#	BMA.EHR.Application/Repositories/RetirementRepository.cs
2025-06-11 09:17:26 +07:00
Suphonchai Phoonsawat
588e13c3f5 change word 2025-06-11 09:15:52 +07:00
4bf0593b0e fix resign detail 2025-06-10 16:42:37 +07:00
b0cfc2eee9 fix url noti retirement reject & field Id
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-06-10 12:25:21 +07:00
fdae099855 Merge branch 'develop' into adiDev
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-06-10 11:11:34 +07:00
9bde6a9895 #1425 2025-06-10 11:10:40 +07:00
Suphonchai Phoonsawat
b747e3ae68 change word 2025-06-05 15:36:44 +07:00
Suphonchai Phoonsawat
40babdf1a7 ตอนกดขอยกเลิกส่ง noti
- ตอนผู้ยื่นกดขอยกเลิกแจ้งมาที่ผู้มีอำนาจ
 - ผู้มีอำนาจอนุมัติหรือไม่อนุมัติ แจ้งผู้ยื่น และผู้บังคับบัญชาที่มีใน list
2025-06-05 15:15:49 +07:00
Suphonchai Phoonsawat
7e3ae58b33 นับ || x.LeaveStatus == "DELETING" เข้าไปในรายการ Approve ด้วย 2025-06-05 14:41:58 +07:00
moss
dff98272dd Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop 2025-06-05 12:16:58 +07:00
moss
237567e5ab edit path noti 2025-06-05 12:16:50 +07:00
Bright
a494020d37 fix bug 2025-06-05 11:24:18 +07:00
Bright
78a47bc735 fix issue #1568 (convert thaiNumber) 2025-06-05 09:52:12 +07:00
moss
13709c65ef Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop 2025-06-04 18:24:46 +07:00
moss
d539f6fa4a แก้ชื่อ noti 2025-06-04 18:24:30 +07:00
Bright
ffecbf7df2 fix issue #1554, #1558 2025-06-04 17:01:55 +07:00
moss
b260e4067f ออกคำสั่งลูกจ้าง 2025-06-04 16:19:06 +07:00
Suphonchai Phoonsawat
6ad83ecc53 fix migration 2025-06-04 10:02:32 +07:00
Bright
175232148b fix issue #1543 2025-05-30 14:04:33 +07:00
moss
be9545f37c Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop 2025-05-30 12:38:25 +07:00
moss
75d8434935 check type officer 2025-05-30 12:38:07 +07:00
Suphonchai Phoonsawat
22304e7186 Merge branch 'develop' into working 2025-05-30 11:55:55 +07:00
Suphonchai Phoonsawat
fb76f5737a fix cronjob 2025-05-30 11:55:23 +07:00
moss
c49375718d add mark insignia 2025-05-30 11:36:48 +07:00
moss
db84cdbf29 check type insignia 2025-05-30 10:58:15 +07:00
Suphonchai Phoonsawat
96246d5853 Merge branch 'develop' into working 2025-05-30 10:42:27 +07:00
e0ed1fc240 Merge branch 'develop' into adiDev 2025-05-29 17:47:56 +07:00
25f6ebcdd7 #1423 2025-05-29 17:46:42 +07:00
Suphonchai Phoonsawat
ad72bc7ff6 fix bug 2025-05-29 16:30:08 +07:00
moss
cf6f0feef5 Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop 2025-05-29 15:00:16 +07:00
moss
97b5bd1176 status camcel 2025-05-29 14:59:57 +07:00
Suphonchai Phoonsawat
88270a230f fix #1357 ปรับ API 2025-05-29 13:57:44 +07:00
Suphonchai Phoonsawat
7b55e16e7d เส้นดาวน์โหลดรายชื่อของลูกจ้างแสดงไม่ถูกต้อง #1357 2025-05-29 13:10:27 +07:00
Suphonchai Phoonsawat
c3c9c85d30 fix #1357 2025-05-29 13:08:06 +07:00
Bright
d0e39e385b เปลี่ยน Method เส้นอัพเดท mark 2025-05-29 12:07:49 +07:00
moss
de72adc3ae search retriement cancel 2025-05-29 11:22:14 +07:00