Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
planner-team-one
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
21
Issues
21
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Евгений Положенцев
planner-team-one
Commits
f156467b
Project 'zarina/exam_11_front' was moved to 'z/exam_11_front'. Please update any links and bookmarks that may still have the old path.
Commit
f156467b
authored
Jan 15, 2023
by
Ermolaev Timur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#154
починил все селекты
parent
604159dd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
EditRow.js
...eContainer/MyTasksTableBody/MyTasksRow/EditRow/EditRow.js
+3
-2
СustomSelect.js
planner-front/src/components/UI/СustomSelect/СustomSelect.js
+2
-1
EditRow.js
...iner/UsersTasksTableBody/UsersTasksRow/EditRow/EditRow.js
+1
-0
MyTasks.js
planner-front/src/containers/MyTasks/MyTasks.js
+1
-1
No files found.
planner-front/src/components/MyTasksCompoments/MyTasksTableContainer/MyTasksTableBody/MyTasksRow/EditRow/EditRow.js
View file @
f156467b
import
{
TableCell
,
TextField
,
Tooltip
}
from
"@mui/material"
;
import
{
TableCell
,
TextField
,
Tooltip
}
from
"@mui/material"
;
import
moment
from
"moment"
;
import
moment
from
"moment"
;
import
{
memo
}
from
"react"
;
import
{
memo
,
useEffect
}
from
"react"
;
import
{
accomplishStatuses
,
priorities
}
from
"../../../../../../constants"
;
import
{
accomplishStatuses
,
priorities
}
from
"../../../../../../constants"
;
import
CustomSelect
from
"../../../../../UI/СustomSelect/СustomSelect"
import
CustomSelect
from
"../../../../../UI/СustomSelect/СustomSelect"
import
{
styled
}
from
'@mui/material/styles'
;
import
{
styled
}
from
'@mui/material/styles'
;
...
@@ -15,7 +15,7 @@ const StyledTooltip = styled(({ className, ...props }) => (
...
@@ -15,7 +15,7 @@ const StyledTooltip = styled(({ className, ...props }) => (
`
;
`
;
function
EditRow
({
buttons
,
dateTimeTasks
,
onChangeCurrentTaskHandler
,
currentTask
,
allUserProjectsForModalTask
,
onDateChangeEditHandler
,
user
})
{
function
EditRow
({
buttons
,
dateTimeTasks
,
onChangeCurrentTaskHandler
,
currentTask
,
allUserProjectsForModalTask
,
onDateChangeEditHandler
,
user
})
{
return
(
return
(
<>
<>
<
TableCell
sx
=
{{
width
:
'4%'
}}
>
<
TableCell
sx
=
{{
width
:
'4%'
}}
>
...
@@ -70,6 +70,7 @@ function EditRow({ buttons, dateTimeTasks, onChangeCurrentTaskHandler, currentTa
...
@@ -70,6 +70,7 @@ function EditRow({ buttons, dateTimeTasks, onChangeCurrentTaskHandler, currentTa
variant
=
{
'outlined'
}
variant
=
{
'outlined'
}
onChange
=
{
onChangeCurrentTaskHandler
}
onChange
=
{
onChangeCurrentTaskHandler
}
id
=
{
'project'
}
id
=
{
'project'
}
renderValue
=
{(
project
)
=>
project
.
title
}
items
=
{
allUserProjectsForModalTask
}
items
=
{
allUserProjectsForModalTask
}
sx
=
{{
width
:
'100%'
}}
sx
=
{{
width
:
'100%'
}}
/
>
/
>
...
...
planner-front/src/components/UI/СustomSelect/СustomSelect.js
View file @
f156467b
import
{
FormControl
,
InputLabel
,
MenuItem
,
Select
}
from
'@mui/material'
;
import
{
FormControl
,
InputLabel
,
MenuItem
,
Select
}
from
'@mui/material'
;
import
{
memo
}
from
'react'
;
import
{
memo
}
from
'react'
;
function
С
ustomSelect
({
value
,
onChange
,
label
,
variant
=
'standard'
,
items
,
id
,
defaultValue
,
name
,
sx
})
{
function
С
ustomSelect
({
value
,
onChange
,
label
,
variant
=
'standard'
,
items
,
id
,
defaultValue
,
name
,
sx
,
renderValue
})
{
return
(
return
(
<>
<>
<
FormControl
variant
=
{
variant
}
sx
=
{
sx
?.
width
?
sx
:
{
m
:
0
,
minWidth
:
125
}}
>
<
FormControl
variant
=
{
variant
}
sx
=
{
sx
?.
width
?
sx
:
{
m
:
0
,
minWidth
:
125
}}
>
...
@@ -10,6 +10,7 @@ function СustomSelect({ value, onChange, label, variant = 'standard', items, id
...
@@ -10,6 +10,7 @@ function СustomSelect({ value, onChange, label, variant = 'standard', items, id
labelId
=
{
`
${
id
}
-select-label`
}
labelId
=
{
`
${
id
}
-select-label`
}
id
=
{
`
${
id
}
-select`
}
id
=
{
`
${
id
}
-select`
}
value
=
{
value
}
value
=
{
value
}
renderValue
=
{
renderValue
?
renderValue
:
null
}
onChange
=
{
onChange
}
onChange
=
{
onChange
}
label
=
{
label
}
label
=
{
label
}
name
=
{
name
}
name
=
{
name
}
...
...
planner-front/src/components/UsersTasksCompoments/UsersTasksTableContainer/UsersTasksTableBody/UsersTasksRow/EditRow/EditRow.js
View file @
f156467b
...
@@ -92,6 +92,7 @@ function EditRow({ buttons, dateTimeTasks, onChangeCurrentTaskHandler, currentTa
...
@@ -92,6 +92,7 @@ function EditRow({ buttons, dateTimeTasks, onChangeCurrentTaskHandler, currentTa
name
=
{
'executor'
}
name
=
{
'executor'
}
variant
=
{
'outlined'
}
variant
=
{
'outlined'
}
onChange
=
{
onChangeCurrentTaskHandler
}
onChange
=
{
onChangeCurrentTaskHandler
}
renderValue
=
{(
executor
)
=>
executor
?.
displayName
}
id
=
{
'executor'
}
id
=
{
'executor'
}
items
=
{
workers
}
items
=
{
workers
}
sx
=
{{
width
:
'100%'
}}
sx
=
{{
width
:
'100%'
}}
...
...
planner-front/src/containers/MyTasks/MyTasks.js
View file @
f156467b
...
@@ -138,7 +138,7 @@ export default function MyTasks() {
...
@@ -138,7 +138,7 @@ export default function MyTasks() {
setAddFormStatus
((
prevState
)
=>
{
return
!
prevState
})
setAddFormStatus
((
prevState
)
=>
{
return
!
prevState
})
},
[
dispatch
,
newTask
,
user
])
},
[
dispatch
,
newTask
,
user
])
console
.
log
(
currentTask
)
const
deleteTaskHandler
=
useCallback
((
id
)
=>
{
const
deleteTaskHandler
=
useCallback
((
id
)
=>
{
dispatch
(
deleteTask
(
id
))
dispatch
(
deleteTask
(
id
))
},
[
dispatch
])
},
[
dispatch
])
...
...
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