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
cf6fe923
Commit
cf6fe923
authored
Dec 17, 2022
by
Ermolaev Timur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#111
Подправил стили
parent
8e13b66b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
7 deletions
+14
-7
CalendarModalTaskContent.js
...dars/CalendarModalTaskContent/CalendarModalTaskContent.js
+2
-2
CalendarColumnDayWeek.js
...lendarBody/CalendarColumnDayWeek/CalendarColumnDayWeek.js
+1
-1
CalendarWeekTask.js
...alendarColumnDayWeek/CalendarWeekTask/CalendarWeekTask.js
+11
-4
No files found.
planner-front/src/components/Calendars/CalendarModalTaskContent/CalendarModalTaskContent.js
View file @
cf6fe923
...
@@ -10,8 +10,8 @@ function CalendarModalTaskContent({ title, onChangeCurrentTaskHandler, descripti
...
@@ -10,8 +10,8 @@ function CalendarModalTaskContent({ title, onChangeCurrentTaskHandler, descripti
if
(
title
)
{
if
(
title
)
{
const
startHourInt
=
parseInt
(
startHour
)
const
startHourInt
=
parseInt
(
startHour
)
const
endHourInt
=
parseInt
(
endHour
)
const
endHourInt
=
parseInt
(
endHour
)
if
(
startHourInt
>=
8
&&
startHourInt
<=
2
2
)
{
if
(
startHourInt
>=
8
&&
startHourInt
<=
2
4
)
{
if
(
endHourInt
>=
8
&&
endHourInt
<=
2
2
)
{
if
(
endHourInt
>=
8
&&
endHourInt
<=
2
4
)
{
if
(
startHourInt
<
endHourInt
)
{
if
(
startHourInt
<
endHourInt
)
{
return
true
return
true
}
}
...
...
planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/CalendarColumnDayWeek/CalendarColumnDayWeek.js
View file @
cf6fe923
...
@@ -85,7 +85,7 @@ function CalendarColumnDayWeek({ hoursInDay, tasks, month, year, day, hourFormat
...
@@ -85,7 +85,7 @@ function CalendarColumnDayWeek({ hoursInDay, tasks, month, year, day, hourFormat
const
arr
=
[
'red'
,
'blue'
,
'yellow'
,
'purple'
,
'green'
]
const
arr
=
[
'red'
,
'blue'
,
'yellow'
,
'purple'
,
'green'
]
return
(
<>
return
(
<>
<
Grid
item
xs
=
{
12
/
7
}
ref
=
{
dayColumnRef
}
sx
=
{{
position
:
'relative'
}}
>
<
Grid
item
xs
=
{
12
/
7
}
ref
=
{
dayColumnRef
}
sx
=
{{
position
:
'relative'
}}
>
{
linesInDay
?.
map
((
line
,
i
)
=>
{
{
linesInDay
?.
map
((
line
,
i
)
=>
{
const
boxes
=
getBoxesInLine
(
line
,
hoursInDay
,
sortedTasks
,
linesInDay
)
const
boxes
=
getBoxesInLine
(
line
,
hoursInDay
,
sortedTasks
,
linesInDay
)
return
(
<>
return
(
<>
...
...
planner-front/src/components/Calendars/WeekCalendar/WeekCalendarBody/CalendarColumnDayWeek/CalendarWeekTask/CalendarWeekTask.js
View file @
cf6fe923
...
@@ -17,7 +17,7 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
...
@@ -17,7 +17,7 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
const
styles
=
{
const
styles
=
{
borderRadius
:
'5px'
,
borderRadius
:
'5px'
,
border
:
'1px solid
black
'
,
border
:
'1px solid
white
'
,
backgroundColor
:
color
,
backgroundColor
:
color
,
height
:
`
${
height
}
px`
,
height
:
`
${
height
}
px`
,
width
:
`
${
width
}
px`
,
width
:
`
${
width
}
px`
,
...
@@ -27,13 +27,20 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
...
@@ -27,13 +27,20 @@ function CalendarWeekTask({ height, width, left, top, task, zIndex }) {
zIndex
:
zIndex
,
zIndex
:
zIndex
,
textAlign
:
'left'
,
textAlign
:
'left'
,
overflow
:
'hidden'
,
overflow
:
'hidden'
,
textOverflow
:
'ellipsis'
textOverflow
:
'ellipsis'
,
'&:hover'
:
{
cursor
:
'pointer'
,
boxShadow
:
'inset 0 0 100px 100px rgba(255, 255, 255, 0.3)'
},
"&:active"
:
{
zIndex
:
100
}
}
}
return
(
return
(
<
Box
<
Box
sx
=
{
styles
}
>
sx
=
{
styles
}
>
<
span
style
=
{{
position
:
'absolute'
,
textOverflow
:
'ellipsis'
,
padding
:
'5px 0 0 10
px'
}}
>
<
span
style
=
{{
textOverflow
:
'ellipsis'
,
padding
:
'5px 0 0 5
px'
}}
>
{
task
.
title
}
{
task
.
title
}
<
/span
>
<
/span
>
<
/Box>
)
;
<
/Box>
)
;
...
...
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