Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ESYTD
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Дияр Амангельды
ESYTD
Commits
c49b494d
Commit
c49b494d
authored
Jul 31, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
manageOrganition fixed
parent
b2c55c72
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
30 deletions
+33
-30
src/pages/ManageOrganization/ManageOrganization.tsx
src/pages/ManageOrganization/ManageOrganization.tsx
+26
-23
src/pages/RequestPage/RequestPage.tsx
src/pages/RequestPage/RequestPage.tsx
+3
-3
src/store/api/manualApi.ts
src/store/api/manualApi.ts
+1
-1
src/store/api/organizationApi.ts
src/store/api/organizationApi.ts
+3
-3
No files found.
src/pages/ManageOrganization/ManageOrganization.tsx
View file @
c49b494d
import
React
,
{
useEffect
}
from
'
react
'
;
import
React
,
{
useEffect
,
useState
}
from
'
react
'
;
import
{
useNavigate
,
useParams
}
from
'
react-router
'
;
import
{
useSelector
,
useDispatch
}
from
'
react-redux
'
;
import
{
Form
,
Input
,
Button
,
Select
,
message
}
from
'
antd
'
;
...
...
@@ -22,17 +22,18 @@ const { Item } = Form;
const
{
Option
}
=
Select
;
const
ManageOrganization
:
React
.
FC
=
()
=>
{
const
[
form
]
=
Form
.
useForm
();
const
navigate
=
useNavigate
();
const
dispatch
=
useDispatch
();
const
{
id
}
=
useParams
<
{
id
:
string
}
>
();
const
isEdit
=
Boolean
(
id
);
const
{
data
,
isLoading
,
isError
}
=
useGetOrganizationQuery
(
id
!
,
{
skip
:
!
isEdit
});
const
{
data
:
organizations
}
=
useGetOrganizationsQuery
();
const
[
editOrganization
]
=
useEditOrganizationMutation
();
const
[
form
]
=
Form
.
useForm
();
const
totalOrgNumber
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
totalOrgNumber
);
const
ORG_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
mainPagination
.
ORG_NUMBER_PER_PAGE
);
const
[
isBtnLoading
,
setIsBtnLoading
]
=
useState
(
false
);
const
{
data
,
isLoading
:
isGetLoading
,
isError
:
isGetError
}
=
useGetOrganizationQuery
(
id
!
,
{
skip
:
!
isEdit
});
const
{
data
:
organizations
}
=
useGetOrganizationsQuery
();
const
[
editOrganization
]
=
useEditOrganizationMutation
();
useEffect
(()
=>
{
if
(
data
)
{
form
.
setFieldsValue
({
...
...
@@ -59,25 +60,23 @@ const ManageOrganization: React.FC = () => {
return
;
}
try
{
if
(
isEdit
)
{
await
editOrganization
({
...
normalizedValues
}).
unwrap
();
message
.
success
(
'
Организация успешно обновлена!
'
);
}
else
{
await
editOrganization
({
...
normalizedValues
}).
unwrap
();
message
.
success
(
'
Организация успешно добавлена!
'
);
dispatch
(
setTotalOrgNumber
(
totalOrgNumber
+
1
));
const
newCurrentPage
=
Math
.
ceil
((
totalOrgNumber
+
1
)
/
ORG_NUMBER_PER_PAGE
);
dispatch
(
setCurrentPage
(
newCurrentPage
));
}
navigate
(
'
/
'
);
}
catch
(
err
)
{
message
.
error
(
'
Произошла ошибка при сохранении организации!
'
);
setIsBtnLoading
(
true
);
await
editOrganization
({
...
normalizedValues
}).
unwrap
();
setIsBtnLoading
(
false
);
if
(
isEdit
)
{
message
.
success
(
'
Организация успешно обновлена!
'
);
}
else
{
message
.
success
(
'
Организация успешно добавлена!
'
);
dispatch
(
setTotalOrgNumber
(
totalOrgNumber
+
1
));
const
newCurrentPage
=
Math
.
ceil
((
totalOrgNumber
+
1
)
/
ORG_NUMBER_PER_PAGE
);
dispatch
(
setCurrentPage
(
newCurrentPage
));
}
navigate
(
'
/
'
);
};
if
(
isEdit
&&
isLoading
)
return
<
div
>
Loading...
</
div
>;
if
(
isEdit
&&
isError
)
return
<
div
>
Error loading organization data
</
div
>;
if
(
isEdit
&&
is
Get
Loading
)
return
<
div
>
Loading...
</
div
>;
if
(
isEdit
&&
is
Get
Error
)
return
<
div
>
Error loading organization data
</
div
>;
return
(
<
div
className=
'container'
>
...
...
@@ -168,7 +167,11 @@ const ManageOrganization: React.FC = () => {
>
Отмена
</
Button
>
<
Button
type=
"primary"
htmlType=
"submit"
>
<
Button
type=
"primary"
htmlType=
"submit"
loading=
{
isBtnLoading
}
>
Сохранить
</
Button
>
</
Item
>
...
...
src/pages/RequestPage/RequestPage.tsx
View file @
c49b494d
...
...
@@ -88,10 +88,9 @@ const RequestPage: React.FC = () => {
let
max
:
number
=
-
Infinity
;
if
(
isSuccess
)
{
console
.
log
(
window
.
innerHeight
)
reqs
.
list
.
forEach
((
req
)
=>
{
const
dateValue
=
new
Date
(
req
.
sendDate
).
valueOf
();
if
(
min
>
dateValue
&&
dateValue
!=
0
)
{
if
(
min
>
dateValue
&&
dateValue
!=
0
)
{
min
=
dateValue
;
}
if
(
max
<
dateValue
)
{
...
...
@@ -127,13 +126,14 @@ const RequestPage: React.FC = () => {
if
(
isLoading
)
{
setIsTableLoading
(
true
);
}
else
if
(
isSuccess
)
{
setIsTableLoading
(
false
);
setData
(
reqs
.
list
);
dispatch
(
setTotalReqNumber
(
reqs
.
list
.
length
));
setDates
([
dayjs
(
min
),
dayjs
(
max
)]);
}
else
if
(
isError
)
{
setIsTableLoading
(
false
);
}
},
[
is
Success
,
reqs
,
dispatch
]);
},
[
is
Loading
,
isSuccess
,
isError
,
reqs
,
dispatch
,
min
,
max
]);
return
(
<
div
className=
"container"
>
...
...
src/store/api/manualApi.ts
View file @
c49b494d
...
...
@@ -7,7 +7,7 @@ export const manualApiSlice = apiSlice.injectEndpoints({
url
:
'
dictionary/update
'
,
method
:
'
POST
'
,
body
:
codes
}),
invalidatesTags
:
[
'
manuals
'
]
}),
invalidatesTags
:
[
{
type
:
"
manuals
"
,
id
:
"
MAN_LIST
"
}
]
})
})
})
...
...
src/store/api/organizationApi.ts
View file @
c49b494d
...
...
@@ -18,7 +18,7 @@ export const organizationApiSlice = apiSlice.injectEndpoints({
endpoints
:
(
builder
)
=>
({
getOrganizations
:
builder
.
query
<
Organization
[],
void
>
({
query
:
()
=>
'
organizations/list
'
,
providesTags
:
[{
type
:
"
organizations
"
,
id
:
"
LIST
"
}],
providesTags
:
[{
type
:
"
organizations
"
,
id
:
"
ORG_
LIST
"
}],
}),
getOrganization
:
builder
.
query
<
Organization
,
string
>
({
query
:
(
orgId
)
=>
`organizations/info?id=
${
orgId
}
`
,
...
...
@@ -30,14 +30,14 @@ export const organizationApiSlice = apiSlice.injectEndpoints({
method
:
'
POST
'
,
body
:
initialOrg
,
}),
invalidatesTags
:
(
res
)
=>
[{
type
:
"
organizations
"
,
id
:
res
?.
id
},
{
type
:
"
organizations
"
,
id
:
"
LIST
"
}],
invalidatesTags
:
(
res
)
=>
[{
type
:
"
organizations
"
,
id
:
res
?.
id
},
{
type
:
"
organizations
"
,
id
:
"
ORG_
LIST
"
}],
}),
deleteOrganization
:
builder
.
mutation
<
{
success
:
boolean
;
code
:
string
},
string
>
({
query
:
(
orgCode
)
=>
({
url
:
`organizations/delete?code=
${
orgCode
}
`
,
method
:
'
POST
'
}),
invalidatesTags
:
[{
type
:
"
organizations
"
,
id
:
"
LIST
"
}],
invalidatesTags
:
[{
type
:
"
organizations
"
,
id
:
"
ORG_
LIST
"
}],
}),
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment