Commit graph

7368 commits

Author SHA1 Message Date
f737fe26b1 Merge branch 'develop' into dev
* develop:
  roll back leave fix commander
  fix
  fix
  ระบบลา: ไม่บังคับเลือกผู้บังคับบัญชา
  fix:education
  fix: api
  fix: probation api
  fix(probation):status
  fix
  fix(probation): statusProbationMain
  fix(leave-report) diable  btn search
2025-12-02 17:22:16 +07:00
5cf6edd2f2 roll back leave fix commander 2025-12-02 17:14:30 +07:00
734c688e2a
Merge pull request #1525 from Frappet/fix/discipline
fix
2025-12-02 17:09:02 +07:00
4c227ac8da
Merge pull request #1524 from Frappet/fix/develop
fix
2025-12-02 17:06:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cac4ff2bfa fix 2025-12-02 16:40:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e51db11fe0 fix 2025-12-02 13:28:58 +07:00
ffa3631986 ระบบลา: ไม่บังคับเลือกผู้บังคับบัญชา 2025-12-01 12:03:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cb30bc0c5e fix:education 2025-11-28 15:12:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b036e80092 fix: api 2025-11-28 12:02:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
699997401e fix: probation api 2025-11-28 11:39:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
663c4a9262 fix(probation):status 2025-11-28 10:02:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
74f8363001 fix 2025-11-27 15:54:33 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e686ee5019 fix(probation): statusProbationMain 2025-11-27 15:44:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
094f227bf8 fix(leave-report) diable btn search 2025-11-27 15:39:30 +07:00
3458ae6331 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m18s
* develop:
  remove editor toolbar
2025-11-26 17:58:39 +07:00
d6a6883f95 remove editor toolbar 2025-11-26 17:57:48 +07:00
6063f21e25 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m20s
* develop:
  ปิด/เปิด ให้ดาวน์โหลดใบสมัครสรรหา
2025-11-26 17:41:29 +07:00
55ab6e157f ปิด/เปิด ให้ดาวน์โหลดใบสมัครสรรหา 2025-11-26 17:39:18 +07:00
78924b4d71 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m0s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  fix(probation):fix min-width columns organization
2025-11-25 17:21:26 +07:00
0d78dbf425 Merge branch 'develop' into dev
* develop:
  สรรหาแก้ไขวันที่สมัครให้แสดงเวลา
  fix
  fix(placement):filter
  fix(salary): status isPunish
  fix(probation): probationPersonalList  status
2025-11-25 17:21:20 +07:00
5aa48d73d3 สรรหาแก้ไขวันที่สมัครให้แสดงเวลา 2025-11-25 17:20:38 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ada4f4c010 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m49s
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-11-25 16:56:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d72551f90b fix 2025-11-25 16:55:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6a97b5d9f2 fix(probation):fix min-width columns organization
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m9s
2025-11-25 16:52:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
63e43d2893 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m6s
2025-11-25 15:42:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b5f54c05a0 fix(placement):filter 2025-11-25 15:42:07 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5be1215ed9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m9s
2025-11-25 11:45:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
273487cb50 fix(salary): status isPunish 2025-11-25 10:39:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
38fc145e93 fix(probation): probationPersonalList status 2025-11-25 09:43:44 +07:00
7ba7bb3e21 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m31s
* develop:
  fix: education placement ปีเริ่ม-สิ้นสุดการศึกษา
2025-11-24 20:30:21 +07:00
f5c09829b8 fix: education placement ปีเริ่ม-สิ้นสุดการศึกษา 2025-11-24 20:27:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c7aff2a1f5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m13s
2025-11-24 17:49:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3f318941ab fix:positionLevelName 2025-11-24 17:48:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e32a1e7cf0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m14s
2025-11-24 14:01:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a109289e1c Noiti success 2025-11-24 14:00:46 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d7c9aa9449 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m12s
2025-11-24 13:54:17 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
efe012caa9 fix: sand educationLevelName 2025-11-24 13:53:04 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1e8eea707e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m22s
2025-11-24 11:33:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
40ef47d9e2 fix 2025-11-24 11:33:21 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
1382aacda0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m10s
2025-11-24 10:46:52 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7562509d22 fix: list order placement 2025-11-24 10:46:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a4239f29e2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m10s
2025-11-21 10:10:01 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
34b9e81bb1 fix(placement): seach organizationName 2025-11-21 10:09:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
acf7e1d300 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m11s
2025-11-21 10:01:39 +07:00
448b952498
Merge pull request #1522 from Frappet/fix/manage
fix:width columns fullname
2025-11-21 09:56:31 +07:00
0642a265f4
Merge pull request #1521 from Frappet/fix/qualify
fix:bug  fee
2025-11-21 09:56:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cfac0d38fc fix:width columns fullname 2025-11-20 15:11:14 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f287d57a5c fix:bug fee 2025-11-20 13:37:29 +07:00
Suphonchai Phoonsawat
cc08b74dd7 Merge branch 'develop' into working 2025-11-20 13:25:02 +07:00
Suphonchai Phoonsawat
b56b412bac fix code 2025-11-20 13:24:36 +07:00