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
12c66ab3
Commit
12c66ab3
authored
Dec 13, 2022
by
Ermolaev Timur
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'task-104-fix/modal_delete_btn' into 'development'
#104
Исправил кнопку See merge request
!78
parents
57aae89a
49ae1202
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
CalendarModalContent.js
...ts/Calendars/CalendarModalContent/CalendarModalContent.js
+2
-2
MonthCalendarBody.js
...dars/MonthCalendar/MonthCalendarBody/MonthCalendarBody.js
+1
-0
DefaultModal.js
planner-front/src/components/UI/DefaultModal/DefaultModal.js
+0
-2
No files found.
planner-front/src/components/Calendars/CalendarModalContent/CalendarModalContent.js
View file @
12c66ab3
...
...
@@ -4,7 +4,7 @@ import { priorities } from "../../../constants";
import
CustomSelect
from
'../../UI/СustomSelect/СustomSelect'
function
CalendarModalContent
({
title
,
onChangeCurrentTaskHandler
,
description
,
priority
,
sendNewTaskHandler
,
deleteTaskHandler
,
startHour
,
endHour
})
{
function
CalendarModalContent
({
title
,
onChangeCurrentTaskHandler
,
description
,
priority
,
sendNewTaskHandler
,
deleteTaskHandler
,
startHour
,
endHour
,
id
})
{
return
(
<>
<
TextField
id
=
"task-description-title"
...
...
@@ -56,7 +56,7 @@ function CalendarModalContent({ title, onChangeCurrentTaskHandler, description,
<
/div
>
<
div
style
=
{{
display
:
'flex'
,
gap
:
'20px'
,
margin
:
'10px 0'
}}
>
<
Button
id
=
'test_button_save_task'
onClick
=
{
sendNewTaskHandler
}
>
Сохранить
<
/Button
>
<
Button
onClick
=
{
deleteTaskHandler
}
>
Удалить
<
/Button
>
{
id
?
<
Button
onClick
=
{
deleteTaskHandler
}
>
Удалить
<
/Button> : null
}
<
/div
>
<
/>
)
;
}
...
...
planner-front/src/components/Calendars/MonthCalendar/MonthCalendarBody/MonthCalendarBody.js
View file @
12c66ab3
...
...
@@ -89,6 +89,7 @@ function MonthCalendarBody({ month, year, tasks, createTaskInCellHandler, curren
title
=
{
currentTask
.
title
}
description
=
{
currentTask
.
description
}
priority
=
{
currentTask
.
priority
}
id
=
{
currentTask
.
id
}
startHour
=
{
currentTask
.
infoForCell
?.
startHour
}
endHour
=
{
currentTask
.
infoForCell
?.
endHour
}
onChangeCurrentTaskHandler
=
{(
e
)
=>
{
onChangeCurrentTaskHandler
(
e
)
}}
...
...
planner-front/src/components/UI/DefaultModal/DefaultModal.js
View file @
12c66ab3
import
*
as
React
from
'react'
;
import
Box
from
'@mui/material/Box'
;
import
Button
from
'@mui/material/Button'
;
import
Typography
from
'@mui/material/Typography'
;
import
Modal
from
'@mui/material/Modal'
;
const
style
=
{
...
...
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