Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Merge requests
!1148
Calendar events and iCal feeds
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Calendar events and iCal feeds
calendar-object-feeds
into
master
Overview
43
Commits
108
Pipelines
54
Changes
4
Merged
Jonathan Weth
requested to merge
calendar-object-feeds
into
master
2 years ago
Overview
29
Commits
108
Pipelines
54
Changes
4
Expand
0
0
Merge request reports
Viewing commit
817e6f63
Show latest version
4 files
+
78
−
10
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
817e6f63
Dynamic fetching of calendar events by start/end date selected in frontend
· 817e6f63
Hangzhi Yu
authored
1 year ago
aleksis/core/frontend/components/calendar/CalendarOverview.vue
+
56
−
9
Options
<
template
>
<div
class=
"mt-4 mb-4"
>
<v-skeleton-loader
v-if=
"$apollo.queries.calendarFeeds.loading"
v-if=
"$apollo.queries.calendarFeeds.loading
&& calendarFeeds.length === 0
"
type=
"date-picker-options, actions"
/>
<div
v-else
>
@@ -72,6 +72,12 @@
</v-col>
<v-col
lg=
"9"
xl=
"10"
>
<v-sheet
height=
"600"
>
<v-expand-transition>
<v-progress-linear
v-if=
"$apollo.queries.calendarFeeds.loading"
indeterminate
/>
</v-expand-transition>
<v-calendar
ref=
"calendar"
v-model=
"calendarFocus"
@@ -83,6 +89,7 @@
@
click:day=
"viewDay"
@
click:more=
"viewDay"
@
click:event=
"viewEvent"
@
change=
"fetchMoreCalendarEvents"
></v-calendar>
<component
v-if=
"calendarFeeds && selectedEvent"
@@ -127,19 +134,13 @@ export default {
{
type
:
"
week
"
,
translationKey
:
"
calendar.week
"
,
icon
:
"
calendar-week-outline
"
},
{
type
:
"
day
"
,
translationKey
:
"
calendar.day
"
,
icon
:
"
calendar-today-outline
"
},
],
start
:
null
,
end
:
null
,
fetchedDateRange
:
{
start
:
null
,
end
:
null
},
};
},
apollo
:
{
calendarFeeds
:
{
query
:
gqlCalendarOverview
,
variables
()
{
return
{
start
:
this
.
start
,
end
:
this
.
end
,
};
},
skip
:
true
,
},
},
computed
:
{
@@ -196,6 +197,52 @@ export default {
getColorForEvent
(
event
)
{
return
event
.
color
;
},
fetchMoreCalendarEvents
({
start
,
end
})
{
let
extendedStart
=
this
.
$refs
.
calendar
.
getStartOfWeek
(
start
).
date
;
let
extendedEnd
=
this
.
$refs
.
calendar
.
getEndOfWeek
(
end
).
date
;
let
olderStart
=
extendedStart
<
this
.
fetchedDateRange
.
start
;
let
youngerEnd
=
extendedEnd
>
this
.
fetchedDateRange
.
end
;
if
(
this
.
calendarFeeds
.
length
===
0
)
{
this
.
$apollo
.
queries
.
calendarFeeds
.
setVariables
({
start
:
extendedStart
,
end
:
extendedEnd
,
});
this
.
$apollo
.
queries
.
calendarFeeds
.
skip
=
false
;
this
.
fetchedDateRange
=
{
start
:
extendedStart
,
end
:
extendedEnd
};
}
else
if
(
olderStart
||
youngerEnd
)
{
let
newStart
=
olderStart
?
extendedStart
:
this
.
fetchedDateRange
.
start
;
let
newEnd
=
youngerEnd
?
extendedEnd
:
this
.
fetchedDateRange
.
end
;
this
.
$apollo
.
queries
.
calendarFeeds
.
fetchMore
({
variables
:
{
start
:
olderStart
?
extendedStart
:
this
.
fetchedDateRange
.
end
,
end
:
youngerEnd
?
extendedEnd
:
this
.
fetchedDateRange
.
start
,
},
updateQuery
:
(
previousResult
,
{
fetchMoreResult
})
=>
{
let
previousCalendarFeeds
=
previousResult
.
calendarFeeds
;
let
newCalendarFeeds
=
fetchMoreResult
.
calendarFeeds
;
previousCalendarFeeds
.
forEach
(
(
cf
,
i
,
cfs
)
=>
(
cfs
[
i
].
feed
.
events
=
[
...
cf
.
feed
.
events
,
...
newCalendarFeeds
.
find
((
ncf
)
=>
ncf
.
name
===
cf
.
name
)
.
feed
.
events
.
filter
((
e
)
=>
cf
.
feed
.
events
.
indexOf
(
e
)
===
-
1
),
])
);
return
{
calendarFeeds
:
previousCalendarFeeds
,
};
},
});
this
.
fetchedDateRange
=
{
start
:
newStart
,
end
:
newEnd
};
}
},
},
mounted
()
{
this
.
$refs
.
calendar
.
move
(
0
);
Loading