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
7615238c
Commit
7615238c
authored
Jul 29, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed filter bug
parent
9d2d20ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
10 deletions
+14
-10
src/features/api/requestApiSlice.ts
src/features/api/requestApiSlice.ts
+5
-0
src/pages/RequestPage/RequestPage.tsx
src/pages/RequestPage/RequestPage.tsx
+9
-10
No files found.
src/features/api/requestApiSlice.ts
View file @
7615238c
...
...
@@ -39,6 +39,10 @@ export const requestApiSlice = apiSlice.injectEndpoints({
body
:
initialReq
,
}),
invalidatesTags
:
[
"
requests
"
],
}),
resendRequest
:
builder
.
query
({
query
:
(
reqId
)
=>
`requests/resent?id=
${
reqId
}
`
,
providesTags
:
[
'
requests
'
]
})
})
})
...
...
@@ -46,4 +50,5 @@ export const requestApiSlice = apiSlice.injectEndpoints({
export
const
{
useAddNewRequestMutation
,
useGetRequestsQuery
,
useResendRequestQuery
}
=
requestApiSlice
;
\ No newline at end of file
src/pages/RequestPage/RequestPage.tsx
View file @
7615238c
...
...
@@ -8,9 +8,9 @@ import { useGetRequestsQuery } from '../../features/api/requestApiSlice';
import
{
setCurrentPage
,
setTotalReqNumber
}
from
'
../../features/pagination/reqPagination
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
'
./RequestPage.css
'
;
dayjs
.
extend
(
isBetween
);
const
dateFormat
=
'
DD/MM/YYYY
'
;
const
dateFormat
=
'
YYYY-MM-DD
'
;
const
RequestPage
:
React
.
FC
=
()
=>
{
const
dispatch
=
useDispatch
();
...
...
@@ -19,8 +19,8 @@ const RequestPage: React.FC = () => {
const
currentPage
=
useSelector
((
state
:
any
)
=>
state
.
reqPagination
.
currentPage
);
const
REQ_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
reqPagination
.
REQ_NUMBER_PER_PAGE
);
const
[
startDate
,
setStartDate
]
=
useState
<
Dayjs
|
null
>
(
null
);
const
[
endDate
,
setEndDate
]
=
useState
<
Dayjs
|
null
>
(
null
);
const
[
startDate
,
setStartDate
]
=
useState
<
Dayjs
>
(
dayjs
(
'
2024/01/01
'
,
dateFormat
)
);
const
[
endDate
,
setEndDate
]
=
useState
<
Dayjs
>
(
dayjs
(
'
2024/12/31
'
,
dateFormat
)
);
const
[
data
,
setData
]
=
useState
<
DataType
[]
>
([]);
const
[
method
,
setMethod
]
=
useState
(
''
);
...
...
@@ -40,11 +40,11 @@ const RequestPage: React.FC = () => {
const
applyFilters
=
()
=>
{
let
filtered
=
reqs
.
list
;
const
adjustedStartDate
=
dayjs
(
startDate
).
subtract
(
1
,
'
day
'
);
if
(
startDate
&&
endDate
)
{
filtered
=
filtered
.
filter
((
req
)
=>
{
const
sendDate
=
dayjs
(
req
.
sendDate
,
dateFormat
);
return
sendDate
.
isBetween
(
startDate
,
endDate
,
'
day
'
,
'
[]
'
);
return
sendDate
.
isBetween
(
adjustedStartDate
,
endDate
,
'
second
'
,
'
[]
'
);
});
}
...
...
@@ -57,11 +57,11 @@ const RequestPage: React.FC = () => {
dispatch
(
setTotalReqNumber
(
filtered
.
length
));
}
const
onSelectStartDate
=
(
date
:
Dayjs
|
null
)
=>
{
const
onSelectStartDate
=
(
date
:
Dayjs
)
=>
{
setStartDate
(
date
);
}
const
onSelectEndDate
=
(
date
:
Dayjs
|
null
)
=>
{
const
onSelectEndDate
=
(
date
:
Dayjs
)
=>
{
setEndDate
(
date
);
}
...
...
@@ -101,7 +101,6 @@ const RequestPage: React.FC = () => {
ref=
{
tableRef
}
/>;
}
else
if
(
isError
)
{
console
.
log
(
error
);
table
=
<
div
>
{
error
.
toString
()
}
</
div
>;
}
...
...
@@ -124,7 +123,7 @@ const RequestPage: React.FC = () => {
format=
{
dateFormat
}
defaultValue=
{
startDate
}
value=
{
startDate
}
style=
{
{
marginRight
:
14
}
}
style=
{
{
marginRight
:
14
}
}
/>
<
DatePicker
onChange=
{
onSelectEndDate
}
...
...
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