Commit graph

2159 commits

Author SHA1 Message Date
9dfd5efafc Merge branch 'develop'
Some checks failed
DockerHub Release - Leave Service / release-to-dockerhub (push) Failing after 11s
* develop:
  remove workflow integration from LeaveRequestController #2164
2026-01-09 11:05:53 +07:00
Suphonchai Phoonsawat
14eb80a30e Merge branch 'develop' into working 2026-01-07 12:07:21 +07:00
Suphonchai Phoonsawat
e8dfe976a2 remove workflow integration from LeaveRequestController #2164 2026-01-07 12:06:49 +07:00
8f491c1b12 Merge branch 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-backend
* 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-backend:
2026-01-07 11:28:51 +07:00
a6de2791c4 Merge branch 'develop'
* develop:
  #2150
  fix รันเครื่องราชแต่หน่วยงานไม่ครบ #1831
  ปรับ query แบบใบขอยกเลิกวันลา
  find org v2
  change to v2
2026-01-07 11:28:39 +07:00
4865bab7e2 Merge branch 'develop' into adiDev 2026-01-05 16:39:14 +07:00
f9ca9b52af #2150 2026-01-05 16:38:30 +07:00
harid
517755d758 fix รันเครื่องราชแต่หน่วยงานไม่ครบ #1831 2026-01-05 16:12:11 +07:00
harid
05689b5338 ปรับ query แบบใบขอยกเลิกวันลา 2026-01-05 13:20:00 +07:00
kittapath
a381ff1528 Merge branch 'develop'
Some checks failed
DockerHub Release - Leave Service / release-to-dockerhub (push) Failing after 11s
2026-01-02 21:57:09 +07:00
kittapath
909042445c find org v2
Some checks failed
release-dev / release-dev (push) Failing after 12s
2026-01-02 21:47:26 +07:00
kittapath
adb8e31308 Merge branch 'develop'
Some checks failed
DockerHub Release - Leave Service / release-to-dockerhub (push) Failing after 12s
2025-12-31 10:08:06 +07:00
kittapath
0b0cc53e07 change to v2 2025-12-31 10:07:01 +07:00
72b9c6e31e remove build forgejo, move to dev branch
Some checks failed
DockerHub Release - Leave Service / release-to-dockerhub (push) Failing after 15s
2025-12-31 08:02:16 +07:00
9fe3c82a9b Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m24s
* develop:
  leave v2
2025-12-31 07:45:50 +07:00
kittapath
8973e1b78f leave v2 2025-12-30 23:55:03 +07:00
Suphonchai Phoonsawat
4a94aae6e3 Merge branch 'develop' 2025-12-26 09:58:00 +07:00
Suphonchai Phoonsawat
7caf1cc8d6 add date range parameters to GetProfileByAdminRole and GetEmployeeByAdminRole methods 2025-12-26 09:51:51 +07:00
c87e467a6e change build to docker hub 2025-12-23 23:32:02 +07:00
d10c86e0cb add: build docker hub 2025-12-23 21:50:04 +07:00
2b1d6852c9 add build placement 2025-12-23 21:18:04 +07:00
bde1aa21c9 test build leave 2025-12-23 21:09:15 +07:00
8bb31b4e73 updated deploy 2025-12-23 20:30:37 +07:00
804a4cf85f add: build leave 2025-12-23 20:21:25 +07:00
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