edward/agenda
1
0
Fork 0
Code Issues 27 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: edward:f49b0ce732ab33d6a92c0bca03d21a77f03ec9ee
Branches Tags
edward:main
edward:launch-page
edward:navbar
..
compare: edward:233d4e7fb7c216c9f528d78c8e0b58d80ca82aa9
Branches Tags
edward:main
edward:launch-page
edward:navbar

No commits in common. "f49b0ce732ab33d6a92c0bca03d21a77f03ec9ee" and "233d4e7fb7c216c9f528d78c8e0b58d80ca82aa9" have entirely different histories.
f49b0ce732 ... 233d4e7fb7

2 changed files with 6 additions and 9 deletions
Show stats Expand all files Collapse all files

6
agenda/data.py
View file

@ -360,7 +360,7 @@ async def get_data(
two_weeks_ago = today - timedelta(weeks=2) two_weeks_ago = today - timedelta(weeks=2)
last_week = today - timedelta(weeks=1) last_week = today - timedelta(weeks=1)
last_year = today - timedelta(days=365) last_year = today - timedelta(days=365)
next_year = today + timedelta(days=2 * 365) next_year = today + timedelta(days=365)
minus_365 = now - timedelta(days=365) minus_365 = now - timedelta(days=365)
plus_365 = now + timedelta(days=365) plus_365 = now + timedelta(days=365)
@ -478,7 +478,9 @@ async def get_data(
busy_events = [ busy_events = [
e e
for e in sorted(events, key=lambda e: e.as_date) for e in sorted(events, key=lambda e: e.as_date)
if e.as_date > today and e.as_date < next_year and busy_event(e) if e.as_date > today
and e.as_date < (today + timedelta(days=365 * 2))
and busy_event(e)
] ]
gaps = find_gaps(busy_events) gaps = find_gaps(busy_events)

7
templates/index.html
View file

@ -171,14 +171,9 @@
</div> </div>
<div class="col-md-2{{ cell_bg }}"> <div class="col-md-2{{ cell_bg }}">
{% if event.end_date %} {% if event.end_date and event.end_as_date != event.as_date %}
{% if event.end_as_date == event.as_date and event.has_time %}
end: {{event.end_date.strftime("%H:%M") }}
(duration: {{event.end_date - event.date}})
{% elif event.end_date != event.date %}
{{event.end_date}} {{event.end_date}}
{% endif %} {% endif %}
{% endif %}
</div> </div>
<div class="col-md-7 text-start"> <div class="col-md-7 text-start">