Skip to content

Search UI #4716

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

Closed
kivinen wants to merge 1 commit into from
Closed

Search UI #4716

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
4 changes: 1 addition & 3 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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())
Expand Down
6 changes: 3 additions & 3 deletions ietf/templates/meeting/upcoming.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ <h1>Upcoming Meetings</h1>
{% 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>
Expand Down Expand Up @@ -123,7 +123,7 @@ <h3 class="my-3">No upcoming meetings</h3>
{
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 %}
Expand Down