Commit graph

2034 commits

Author SHA1 Message Date
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
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
c5c8ccd8c0 update 2025-03-05 18:26:19 +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
f0cdce966a Merge branch 'develop' into adiDev 2025-03-05 17:30:00 +07:00
dd02c81008 reverse 2025-03-05 17:29:07 +07:00
Bright
74f20ee50c no message 2025-03-05 17:18:27 +07:00
205034ab4d Merge branch 'adiDev' into develop 2025-03-05 17:03:10 +07:00
01116aed74 webSocket 2025-03-05 17:01:38 +07:00
kittapath
95a7c5809f Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-05 16:58:24 +07:00
kittapath
cf03109db1 แก้รายงานแบบย่อ 2025-03-05 16:58:11 +07:00
9a92b5da71 Merge branch 'develop' into adiDev
# Conflicts:
#	src/controllers/ProfileController.ts
2025-03-05 16:47:23 +07:00
e605aea0ee add report filter1 2025-03-05 16:44:45 +07:00
kittapath
1a39c0bfb1 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-05 15:16:20 +07:00
kittapath
8b8375fe43 แฟ้ประวัติแบบย่อ 2025-03-05 15:15:50 +07:00
4785aad08c updated salary position of user 2025-03-05 15:10:16 +07:00
d2050cbfea Merge branch 'adiDev' into develop 2025-03-05 12:26:49 +07:00
46fad04ee0 commend websocket 2025-03-05 12:26:01 +07:00
kittapath
67f820d283 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-05 12:18:35 +07:00
kittapath
a7e9f78dae create user 2025-03-05 12:18:24 +07:00
fc9e68e5aa webSocket test2 2025-03-05 11:52:58 +07:00
37ec36b374 Merge branch 'develop' into adiDev 2025-03-05 10:47:10 +07:00
e5fb8eada6 report kk1 checkpoint 2025-03-05 10:46:19 +07:00
kittapath
7b2773f557 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-04 22:03:42 +07:00
kittapath
3de21aee5f create user import 2025-03-04 22:03:23 +07:00
0b1cb86ac6 Merge branch 'develop' into adiDev 2025-03-04 18:27:01 +07:00