Commit graph

2135 commits

Author SHA1 Message Date
harid
b03be82f7c Merge branch 'develop'
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m7s
2025-12-23 18:04:16 +07:00
harid
b2fcc4a5b9 fix #2082 2025-12-23 18:02:59 +07:00
ed26d8443c Merge branch 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend
* 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend:
2025-12-23 17:20:35 +07:00
b55e1d1f63 Merge branch 'develop'
* develop:
  กรองสิทธิ์หน้ารายชื่อผู้ถูกพักราชการ #2084
  #2146 and #2147
  add filter status #2083
  #2142
  fix: update image retrieval logic in LeaveController and adjust RabbitMQ configuration in appsettings
  #2132
  fix ลาติดตามคู่สมรส รายงานแสดง Null
  แก้เอกสารรายงานการลา #2109
  fix: enhance database context configuration with retry logic for resilience
  fix: update end time parsing and improve attendance status logic
  fix: update leave remark formatting for better clarity
  fix report leave12
  fix: improve approval step validation by checking for commanders
  feat: enhance leave request filtering and update configuration settings
  query leave report
  add permission brother
  migrate + api บันทึกผู้ตรวจสอบและส่งไปพิจาณา #2109
2025-12-23 17:20:13 +07:00
harid
99838ba1ff Merge branch 'develop'
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m22s
2025-12-22 16:16:41 +07:00
harid
fd8e0e78b6 กรองสิทธิ์หน้ารายชื่อผู้ถูกพักราชการ #2084 2025-12-22 16:16:07 +07:00
37281fc036 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m13s
2025-12-22 13:45:37 +07:00
fb282915d1 #2146 and #2147 2025-12-22 13:45:11 +07:00
harid
80dca3dfac Merge branch 'develop'
All checks were successful
Build & Deploy Discipline Service / build (push) Successful in 1m16s
2025-12-22 09:50:24 +07:00
harid
3b58d38eb1 add filter status #2083 2025-12-22 09:49:59 +07:00
121e605699 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m8s
2025-12-19 14:24:09 +07:00
97c9064ab5 #2142 2025-12-19 14:23:27 +07:00
harid
e0d253cc68 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m6s
2025-12-18 16:32:13 +07:00
Suphonchai Phoonsawat
d5c2c54eaa fix: update image retrieval logic in LeaveController and adjust RabbitMQ configuration in appsettings
Some checks failed
release-dev / release-dev (push) Failing after 13s
#2138
2025-12-18 14:08:05 +07:00
90cb343941 Merge branch 'develop'
All checks were successful
Build & Deploy Placement Service / build (push) Successful in 1m10s
2025-12-17 16:08:43 +07:00
d6497a5d51 #2132
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-12-17 15:38:35 +07:00
harid
9becd892f5 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
2025-12-16 11:56:49 +07:00
harid
cc8cd77560 fix ลาติดตามคู่สมรส รายงานแสดง Null
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-16 10:37:27 +07:00
harid
7e039b798d Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m16s
2025-12-15 18:17:53 +07:00
harid
795502a93c แก้เอกสารรายงานการลา #2109
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-15 16:46:37 +07:00
harid
d703337b4b Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m10s
2025-12-15 14:29:42 +07:00
Suphonchai Phoonsawat
18ab28e335 fix: enhance database context configuration with retry logic for resilience
Some checks failed
release-dev / release-dev (push) Failing after 14s
2025-12-15 11:12:29 +07:00
Suphonchai Phoonsawat
ff66aebdfa fix: update end time parsing and improve attendance status logic
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-15 10:29:23 +07:00
Suphonchai Phoonsawat
e023ed65f7 fix: update leave remark formatting for better clarity
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-15 09:48:08 +07:00
harid
d7ebe9cdca Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m9s
2025-12-12 17:51:30 +07:00
harid
02a5eacd0f fix report leave12
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-12 17:51:04 +07:00
harid
199d0c90e3 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m3s
2025-12-12 16:17:37 +07:00
Suphonchai Phoonsawat
328f54b4e3 fix: improve approval step validation by checking for commanders
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-12 16:13:01 +07:00
harid
0e21e10d24 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m2s
2025-12-12 15:42:55 +07:00
Suphonchai Phoonsawat
88a48577e9 feat: enhance leave request filtering and update configuration settings
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-12 15:18:27 +07:00
harid
23a6058eba query leave report
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-12 12:27:52 +07:00
harid
07dd715e16 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m2s
Build & Deploy Discipline Service / build (push) Successful in 1m4s
Build & Deploy Placement Service / build (push) Successful in 1m6s
Build & Deploy Insignia Service / build (push) Successful in 1m6s
Build & Deploy Retirement Service / build (push) Successful in 1m12s
2025-12-12 09:41:07 +07:00
kittapath
ec04665f39 add permission brother
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-12 01:36:06 +07:00
harid
0a58075428 migrate + api บันทึกผู้ตรวจสอบและส่งไปพิจาณา #2109
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-11 21:27:18 +07:00
b6862b93bf Merge branch 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend
* 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend:
2025-12-11 17:41:00 +07:00
b51cf9a919 Merge branch 'develop'
* develop:
  fix: สิทธิ์ PARENTข้อมูลแต่ละสำนักไม่เท่ากัน
  feat: add DNA update functionality and enrich leave beginning data with profile details
  fix: skip approver check if no commander is assigned; update leave data retrieval logic
  rollback user/calendar & add api admin/calendar
  แก้กรองตามสิทธิ์ #2104
2025-12-11 17:40:42 +07:00
harid
14cc614864 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m6s
2025-12-09 15:02:25 +07:00
harid
59fd20c879 fix: สิทธิ์ PARENTข้อมูลแต่ละสำนักไม่เท่ากัน
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-09 15:00:18 +07:00
Suphonchai Phoonsawat
fc68cb0101 feat: add DNA update functionality and enrich leave beginning data with profile details
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-12-09 13:12:54 +07:00
Suphonchai Phoonsawat
6b9767449c fix: skip approver check if no commander is assigned; update leave data retrieval logic
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-12-09 10:36:06 +07:00
harid
51f1a4c563 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m11s
2025-12-08 17:42:56 +07:00
harid
2981f865b3 rollback user/calendar & add api admin/calendar
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-12-08 17:40:12 +07:00
harid
b4e303e0a7 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m10s
2025-12-08 12:12:48 +07:00
harid
08fb06ca84 แก้กรองตามสิทธิ์ #2104 2025-12-08 12:12:04 +07:00
ec3b267a6c Merge branch 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend
* 'main' of https://192.168.1.60/hrms-bangkok/hrms-api-backend:
2025-12-08 10:11:18 +07:00
a047787fb4 Merge branch 'develop'
* develop:
  fix: skip notification if no commander is assigned; update connection strings in appsettings
  edit permission normal
  fix สิทธิ์เมนูจำนวนสิทธิ์การลาที่ใช้ไป #2094
  Fix รายงานใบสมัครสอบส่วนเนื้อหาคำรับรองเพี้ยน #2099
  migration files
  migrate to CM Server
  no message
  fix role
  แก้ไขข้อความให้ตรงกับฝั่ง ui (ทาง กทม. แจ้งให้แก้ไขข้อความค่ะ)
  แก้ไขข้อความให้ตรงกับฝั่ง ui (ทาง กทม. แจ้งให้แก้ไขข้อความค่ะ)
  no message
  fix bug เพิ่ม-แก้ไขข้อมูลประวัติการศึกษาไม่อัปเดต #2022, #2025
  fix #2016, #2017
  fix ใบสมัครสอบ
  fix ยืมคืนเครื่องราชย?มาใช้่ RootDnaId แทน rootId
  fix ใบสมัครสอบคัดเลือก #2016, #2017, #2018
  fix issue #2007
  fix issues 1972
  migrate
2025-12-08 10:11:10 +07:00
harid
21c10d66f5 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m11s
Build & Deploy Insignia Service / build (push) Successful in 1m10s
Build & Deploy Placement Service / build (push) Successful in 1m13s
Build & Deploy Discipline Service / build (push) Successful in 1m27s
2025-12-08 09:26:10 +07:00
Suphonchai Phoonsawat
7778f6cccd fix: skip notification if no commander is assigned; update connection strings in appsettings
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-12-08 05:32:32 +07:00
kittapath
436370312e edit permission normal 2025-12-06 18:03:33 +07:00
harid
5451c49dbe fix สิทธิ์เมนูจำนวนสิทธิ์การลาที่ใช้ไป #2094 2025-12-04 22:13:25 +07:00