Commit graph

2459 commits

Author SHA1 Message Date
e976e51860 ws test 2025-03-07 16:17:01 +07:00
9352c42184 ws test 2025-03-07 16:01:03 +07:00
110d2c84f5 reverse 2025-03-07 13:38:25 +07:00
59da031f4c ws test 3 2025-03-07 13:08:04 +07:00
6475b96f9f ws test 2 2025-03-07 12:43:55 +07:00
3344826fb9 ws test 2025-03-07 12:36:03 +07:00
9d167d0050 reverse 2025-03-07 12:19:04 +07:00
ae07699006 ws test 2025-03-07 12:12:38 +07:00
b1b8ea3c33 Merge branch 'adiDev' into develop
# Conflicts:
#	src/controllers/ReportController.ts
2025-03-07 12:07:36 +07:00
95210572c4 test webSocket 2025-03-07 12:04:23 +07:00
kittapath
747b8e807a Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop
# Conflicts:
#	src/controllers/ReportController.ts
2025-03-07 11:31:39 +07:00
kittapath
cf13eb6598 searh report position 2025-03-07 11:15:50 +07:00
b24a900198 reverse 2025-03-06 18:39:17 +07:00
fa073242b8 test ws 2025-03-06 18:25:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cfcf63b9aa fix 2025-03-06 16:42:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
4ac7528c5c Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2025-03-06 16:34:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e69fd7b33b test 2025-03-06 16:33:47 +07:00
kittapath
504d0ca1b3 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-06 16:31:24 +07:00
kittapath
54fed22902 no message 2025-03-06 16:31:10 +07:00
2c13dae452 Merge branch 'adiDev' into develop 2025-03-06 15:28:58 +07:00
d270eafda3 reverse 2025-03-06 15:28:15 +07:00
kittapath
6638ec29c0 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-06 15:21:30 +07:00
kittapath
f38e5b26f0 sort edu 2025-03-06 15:18:43 +07:00
3a126130cd reverse 2025-03-06 15:13:01 +07:00
4de905972c ws test 2025-03-06 15:04:13 +07:00
42cb907cfc ws test 2025-03-06 14:55:02 +07:00
0f639826c3 webSocket สาธุ99 2025-03-06 14:41:41 +07:00
a828693d2e reverse 2025-03-06 14:08:22 +07:00
92de3059b2 webSocker test 2025-03-06 13:59:58 +07:00
5f91e11042 Merge branch 'develop' into adiDev 2025-03-06 13:49:04 +07:00
7d3847ac0b webSocket test 2025-03-06 13:47:40 +07:00
Bright
e31e98b316 job 2025-03-06 13:00:02 +07:00
kittapath
990d80e64d Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-06 11:41:53 +07:00
kittapath
0210314994 TenurePositionOfficer 2025-03-06 11:41:40 +07:00
7f0a3d1364 reverse 2025-03-06 11:10:25 +07:00
455ed409df webSocket test 2025-03-06 11:04:40 +07:00
kittapath
3474c03b97 test import date 2025-03-06 09:58:38 +07:00
kittapath
abe581f0e5 no message 2025-03-06 00:39:50 +07:00
kittapath
596083b8ee search 2025-03-06 00:31:38 +07:00
kittapath
22828d9dcf Merge branch 'main' of ssh://hrms-git.chin.in.th:6611/BMA-HRMS/hrms-api-org
# Conflicts:
#	src/controllers/ReportController.ts
2025-03-06 00:09:24 +07:00
kittapath
b80ed12f8e แสดง isentry 2025-03-06 00:06:52 +07:00
09826cd9a9 fixing 2025-03-05 23:21:52 +07:00
Bright
053195690d Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop 2025-03-05 18:28:15 +07:00
Bright
c5c8ccd8c0 update 2025-03-05 18:26:19 +07:00
d76a7f90bd Merge branch 'adiDev' into develop 2025-03-05 18:25:51 +07:00
7ef3f9cfb4 webSocket Test 2025-03-05 18:25:11 +07:00
Bright
935ec5dae2 update view 2025-03-05 18:14:40 +07:00
3c0d83631f fixing bug 2025-03-05 17:48:31 +07:00
9fa83891f2 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2025-03-05 17:35:57 +07:00
6cf2477fbe fixing cal position & level 2025-03-05 17:35:46 +07:00