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
ed69d9bb
Commit
ed69d9bb
authored
Jul 29, 2024
by
Merekeyev Dias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed table reset: found bug
parent
2b5d48c0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
83 deletions
+32
-83
src/pages/HomePage/HomePage.tsx
src/pages/HomePage/HomePage.tsx
+9
-4
src/pages/HomePage/Homepage.css
src/pages/HomePage/Homepage.css
+3
-76
src/pages/RequestPage/RequestPage.tsx
src/pages/RequestPage/RequestPage.tsx
+20
-3
No files found.
src/pages/HomePage/HomePage.tsx
View file @
ed69d9bb
...
@@ -21,7 +21,7 @@ const HomePage: React.FC = () => {
...
@@ -21,7 +21,7 @@ const HomePage: React.FC = () => {
};
};
const
handlePaginationChange
=
(
page
:
number
)
=>
{
const
handlePaginationChange
=
(
page
:
number
)
=>
{
tableRef
.
current
?.
nativeElement
.
scrollIntoView
({
behavior
:
'
smooth
'
});
//
tableRef.current?.nativeElement.scrollIntoView({ behavior: 'smooth' });
dispatch
(
setCurrentPage
(
page
));
dispatch
(
setCurrentPage
(
page
));
};
};
...
@@ -48,6 +48,7 @@ const HomePage: React.FC = () => {
...
@@ -48,6 +48,7 @@ const HomePage: React.FC = () => {
dataSource=
{
paginatedData
(
orgs
)
}
dataSource=
{
paginatedData
(
orgs
)
}
columns=
{
columns
}
pagination=
{
false
}
columns=
{
columns
}
pagination=
{
false
}
rowKey=
"id"
rowKey=
"id"
className=
'home_table'
ref=
{
tableRef
}
ref=
{
tableRef
}
/>
/>
}
else
if
(
isError
)
{
}
else
if
(
isError
)
{
...
@@ -64,8 +65,12 @@ const HomePage: React.FC = () => {
...
@@ -64,8 +65,12 @@ const HomePage: React.FC = () => {
return
(
return
(
<
div
className=
"container"
>
<
div
className=
"container"
>
<
section
className=
'section'
>
<
section
className=
'section'
>
<
div
className=
"add"
>
<
div
>
<
Button
className=
'add_title'
onClick=
{
handleAddClick
}
>
<
Button
className=
'add_title'
type=
'primary'
onClick=
{
handleAddClick
}
>
Добавить
Добавить
</
Button
>
</
Button
>
</
div
>
</
div
>
...
...
src/pages/HomePage/Homepage.css
View file @
ed69d9bb
.container
{
/* min-width: 1440px; */
margin
:
0
auto
;
}
.section
{
.section
{
margin
:
0
auto
;
margin-top
:
10px
20px
;
margin-top
:
10px
;
margin-left
:
20px
;
margin-right
:
20px
;
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
height
:
calc
(
100vh
-
60px
);
height
:
calc
(
100vh
-
60px
);
}
}
.add
{
margin-bottom
:
10px
;
display
:
flex
;
align-items
:
center
;
gap
:
4px
;
margin-left
:
10px
;
}
.add_button
,
.view-btn
{
cursor
:
pointer
;
transition
:
transform
0.3s
ease
;
}
.add_button
:hover
,
.add_button
:focus
,
.view-btn
:focus
,
.view-btn
:hover
{
transform
:
scale
(
1.1
);
}
.add_title
{
.add_title
{
font-size
:
12px
;
font-size
:
12px
;
line-height
:
18px
;
line-height
:
18px
;
...
@@ -46,52 +17,8 @@
...
@@ -46,52 +17,8 @@
flex
:
1
;
flex
:
1
;
overflow-y
:
auto
;
overflow-y
:
auto
;
padding-bottom
:
20px
;
padding-bottom
:
20px
;
}
margin-top
:
20px
;
margin-left
:
-10px
;
.data-table
{
min-width
:
100%
;
border-collapse
:
collapse
;
color
:
#222222
;
font-family
:
Open
Sans
;
font-size
:
12px
;
font-weight
:
400
;
line-height
:
18px
;
}
.data-table
th
,
.data-table
td
{
border
:
1px
solid
#ddd
;
padding
:
5px
;
}
.data-table
th
{
text-align
:
left
;
}
.data-table
tr
:nth-child
(
even
)
{
background-color
:
#f9f9f9
;
}
.data-table
tr
:hover
{
background-color
:
#ddd
;
}
.data-table
th
{
padding-top
:
12px
;
padding-bottom
:
12px
;
background-color
:
#E4EEFC
;
}
.view-btn
,
.delete-btn
{
background
:
none
;
border
:
none
;
cursor
:
pointer
;
}
.view-btn
:hover
,
.delete-btn
:hover
{
opacity
:
0.7
;
}
}
.pagination-container
{
.pagination-container
{
...
...
src/pages/RequestPage/RequestPage.tsx
View file @
ed69d9bb
...
@@ -7,8 +7,8 @@ import { useDispatch, useSelector } from 'react-redux';
...
@@ -7,8 +7,8 @@ import { useDispatch, useSelector } from 'react-redux';
import
{
columns
,
DataType
}
from
'
./Columns
'
;
import
{
columns
,
DataType
}
from
'
./Columns
'
;
import
{
useGetRequestsQuery
}
from
'
../../features/api/requestApiSlice
'
;
import
{
useGetRequestsQuery
}
from
'
../../features/api/requestApiSlice
'
;
import
{
setCurrentPage
,
setTotalReqNumber
}
from
'
../../features/pagination/reqPagination
'
;
import
{
setCurrentPage
,
setTotalReqNumber
}
from
'
../../features/pagination/reqPagination
'
;
import
'
./RequestPage.css
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
{
TableRef
}
from
'
antd/es/table
'
;
import
'
./RequestPage.css
'
;
const
dateFormat
=
'
YYYY/MM/DD
'
;
const
dateFormat
=
'
YYYY/MM/DD
'
;
...
@@ -20,12 +20,12 @@ const RequestPage: React.FC = () => {
...
@@ -20,12 +20,12 @@ const RequestPage: React.FC = () => {
const
REQ_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
reqPagination
.
REQ_NUMBER_PER_PAGE
);
const
REQ_NUMBER_PER_PAGE
=
useSelector
((
state
:
any
)
=>
state
.
reqPagination
.
REQ_NUMBER_PER_PAGE
);
const
[
startDate
,
setStartDate
]
=
useState
<
Date
>
();
const
[
startDate
,
setStartDate
]
=
useState
<
Date
>
();
const
[
endDate
,
setEndDate
]
=
useState
<
Date
>
();
const
[
endDate
,
setEndDate
]
=
useState
();
const
[
method
,
setMethod
]
=
useState
(
''
);
const
[
method
,
setMethod
]
=
useState
(
''
);
const
[
filteredData
,
setFilteredData
]
=
useState
<
Request
[]
>
([]);
const
[
filteredData
,
setFilteredData
]
=
useState
<
Request
[]
>
([]);
const
handlePaginationChange
=
(
page
:
number
)
=>
{
const
handlePaginationChange
=
(
page
:
number
)
=>
{
tableRef
.
current
?.
nativeElement
.
scrollIntoView
({
behavior
:
'
smooth
'
});
//
tableRef.current?.nativeElement.scrollIntoView({ behavior: 'smooth' });
dispatch
(
setCurrentPage
(
page
));
dispatch
(
setCurrentPage
(
page
));
};
};
...
@@ -39,6 +39,7 @@ const RequestPage: React.FC = () => {
...
@@ -39,6 +39,7 @@ const RequestPage: React.FC = () => {
if
(
!
startDate
||
!
endDate
)
return
;
if
(
!
startDate
||
!
endDate
)
return
;
const
filtered
=
reqs
.
list
.
filter
((
req
)
=>
{
const
filtered
=
reqs
.
list
.
filter
((
req
)
=>
{
const
sendDate
=
dayjs
(
req
.
sendDate
,
dateFormat
);
const
sendDate
=
dayjs
(
req
.
sendDate
,
dateFormat
);
});
});
...
@@ -47,6 +48,18 @@ const RequestPage: React.FC = () => {
...
@@ -47,6 +48,18 @@ const RequestPage: React.FC = () => {
dispatch
(
setTotalReqNumber
(
filtered
.
length
));
dispatch
(
setTotalReqNumber
(
filtered
.
length
));
};
};
const
setDefaultDate
=
()
=>
{
let
min
=
Infinity
;
reqs
.
list
.
map
((
req
)
=>
{
const
dateValue
=
new
Date
(
req
.
sendDate
).
valueOf
();
if
(
min
>=
dateValue
)
{
min
=
dateValue
;
}
})
let
minDateType
=
new
Date
(
min
);
setStartDate
(
minDateType
);
}
const
onSelectStartDate
=
(
dateString
:
any
)
=>
{
const
onSelectStartDate
=
(
dateString
:
any
)
=>
{
setStartDate
(
dateString
);
setStartDate
(
dateString
);
}
}
...
@@ -86,6 +99,10 @@ const RequestPage: React.FC = () => {
...
@@ -86,6 +99,10 @@ const RequestPage: React.FC = () => {
}
}
},
[
isSuccess
,
reqs
,
dispatch
]);
},
[
isSuccess
,
reqs
,
dispatch
]);
useEffect
(()
=>
{
setDefaultDate
();
},
[
setStartDate
])
return
(
return
(
<
div
className=
"container"
>
<
div
className=
"container"
>
<
div
className=
"filter"
>
<
div
className=
"filter"
>
...
...
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