Commit graph

2028 commits

Author SHA1 Message Date
fbcd1b6984 Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
Build & Deploy Discipline Service / build (push) Successful in 1m19s
* develop: (27 commits)
  แก้บรรจุ
  test parent
  แก้ search ช้า
  refactor code
  delete comment
  edit query
  ปรับให้จัด group ตามที่กรอง (#1858)
  ทำฟังก์ชันกลางคำนวณปีงบประมาณ
  fix sort api/v1/leave/search (#1852)
  fix sort /api/v1/leave/admin/edit (#1848)
  จัด Align (#1846)
  fix #1841, #1842
  fix timestamp report #1843 (#1844)
  add parent
  sort Discipline
  #1838
  sortBy #1814
  fix report
  fix #1835
  fix #24
  ...

# Conflicts:
#	BMA.EHR.Insignia/Services/InsigniaRequestProcessService.cs
2025-10-14 12:27:30 +07:00
kittapath
81658054f8 แก้บรรจุ
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-10-13 23:06:02 +07:00
kittapath
f97e643ac1 test parent 2025-10-12 16:51:51 +07:00
kittapath
84ab5e79d6 แก้ search ช้า 2025-10-12 16:11:31 +07:00
51962eea16
Merge pull request #1863 from Frappet/issue/#1859
Some checks failed
release-dev / release-dev (push) Failing after 10s
ทำฟังก์ชันกลางคำนวณปีงบประมาณ
2025-10-10 10:14:34 +07:00
kittapath
ed1bb838ce refactor code 2025-10-09 23:21:36 +07:00
kittapath
8ba9d349db delete comment 2025-10-09 22:16:19 +07:00
kittapath
559765dd86 Merge branch 'develop' into task/173
# Conflicts:
#	BMA.EHR.Leave/Controllers/LeaveController.cs
2025-10-09 21:44:58 +07:00
kittapath
4ba48d0e70 edit query 2025-10-09 21:43:25 +07:00
Harid Promsri
5f0a0b1a46
ปรับให้จัด group ตามที่กรอง (#1858)
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-09 16:49:10 +07:00
harid
3d9f922fc9 ทำฟังก์ชันกลางคำนวณปีงบประมาณ 2025-10-09 16:43:37 +07:00
AdisakKanthawilang
fe4a174bf7
fix sort api/v1/leave/search (#1852)
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-08 17:23:10 +07:00
AdisakKanthawilang
f784205412
fix sort /api/v1/leave/admin/edit (#1848) 2025-10-08 11:01:57 +07:00
Harid Promsri
0dcabaa25d
จัด Align (#1846)
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-07 17:15:32 +07:00
Suphonchai Phoonsawat
4494939c5f fix #1841, #1842
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-10-07 14:52:59 +07:00
Harid Promsri
7ddc1debfc
fix timestamp report #1843 (#1844)
Some checks failed
release-dev / release-dev (push) Failing after 12s
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-07 13:17:58 +07:00
kittapath
9e8fe1b30a add parent 2025-10-07 11:13:28 +07:00
1ec8e51c37 Merge branch 'develop' into adiDev
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-10-06 16:28:42 +07:00
12c8bc5014 sort Discipline 2025-10-06 16:28:16 +07:00
Suphonchai Phoonsawat
ad6a458973 Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-06 15:37:39 +07:00
Suphonchai Phoonsawat
f9d1dd9f38 #1838 2025-10-06 15:37:13 +07:00
harid
5efb1c99c6 sortBy #1814
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-06 15:12:40 +07:00
Suphonchai Phoonsawat
946721ffb2 fix report
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-06 12:30:48 +07:00
Suphonchai Phoonsawat
8529c3d801 fix #1835
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-06 11:30:06 +07:00
Suphonchai Phoonsawat
97dd104429 fix #24
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-03 20:28:49 +07:00
harid
d0599aedea comment เพราะไม่ได้ใช้แล้ว #1831
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-10-03 11:04:39 +07:00
Suphonchai Phoonsawat
ddf899ce5d Merge branch 'develop' into working
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-10-02 19:51:20 +07:00
Suphonchai Phoonsawat
1e275748a0 fix #26, #1832 2025-10-02 19:50:55 +07:00
harid
389adeec2f Fix Error #1815
Some checks failed
release-dev / release-dev (push) Failing after 12s
root || owner กรองตาม fe ส่ง
2025-10-02 17:11:22 +07:00
Suphonchai Phoonsawat
faf62f1985 #1831
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-10-01 20:06:32 +07:00
Suphonchai Phoonsawat
8d37024b6c #1832, 1830
Some checks failed
release-dev / release-dev (push) Failing after 13s
2025-10-01 19:57:13 +07:00
Suphonchai Phoonsawat
1f3632744d Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-10-01 15:24:46 +07:00
Suphonchai Phoonsawat
9de97f9d90 fix fiscal year in check leave 2025-10-01 15:24:33 +07:00
harid
2aa66acfd0 ประกาศเกษียณ ส่งวันที่ประกาศเพิ่ม
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-10-01 11:46:48 +07:00
95c62accef Merge branch 'develop'
Some checks failed
Build & Deploy Leave Service / build (push) Has been cancelled
2025-09-30 18:05:28 +07:00
harid
e51ca439f9 กำหนดให้ไฟล์ template ถูก copy ไป output ตอน build/publish
Some checks failed
release-dev / release-dev (push) Failing after 12s
2025-09-30 16:54:14 +07:00
harid
edbd337ab6 รายงานลงเวลา ปรับให้การแสดงผลเหมือนเดิมก่อนแก้ไข #1815
Some checks failed
release-dev / release-dev (push) Failing after 12s
เปลี่ยนจากโหลดโดยตรงเป็นผ่านโคลนจากtemplate
2025-09-30 15:00:02 +07:00
Bright
373e2a06d8 no message
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-09-29 15:00:02 +07:00
Bright
777f4d0930 no message
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-09-29 13:44:35 +07:00
Bright
be45cf58b8 #1409 แก้เป็นส่ง refId ของคำสั่งขอลาออกไปค้นที่ command ก่อนอัพ status = CANCEL
Some checks failed
release-dev / release-dev (push) Failing after 10s
2025-09-29 11:44:31 +07:00
Bright
081260a83b ยกเลิกลาออก ยิงกลับไปที่ command เปลี่ยนเป็น cancel
Some checks failed
release-dev / release-dev (push) Failing after 11s
2025-09-25 18:18:01 +07:00
kittapath
77eaca72b3 ออกคำสั่งยกเลิก 2025-09-25 02:30:33 +07:00
6fb574f9de fix cicd all service
All checks were successful
Build & Deploy Insignia Service / build (push) Successful in 1m19s
2025-09-16 19:13:14 +07:00
0dcd76c302 fix
All checks were successful
Build & Deploy Placement Service / build (push) Successful in 1m29s
2025-09-16 18:52:04 +07:00
33e8bf5ab7 Revert "fix"
This reverts commit e52d6430b0.
2025-09-16 18:26:51 +07:00
6d42484297 Revert "fix"
This reverts commit f1c3163116.
2025-09-16 18:26:33 +07:00
f1c3163116 fix
Some checks failed
Build & Deploy Placement Service / build (push) Failing after 0s
2025-09-16 18:22:33 +07:00
9a4e49eb88 Revert "fix"
This reverts commit 69af557f95.
2025-09-16 18:16:35 +07:00
69af557f95 fix
Some checks failed
Build & Deploy Placement Service / build (push) Failing after 18s
2025-09-16 18:15:29 +07:00
e52d6430b0 fix
Some checks failed
Build & Deploy Placement Service / build (push) Failing after 1m41s
2025-09-16 17:57:57 +07:00