Commit graph

3367 commits

Author SHA1 Message Date
52c3260c06 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-03 11:58:43 +07:00
AdisakKanthawilang
39a1a3bbb0
#1767 (#205)
Some checks failed
release / release (push) Failing after 9s
2025-11-03 11:56:26 +07:00
f32debfbb6 test commit 2025-11-03 10:48:04 +07:00
bc481e9aaa Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
2025-10-31 16:34:21 +07:00
e4200bf2b4 Merge branch 'develop' into dev
* develop: (25 commits)
  fix + test retirement #1903, #1904, #1892
  fix employee
  fix
  fix
  add employee-temp xlsx template (report5)
  test comment all privilage validate
  test comment _workflow privilage validate
  test try catch avatar profile
  recheck script retire 30/10
  fix(ex/retirement): document
  ที่ตำแหน่งแสดงไม่ตรงกับทะเบียนประวัติ #1899 (#204)
  #1889
  feat(ExRetirment):get document
  import salary
  add api key
  #1885 update
  update timezone
  revert #1885
  #1885
  #1884
  ...
2025-10-31 16:34:16 +07:00
harid
0c523a55a4 fix + test retirement #1903, #1904, #1892 2025-10-30 18:56:03 +07:00
7bd799f26a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2025-10-30 18:12:50 +07:00
8a96794e53 fix employee 2025-10-30 18:12:31 +07:00
0e706795f2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
2025-10-30 18:08:10 +07:00
31d7902b88 fix 2025-10-30 18:07:51 +07:00
cd3963be5a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-30 17:56:22 +07:00
01a17ef323 fix 2025-10-30 17:55:36 +07:00
62f476c1fd Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-30 17:41:12 +07:00
440b161664 add employee-temp xlsx template (report5) 2025-10-30 17:36:23 +07:00
a5e8a6a2b5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
2025-10-30 11:06:31 +07:00
2324b50229 test comment all privilage validate
Some checks failed
release / release (push) Failing after 9s
2025-10-30 10:59:45 +07:00
1563a7fb0a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-10-30 10:56:16 +07:00
44038e5497 test comment _workflow privilage validate 2025-10-30 10:55:46 +07:00
47af745a78 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
2025-10-30 10:38:59 +07:00
5b7bf01e9f Merge branch 'develop' into adiDev 2025-10-30 10:37:35 +07:00
1c36e8dac8 test try catch avatar profile 2025-10-30 10:37:13 +07:00
harid
e2da7d479d recheck script retire 30/10 2025-10-29 17:39:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
11586a8fb2 fix(ex/retirement): document 2025-10-28 13:32:53 +07:00
Harid Promsri
05c38b8d8e
ที่ตำแหน่งแสดงไม่ตรงกับทะเบียนประวัติ #1899 (#204)
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-27 16:40:15 +07:00
5138a01461 Merge branch 'develop' into adiDev 2025-10-27 14:59:55 +07:00
a6822b1b33 #1889 2025-10-27 14:58:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
0300e61be5 feat(ExRetirment):get document 2025-10-27 14:32:36 +07:00
mamoss
6fab6c724e import salary 2025-10-25 19:27:41 +07:00
mamoss
f111132184 add api key 2025-10-25 01:55:54 +07:00
harid
c9edbf93f4 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
2025-10-24 15:34:35 +07:00
94ea64247f #1885 update 2025-10-24 10:18:12 +07:00
mamoss
e6329e7922 update timezone 2025-10-22 23:20:18 +07:00
55d6ec73ff revert #1885 2025-10-22 17:24:21 +07:00
b4f81fe582 #1885 2025-10-22 17:12:35 +07:00
137bdb5c0c #1884 2025-10-22 16:31:10 +07:00
dea973f8d9 fix word 2025-10-22 15:57:07 +07:00
harid
ad6b6401d4 log super admin 2025-10-22 15:43:18 +07:00
a1be5c9946 #1894 2025-10-22 14:23:28 +07:00
04484444ec owner privilege 2025-10-22 11:59:49 +07:00
ad3a04ad3f Merge branch 'develop' into adiDev 2025-10-22 11:35:46 +07:00
35011ea959 #1893 2025-10-22 11:34:56 +07:00
d3f2377898 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 54s
* develop:
  fix
  #1888
  fix script: retire remove from org
  fix: script create keycloak
  fix: send token in keycloak function & change script fix retire
  fix
  fix
  update validate privilege (#201)
  แก้ค้นหาชื่อลูกจ้าง (#199)
  update validate สิทธิ์จัดการโครงสร้างในเมนูโครงสร้างอัตตรากำลัง
  Fix #1836 (#197)
  update privilage validate (NORMAL) and update calRetireLaw
  update privilege validate (OWNER)
2025-10-22 11:07:53 +07:00
adisak
783bb95e16 fix 2025-10-21 17:42:21 +07:00
adisak
0929693703 Merge branch 'develop' into adiDev 2025-10-21 15:28:00 +07:00
adisak
9ba31d40eb #1888 2025-10-21 15:27:41 +07:00
42c8f34f15 fix script: retire remove from org 2025-10-21 10:12:23 +07:00
e59ccf88b3 fix: script create keycloak 2025-10-21 00:11:18 +07:00
2429159020 fix: send token in keycloak function & change script fix retire 2025-10-20 23:04:04 +07:00
0f22605784 fix 2025-10-20 18:08:59 +07:00
c14de47250 fix 2025-10-20 18:04:19 +07:00