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
312070bd
Commit
312070bd
authored
Nov 14, 2022
by
Ermolaev Timur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#38
Получилось отрисовать логику для двух часов
parent
ce84932b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
CalendarTask.js
...components/MonthCalendarBody/CalendarTask/CalendarTask.js
+3
-3
No files found.
planner-front/src/components/MonthCalendarBody/CalendarTask/CalendarTask.js
View file @
312070bd
...
@@ -98,7 +98,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
...
@@ -98,7 +98,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
{
tasksCell
.
length
?
tasksCell
.
map
((
task
,
i
)
=>
{
tasksCell
.
length
?
tasksCell
.
map
((
task
,
i
)
=>
{
{
if
(
task
.
infoForCell
.
endHour
>
hour
&&
task
.
infoForCell
.
startHour
===
hour
&&
hourFormat
)
{
if
(
hourFormat
&&
task
.
infoForCell
.
endHour
>
hour
&&
task
.
infoForCell
.
startHour
===
hour
||
(
!
hourFormat
&&
task
.
infoForCell
.
endHour
>
hour
+
1
&&
task
.
infoForCell
.
startHour
===
hour
)
)
{
return
(
return
(
<
TaskWithNoStartAndAllEnd
<
TaskWithNoStartAndAllEnd
key
=
{
task
.
id
}
key
=
{
task
.
id
}
...
@@ -107,7 +107,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
...
@@ -107,7 +107,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
/
>
/
>
)
)
}
}
if
(
task
.
infoForCell
.
startHour
<
hour
&&
task
.
infoForCell
.
endHour
>
hour
)
{
if
(
hourFormat
&&
task
.
infoForCell
.
startHour
<
hour
&&
task
.
infoForCell
.
endHour
>
hour
||
((
!
hourFormat
&&
task
.
infoForCell
.
startHour
<
hour
&&
task
.
infoForCell
.
endHour
>
hour
+
2
))
)
{
return
(
return
(
<
TaskWithAllStartAndAllEnd
<
TaskWithAllStartAndAllEnd
key
=
{
task
.
id
}
key
=
{
task
.
id
}
...
@@ -116,7 +116,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
...
@@ -116,7 +116,7 @@ const CalendarTask = ({year, month, tasks, day, hours, setCurrentTask, hourForma
/
>
/
>
)
)
}
}
if
(
task
.
infoForCell
.
endMinute
===
59
&&
task
.
infoForCell
.
startHour
<
hour
)
{
if
(
hourFormat
&&
task
.
infoForCell
.
endMinute
===
59
&&
task
.
infoForCell
.
startHour
<
hour
||
(
!
hourFormat
&&
task
.
infoForCell
.
endMinute
===
59
&&
task
.
infoForCell
.
startHour
<
hour
&&
(
task
.
infoForCell
.
endHour
===
hour
||
task
.
infoForCell
.
endHour
===
hour
+
1
&&
task
.
infoForCell
.
startHour
+
1
!==
hour
))
)
{
return
(
return
(
<
TaskWithAllStartAndNoEnd
<
TaskWithAllStartAndNoEnd
key
=
{
task
.
id
}
key
=
{
task
.
id
}
...
...
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