Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
8052bdbc
Commit
8052bdbc
authored
May 31, 2017
by
Wietse Kuipers
Browse files
Fix multi-day events being rendered wrong
parent
aaa23233
Changes
3
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
8052bdbc
image
:
kkarczmarczyk/node-yarn:latest
stages
:
-
build
-
test
cache
:
...
...
@@ -12,13 +11,8 @@ cache:
-
.yarn
yarn install
:
stage
:
build
stage
:
test
script
:
-
yarn config set cache-folder .yarn
-
yarn install
jest
:
stage
:
test
script
:
-
rm -rf .yarn
-
yarn lint
app/components/Calendar.js
View file @
8052bdbc
...
...
@@ -56,22 +56,22 @@ const eventListToSections = (eventList) => {
title
:
`
${
eventList
[
i
].
title
}
(dag 1/
${
daySpan
}
)`
,
end
:
null
,
});
// Add end day
addEventToSection
(
sections
,
end
,
{
...
eventList
[
i
],
title
:
`
${
eventList
[
i
].
title
}
(dag
${
daySpan
}
/
${
daySpan
}
)`
,
start
:
null
,
});
// Add all intermediate days
for
(
let
j
=
2
;
j
<
daySpan
;
j
+=
1
)
{
addEventToSection
(
sections
,
start
.
add
(
j
-
1
,
'
days
'
),
{
addEventToSection
(
sections
,
start
.
add
(
1
,
'
days
'
),
{
...
eventList
[
i
],
start
:
null
,
end
:
null
,
title
:
`
${
eventList
[
i
].
title
}
(dag
${
j
}
/
${
daySpan
}
)`
,
});
}
// Add end day
addEventToSection
(
sections
,
end
,
{
...
eventList
[
i
],
title
:
`
${
eventList
[
i
].
title
}
(dag
${
daySpan
}
/
${
daySpan
}
)`
,
start
:
null
,
});
}
}
...
...
app/style.js
View file @
8052bdbc
...
...
@@ -11,7 +11,6 @@ export const colors = {
textColour
:
'
#313131
'
,
darkGrey
:
'
#373737
'
,
dividerGrey
:
'
rgba(0, 0, 0, 0.12)
'
,
background
:
'
#FAFAFA
'
,
transparent
:
'
transparent
'
,
};
...
...
Write
Preview
Supports
Markdown
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