Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Open sidebar
PublicCode
Churchtools-to-Songbeamer
Commits
35357ad4
Commit
35357ad4
authored
Aug 21, 2018
by
Marcel
Browse files
fix
#1
show events on current date
parent
ca4cb74a
Pipeline
#28371751
passed with stage
in 1 minute and 17 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
src/main/java/de/apisstuttgart/churchtoolstosongbeamer/domain/CtEvent.java
...apisstuttgart/churchtoolstosongbeamer/domain/CtEvent.java
+1
-1
src/main/java/de/apisstuttgart/churchtoolstosongbeamer/service/CtEventService.java
...tgart/churchtoolstosongbeamer/service/CtEventService.java
+1
-1
No files found.
src/main/java/de/apisstuttgart/churchtoolstosongbeamer/domain/CtEvent.java
View file @
35357ad4
...
...
@@ -37,7 +37,7 @@ public class CtEvent implements Comparable {
}
public
boolean
isPast
()
{
return
LocalDate
.
now
().
is
Before
(
getStartAsDateTime
().
toLocalDate
());
return
LocalDate
.
now
().
is
After
(
getStartAsDateTime
().
toLocalDate
());
}
@Override
...
...
src/main/java/de/apisstuttgart/churchtoolstosongbeamer/service/CtEventService.java
View file @
35357ad4
...
...
@@ -50,7 +50,7 @@ public class CtEventService {
Collection
<
CtEvent
>
eventCollection
=
response
.
getBody
().
getData
().
values
();
// Filter past events and events without an agenda
eventCollection
=
eventCollection
.
stream
().
filter
(
ctEvent
->
ctEvent
.
isPast
()).
filter
(
ctEvent
->
Boolean
.
TRUE
.
equals
(
ctEvent
.
getAgenda
())).
collect
(
Collectors
.
toList
());
eventCollection
=
eventCollection
.
stream
().
filter
(
ctEvent
->
!
ctEvent
.
isPast
()).
filter
(
ctEvent
->
Boolean
.
TRUE
.
equals
(
ctEvent
.
getAgenda
())).
collect
(
Collectors
.
toList
());
CtEvent
[]
events
=
eventCollection
.
toArray
(
new
CtEvent
[
0
]);
...
...
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