Commit graph

2409 commits

Author SHA1 Message Date
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
Bright
53e19272d8 migrate 2025-03-05 16:07:14 +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
ad6d694c51 comment websocket 2025-03-04 18:25:31 +07:00
Bright
764e07db17 Merge branch 'develop' into develop-Bright 2025-03-04 18:21:57 +07:00
Bright
74644cc70c update report 2025-03-04 18:21:28 +07:00
4647120172 Merge branch 'develop' into adiDev 2025-03-04 18:07:23 +07:00
d356537604 websocket test 2025-03-04 18:05:56 +07:00
32bb7e3b79 updated condition position & salary 2025-03-04 17:51:57 +07:00
Bright
3b9002f505 no message 2025-03-04 15:49:24 +07:00
kittapath
ac4d893f96 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-03-04 15:30:10 +07:00
kittapath
175c105bed import emtry 2025-03-04 15:29:08 +07:00
ee2ab0a431 Merge branch 'develop' into adiDev 2025-03-04 14:17:21 +07:00
293effa89a fix 2025-03-04 14:14:57 +07:00
Bright
190451a910 เพิ่มตำแหน่งในระดับ 2025-03-04 13:00:33 +07:00
8278d9ddff fix year 2025-03-04 11:00:11 +07:00
dd33feef99 Merge branch 'develop' into adiDev 2025-03-04 10:53:20 +07:00
6ca5706a00 new report kk1 checkpoint 2025-03-04 10:52:23 +07:00
kittapath
53b6256c56 แก้ view 2025-03-04 09:31:05 +07:00
kittapath
3e37cfda83 no message 2025-03-03 15:18:17 +07:00
kittapath
a11b6f152c import data 2025-03-03 14:52:29 +07:00
kittapath
f800e74379 add sql_mode 2025-02-28 14:50:26 +07:00
kittapath
7b2587be7d Merge branch 'develop' 2025-02-28 11:56:03 +07:00
kittapath
f781af3151 add posexcutive date 2025-02-28 11:45:04 +07:00
kittapath
180cdd225e Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-02-27 23:00:24 +07:00
Bright
84af3c725e no message 2025-02-27 18:24:11 +07:00
kittapath
5287e4f286 search รักษาการ 2025-02-27 17:31:44 +07:00
kittapath
c1400a2226 แก้รักษาการเอา3อันดับแรก 2025-02-27 17:11:18 +07:00
dc7a945542 Merge branch 'main' of ssh://hrms-git.chin.in.th:6611/BMA-HRMS/hrms-api-org
* 'main' of ssh://hrms-git.chin.in.th:6611/BMA-HRMS/hrms-api-org:
2025-02-27 16:06:19 +07:00
31663244d3 Merge branch 'develop'
* develop:
  fix
  ระยะเวลาครองตำแหน่ง (ในทะเบียนประวัติ)
  migrate
  หาหัวหน้าปลัด
  no message
  แบบร่างลูกจ้าง
  comment import entry
  no message
  edit build
  update commander-director-position
  fix report
  fix issue #1217
  fix issue #1217
  แก้คำสั่ง
  fix posLevel
  fix issue #1194
  del migrate
  migrate
  fix commandNo : type (String)
2025-02-27 16:05:47 +07:00