Commit graph

3290 commits

Author SHA1 Message Date
mamoss
a4f7b021a0 Merge branch 'task/173' into develop 2025-10-09 23:24:59 +07:00
mamoss
847d9c302f cdhแก้คิวรี่ให้เร็วขึ้น สร้าง workflow 2025-10-09 23:24:04 +07:00
Kittapath
6328de1a5c
remove role add relation (#191)
Co-authored-by: mamoss <>
2025-10-08 23:03:02 +07:00
AdisakKanthawilang
e0e850b4c7
ปรับเงื่อนไข admin ให้เห็นข้อมูลทั้งสังกัด (#186) 2025-10-07 17:18:54 +07:00
AdisakKanthawilang
564d7d96c3
#176 (#185)
* #176

* delete log
2025-10-07 14:59:11 +07:00
mamoss
fd17f366b8 add parent 2025-10-07 11:14:00 +07:00
Kittapath
4c16c9859a
test commit (#184)
Co-authored-by: mamoss <>
2025-10-06 17:24:36 +07:00
Kittapath
2f3a377d38
Task/1 (#183)
* refactor code create user emp

* test pull request

* test

* test noti

* test noti

* test noti link

* test

---------

Co-authored-by: mamoss <>
2025-10-06 16:29:04 +07:00
Kittapath
c5710da78e
Task/1 (#182)
* refactor code create user emp

* test pull request

* test

* test noti

* test noti

* test noti link

---------

Co-authored-by: mamoss <>
2025-10-06 16:11:07 +07:00
Kittapath
40f1a08b90
refactor code create user emp (#177)
Co-authored-by: mamoss <>
2025-10-06 15:08:15 +07:00
AdisakKanthawilang
79b8e9f1ba
Merge pull request #174 from Frappet/fix-script
send admin token
2025-10-06 10:36:49 +07:00
harid
bb13a34dfa send admin token 2025-10-06 10:33:21 +07:00
cd9c1721c1 fix sort registry and filter node of registry retire 2025-10-04 13:54:17 +07:00
abab998cd0 fix bug run delete keycloak 2025-10-03 22:18:32 +07:00
f28aca5c1d rollback code registry 2025-10-03 17:33:44 +07:00
3fe1156155 fix sort org 2025-10-03 17:30:08 +07:00
decb2433de fix script run retire this year 2025-10-03 17:14:20 +07:00
aadcec440e fix sort registry and add script update retire emp / position select 2025-10-03 17:04:05 +07:00
harid
ba9fea8403 no message 2025-10-03 16:57:07 +07:00
39de2a4b34 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
* 'develop' of github.com:Frappet/bma-ehr-organization:
  revert 01/10
2025-10-03 16:45:03 +07:00
53e6d6fb48 fix script retire and fix bug filter registry retire 2025-10-03 16:44:43 +07:00
harid
eb2625ca0b revert 01/10 2025-10-03 16:44:26 +07:00
harid
c89d1bb6cc Merge branch 'develop' into develop-Bright 2025-10-03 16:24:39 +07:00
harid
5259b0beae ทดสอบรันสคริปเกษียณ 03/10 16.30 2025-10-03 16:24:32 +07:00
harid
98ea934210 ทดสอบรันสคริปเกษียณ 03/10 16.30 2025-10-03 16:19:13 +07:00
d113ac6dfe fix error sortBy default 2025-10-03 16:18:48 +07:00
d1ec7b76aa fix sort and add development api 2025-10-03 15:32:55 +07:00
682ff3a061 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
* 'develop' of github.com:Frappet/bma-ehr-organization:
  fix
  sort

# Conflicts:
#	src/controllers/ProfileController.ts
2025-10-03 13:10:29 +07:00
b76895012c fix registry retire 2025-10-03 13:05:24 +07:00
f507bd8677 fix 2025-10-03 10:45:28 +07:00
0ef11abe2b Merge branch 'adiDev' into develop 2025-10-03 10:29:10 +07:00
0172aa9496 sort 2025-10-03 10:28:51 +07:00
4994c829b5 fix query registry retire & sort registry of employee 2025-10-02 18:42:14 +07:00
harid
b5823fdf28 emp 2025-10-02 18:17:19 +07:00
harid
7a25e8feda Fix Error #1815 2025-10-02 17:16:36 +07:00
3ae5e6a233 Merge branch 'develop' into adiDev 2025-10-02 15:19:15 +07:00
342c7dde67 comment เครียร์ตำแหน่งลูกจ้างหลังลบออกจากครองตำแหน่ง 2025-10-02 15:18:48 +07:00
bd49d8f0f8
Merge pull request #172 from Frappet/Retirement2568
Retirement2568
2025-10-02 15:01:44 +07:00
b7a609dc79
Delete .forgejo/workflows/deploy.yml 2025-10-02 14:50:56 +07:00
58c9833be9
Delete .forgejo/workflows/ci-cd.yml 2025-10-02 14:50:25 +07:00
1a1da7b584
Delete .forgejo/workflows/build.yml 2025-10-02 14:49:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b2fafc68e8 add retirement 2025-10-02 14:44:12 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2403b88737 Merge branch 'develop' into Retirement2568 2025-10-02 14:43:17 +07:00
5efb7346d6 Merge branch 'develop' into adiDev 2025-10-02 14:37:57 +07:00
4be0b068bc #170 and calAge 2025-10-02 14:37:25 +07:00
harid
364e697293 revert 2025-10-02 11:42:01 +07:00
harid
6b719049b0 update script รันเกษียณ #169 2025-10-02 11:40:01 +07:00
harid
7ffb698252 test job เกษียณ 2025-10-01 22:21:16 +07:00
e5dfed9312 fix query 2025-10-01 17:58:36 +07:00
a45d3744e5 Merge branch 'adiDev' into develop 2025-10-01 17:41:50 +07:00