Skip to content

Added option to adjust number of days displayed in calendar #651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JosefBuchner wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added option to adjust number of days displayed in calendar #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/plugins/calendar/calendar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,16 @@ def generate_image(self, settings, device_config):
if not events:
logger.warning("No events found for ics url")

if view == 'timeGridWeek' and settings.get("displayPreviousDays") != "true":
initial_date = None
if view == 'timeGridWeek':
view = 'timeGrid'
initial_date = start.strftime("%Y-%m-%d")

template_params = {
"view": view,
"events": events,
"current_dt": current_dt.replace(minute=0, second=0, microsecond=0).isoformat(),
"initial_date": initial_date,
"timezone": timezone,
"plugin_settings": settings,
"time_format": time_format,
Expand Down Expand Up @@ -105,7 +108,7 @@ def get_view_range(self, view, current_dt, settings):
offset = (current_dt.weekday() - python_week_start) % 7
start = current_dt - timedelta(days=offset)
start = datetime(start.year, start.month, start.day)
end = start + timedelta(days=7)
end = start + timedelta(days=int(settings.get("numDays") or 7))
elif view == "dayGrid":
start = current_dt - timedelta(weeks=1)
end = current_dt + timedelta(weeks=int(settings.get("displayWeeks") or 4))
Expand Down
3 changes: 2 additions & 1 deletion src/plugins/calendar/render/calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

const calendar = new FullCalendar.Calendar(calendarEl, {
initialView: '{{ view }}',
{% if initial_date %}initialDate: '{{ initial_date }}',{% endif %}
events: events,
now: '{{ current_dt }}',
timeZone: '{{ timezone }}',
Expand All @@ -49,7 +50,7 @@
weekends: {{ (plugin_settings.displayWeekends == "true") | tojson}},
nowIndicator: {{ (plugin_settings.displayNowIndicator == "true") | tojson}},
fixedWeekCount: false,
{% if view == 'timeGrid' %}duration: {days : 7 },{% endif %}
{% if view == 'timeGrid' %}duration: {days : {{ plugin_settings.numDays | default(7) | int }} },{% endif %}
{% if view == 'dayGrid' %}duration: {weeks : "{{ plugin_settings.displayWeeks or 4}}" },{% endif %}
headerToolbar: {
left: '',
Expand Down
7 changes: 7 additions & 0 deletions src/plugins/calendar/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
<input type="number" id="endTimeInterval" name="endTimeInterval" class="form-input" min="0" max="24" placeholder="24">
</div>

<div class="form-group nowrap" data-visible-modes="timeGridWeek">
<label for="numDays">Number of Days:</label>
<input type="number" id="numDays" name="numDays" class="form-input" min="1" max="30" placeholder="7" value="7">
</div>

<div class="form-group nowrap" data-visible-modes="dayGrid">
<label for="interval">Display Weeks:</label>
<input type="number" id="displayWeeks" name="displayWeeks" class="form-input" min="1" max="52" placeholder="4">
Expand Down Expand Up @@ -201,6 +206,8 @@
document.getElementById("endTimeInterval").value = pluginSettings.endTimeInterval;

document.getElementById("displayWeeks").value = pluginSettings.displayWeeks;

document.getElementById("numDays").value = pluginSettings.numDays || 7;

if (pluginSettings["calendarURLs[]"]) {
calendars = pluginSettings["calendarURLs[]"].map((url, i) => ({
Expand Down