|
|
f36ff656ef
|
add entity org part 1
|
2024-03-12 14:53:15 +07:00 |
|
Kittapath
|
0f7edf5d15
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-03-11 14:19:47 +07:00 |
|
Kittapath
|
965dd6fe5b
|
แก้คิวรี่เงินเดือน
|
2024-03-11 14:19:26 +07:00 |
|
|
|
a98ac715ad
|
fix
|
2024-03-11 12:01:04 +07:00 |
|
|
|
91e6665a50
|
fix
|
2024-03-11 11:49:38 +07:00 |
|
|
|
4da17192f3
|
fix word
|
2024-03-11 11:42:04 +07:00 |
|
|
|
082ce90dcd
|
fix word "รหัสส่วนราชการนี้มีอยู่ในระบบแล้ว"
|
2024-03-11 11:31:38 +07:00 |
|
|
|
8ebd30a63d
|
Merge branch 'develop' into adiDev
|
2024-03-11 11:22:49 +07:00 |
|
|
|
b7c6ef1c04
|
fix word
|
2024-03-11 11:22:10 +07:00 |
|
Methapon2001
|
0013f19fce
|
Merge branch 'dev/methapon' into develop
|
2024-03-11 10:45:49 +07:00 |
|
Methapon2001
|
230e8ea488
|
Fix timezone
|
2024-03-11 10:45:40 +07:00 |
|
Methapon2001
|
d825373542
|
auth(role): Multi role support
|
2024-03-11 09:44:22 +07:00 |
|
Methapon2001
|
1af696b39c
|
Add custom error msg param for role auth
|
2024-03-11 09:30:28 +07:00 |
|
Methapon2001
|
6ba483f0b7
|
Add middleware for role check
|
2024-03-11 09:28:59 +07:00 |
|
Methapon2001
|
610777e48d
|
Merge file
|
2024-03-08 17:20:39 +07:00 |
|
Net
|
5fedb904c5
|
Merge branch 'net-dav' into develop
|
2024-03-08 17:03:28 +07:00 |
|
Net
|
b0f7331f15
|
เพิ่มคำนวณวันเกษียณ
|
2024-03-08 17:03:20 +07:00 |
|
Methapon2001
|
747d8c6b1c
|
Add utility function (calculate age in range)
|
2024-03-08 16:37:30 +07:00 |
|
Kittapath
|
fa1f8dc3fb
|
no message
|
2024-03-08 14:54:50 +07:00 |
|
Kittapath
|
0dd8d3d28a
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-03-08 14:54:42 +07:00 |
|
Kittapath
|
c41b0f008a
|
เพิ่มฟิววินัย
|
2024-03-08 14:54:24 +07:00 |
|
Bright
|
bdc61d3f58
|
ปรับ comment
|
2024-03-08 14:18:46 +07:00 |
|
Kittapath
|
07c310ae26
|
เพิ่มฟิวคุณสมบัติบุคคล
|
2024-03-07 15:28:08 +07:00 |
|
|
|
c94d3eb547
|
fix
|
2024-03-07 11:00:22 +07:00 |
|
|
|
d7fc649854
|
fix bug
|
2024-03-07 10:05:22 +07:00 |
|
|
|
ae0d0388b8
|
Merge branch 'develop' into adiDev
|
2024-03-07 09:33:52 +07:00 |
|
|
|
830de8493b
|
fix word
|
2024-03-07 09:33:15 +07:00 |
|
Kittapath
|
119bb83e11
|
no message
|
2024-03-06 19:07:06 +07:00 |
|
Kittapath
|
86b84356a2
|
ค้นหาสังกัด
|
2024-03-06 18:28:22 +07:00 |
|
Kittapath
|
2590054f9e
|
แก้บัคย้ายตำแหน่ง
|
2024-03-04 16:29:37 +07:00 |
|
Kittapath
|
391c98682f
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
# src/controllers/PositionController.ts
|
2024-03-04 15:36:39 +07:00 |
|
Kittapath
|
5330fde6c5
|
แก้บัคย้ายตำแหน่ง
|
2024-03-04 15:34:38 +07:00 |
|
|
|
df752bed74
|
fix bug
|
2024-03-04 15:29:09 +07:00 |
|
|
|
131246f824
|
Merge branch 'develop' into adiDev
|
2024-03-04 14:54:58 +07:00 |
|
|
|
5e2e13d8e8
|
fix code
|
2024-03-04 14:54:15 +07:00 |
|
Kittapath
|
e329157cda
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
# Conflicts:
# src/controllers/PositionController.ts
|
2024-03-04 09:43:46 +07:00 |
|
Kittapath
|
5f97ab1ac7
|
no message
|
2024-03-04 09:43:02 +07:00 |
|
|
|
2bb68463be
|
fix bug
|
2024-03-04 09:23:51 +07:00 |
|
|
|
3e8f43537f
|
fix
|
2024-03-01 15:43:03 +07:00 |
|
|
|
4c2f7120ce
|
fix
|
2024-03-01 15:37:30 +07:00 |
|
|
|
16d718baa4
|
fix
|
2024-03-01 15:17:35 +07:00 |
|
|
|
7b29823f9e
|
fix
|
2024-03-01 13:58:04 +07:00 |
|
|
|
4d3769e4b4
|
label name
|
2024-03-01 12:16:54 +07:00 |
|
|
|
ba76e787b0
|
แก้ไขค้นหาชื่อคนครอง master/list
|
2024-03-01 11:17:57 +07:00 |
|
|
|
21aa51ff99
|
Merge branch 'develop' into adiDev
|
2024-02-29 17:50:17 +07:00 |
|
|
|
019bdfcd1d
|
fix sort posMasterNo
|
2024-02-29 17:49:39 +07:00 |
|
Kittapath
|
432c3f6851
|
no message
|
2024-02-29 14:41:15 +07:00 |
|
Kittapath
|
15c6932f91
|
เงินเดือนไม่มีค่าให้เป็นnull
|
2024-02-29 14:07:39 +07:00 |
|
Kittapath
|
b53176ed05
|
เพิ่มฟิว isretire
|
2024-02-29 11:29:16 +07:00 |
|
Kittapath
|
d45f957214
|
Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
|
2024-02-28 18:12:33 +07:00 |
|