altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

fix: Fix upcoming to use Meeting.end_date. (#4701)

Browse source
This commit is contained in:
Tero Kivinen 2022-11-05 13:54:13 -04:00 committed by GitHub
parent 91170430ff
commit 8cf309cd6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/meeting/views.py
View file

@ -3466,8 +3466,6 @@ def upcoming(request):
# Get ietf meetings starting 7 days ago, and interim meetings starting today
ietf_meetings = Meeting.objects.filter(type_id='ietf', date__gte=today-datetime.timedelta(days=7))
for m in ietf_meetings:
m.end = m.date + datetime.timedelta(days=m.days-1) # subtract 1 to avoid counting an extra day
interim_sessions = add_event_info_to_session_qs(
Session.objects.filter(
@ -3495,7 +3493,7 @@ def upcoming(request):
for o in entries:
if isinstance(o, Meeting):
o.start_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.date, datetime.time.min)).timestamp())
o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end, datetime.time.max)).timestamp())
o.end_timestamp = int(pytz.utc.localize(datetime.datetime.combine(o.end_date(), datetime.time.max)).timestamp())
else:
o.start_timestamp = int(o.official_timeslotassignment().timeslot.utc_start_time().timestamp())
o.end_timestamp = int(o.official_timeslotassignment().timeslot.utc_end_time().timestamp())

6
ietf/templates/meeting/upcoming.html
View file

@ -51,9 +51,9 @@
{% with meeting=entry %}
<td class="meeting-time"
data-start-date="{{ meeting.date }}"
data-end-date="{{ meeting.end }}"
data-end-date="{{ meeting.end_date }}"
data-time-zone="{{ meeting.time_zone }}">
{{ meeting.date }} to {{ meeting.end }}
{{ meeting.date }} to {{ meeting.end_date }}
</td>
<td>ietf</td>
<td>
@ -123,7 +123,7 @@
{
ietf_meeting_number: '{{ meeting.number }}',
start_moment: moment.tz('{{meeting.date}}', '{{ meeting.time_zone }}').startOf('day'),
end_moment: moment.tz('{{meeting.end}}', '{{ meeting.time_zone }}').endOf('day'),
end_moment: moment.tz('{{meeting.end_date}}', '{{ meeting.time_zone }}').endOf('day'),
url: '{% url 'agenda' num=meeting.number %}'
}{% if not forloop.last %}, {% endif %}
{% endwith %}