Commit graph

1255 commits

Author SHA1 Message Date
kittapath
576f6bcc0d แก้ controller temp 2024-08-13 13:39:52 +07:00
JoolsoftAdmin
6895e764ad Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-08-13 11:03:55 +07:00
JoolsoftAdmin
23e5d4f7fe แก้api ลูกจ้างประจำ 2024-08-13 11:03:42 +07:00
Bright
0a6d093186 Merge branch 'develop' into develop-Bright 2024-08-13 10:50:56 +07:00
Bright
031ee3fe51 fix report กพ.7/กก.1 2024-08-13 10:50:31 +07:00
JoolsoftAdmin
ab138c2e04 แก้ชื่อสิท 2024-08-13 10:25:58 +07:00
JoolsoftAdmin
828dd2a37d แก้ออกคำสั่งวินัย 2024-08-09 17:31:33 +07:00
JoolsoftAdmin
5c2bf5fb42 no message 2024-08-09 17:20:59 +07:00
a91410dcdc Merge branch 'develop' into adiDev 2024-08-09 10:18:12 +07:00
8d087d3a3b logs setup 2024-08-09 10:17:39 +07:00
Kittapath
954bf5a633 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-08-08 17:27:55 +07:00
Kittapath
00cd06a997 แก้ปรับตำแหน่ง 2024-08-08 17:27:33 +07:00
Bright
9f5987d968 permission ทะเบียนประวัติขรก.+ลูกจ้าง 2024-08-08 17:15:21 +07:00
Kittapath
be7f719fd5 no message 2024-08-08 09:14:08 +07:00
Kittapath
3a32b07272 no message 2024-08-07 18:05:24 +07:00
Kittapath
372e6d8973 แก้ path call api 2024-08-07 17:49:28 +07:00
Kittapath
c7920c2657 คำสั่งลูกจ้าง list รายการ 2024-08-07 16:54:33 +07:00
Kittapath
3170b1ccf9 แก้ค้นหาคนในโครงสร้าง 2024-08-07 16:15:16 +07:00
12885adf17 updated menu & del permission 2024-08-07 11:49:11 +07:00
Bright
1768d4cbbb api ผังโครงสร้ารายบุคคล 2024-08-07 10:38:09 +07:00
Bright
59359d2915 api ผังโครงสร้ารายบุคคล (ค้างตำแหน่ง) 2024-08-06 23:29:41 +07:00
Kittapath
0db2af5c78 แก้ key menu redis 2024-08-06 11:59:59 +07:00
Kittapath
af35988275 แก้ api get menu 2024-08-06 11:34:46 +07:00
Kittapath
813fc68221 แก้ import data 2024-08-05 20:58:44 +07:00
Kittapath
13a91fcb90 เช็คสิทธิ์ 2024-08-05 14:34:27 +07:00
Kittapath
19233f7b36 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-08-05 10:16:40 +07:00
Kittapath
0bbf61b94a clear data 2024-08-05 10:16:26 +07:00
22af14721d deleteRedisByID 2024-08-02 16:44:38 +07:00
2c26007f2d fix throw 2024-08-02 10:45:11 +07:00
Kittapath
b2fd959162 no message 2024-08-01 16:51:17 +07:00
Kittapath
b6a485ba1f Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-08-01 16:50:51 +07:00
Kittapath
4bce0ff22d no message 2024-08-01 16:49:26 +07:00
b5123630f8 clear data in redis 2024-08-01 15:55:30 +07:00
d51e6cf0f0 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-08-01 15:54:16 +07:00
Kittapath
463c1f9669 no message 2024-07-31 15:34:50 +07:00
Kittapath
ede21bb2f8 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-07-31 10:57:38 +07:00
Kittapath
b9316ab2cc no message 2024-07-31 10:57:24 +07:00
a6765de84e Merge branches 'develop' and 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/PermissionController.ts
2024-07-31 09:52:31 +07:00
07614bec19 hide redis 2024-07-31 09:46:39 +07:00
Kittapath
603602adbc no message 2024-07-31 09:43:23 +07:00
Kittapath
99187d08b5 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop 2024-07-26 20:47:54 +07:00
Bright
ac41766f43 no message 2024-07-26 18:28:05 +07:00
Kittapath
692f74c48c no message 2024-07-26 15:52:32 +07:00
Kittapath
7c7ae7db41 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
#	src/controllers/ImportDataController.ts
2024-07-26 14:59:34 +07:00
Kittapath
2686407133 import data 2024-07-26 14:44:33 +07:00
Bright
15cb59b550 import excel 2024-07-26 14:41:41 +07:00
Bright
bfce5ba1ce import excel 2024-07-25 16:27:43 +07:00
Bright
022cc04e7b Merge branch 'develop' into develop-Bright
# Conflicts:
#	src/controllers/ImportDataController.ts
2024-07-25 16:22:29 +07:00
Bright
fc14f80dc9 no message 2024-07-25 16:20:48 +07:00
AnandaTon
c451e9bf2e ไฟล์ static 40k row 2024-07-25 11:32:07 +07:00