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

fix: Identify cancelled meetings in calendar (#5117)

Browse source 
Fixes #4815
This commit is contained in:
Lars Eggert 2023-02-10 01:07:48 +02:00 committed by GitHub
parent 1fc2042265
commit e280b25d0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ietf/static/js/upcoming.js
View file

@ -3,6 +3,12 @@ var display_events = []; // filtered events, processed for calendar display
var event_calendar; // handle on the calendar object var event_calendar; // handle on the calendar object
var current_tz = 'UTC'; var current_tz = 'UTC';
const primary = getComputedStyle(document.body)
.getPropertyValue('--bs-primary');
const secondary = getComputedStyle(document.body)
.getPropertyValue('--bs-secondary');
// Test whether an event should be visible given a set of filter parameters // Test whether an event should be visible given a set of filter parameters
function calendar_event_visible(filter_params, event) { function calendar_event_visible(filter_params, event) {
// Visible if filtering is disabled or event has no keywords // Visible if filtering is disabled or event has no keywords
@ -49,10 +55,14 @@ function make_display_events(event_data, tz) {
glue + (src_event.group || 'Invalid event')); glue + (src_event.group || 'Invalid event'));
} }
return { return {
title: title, title: src_event.current_status != "canceled" ? title : `<del>${title}</del>`,
extendedProps: {
desc: src_event.current_status != "canceled" ? title : `CANCELLED: ${title}`
},
start: format_moment(src_event.start_moment, tz, 'datetime'), start: format_moment(src_event.start_moment, tz, 'datetime'),
end: format_moment(src_event.end_moment, tz, 'datetime'), end: format_moment(src_event.end_moment, tz, 'datetime'),
url: src_event.url url: src_event.url,
backgroundColor: src_event.current_status != "canceled" ? primary: secondary
}; // all events have the URL }; // all events have the URL
}); });
} }
@ -78,9 +88,12 @@ function update_calendar(tz, filter_params) {
initialView: 'dayGridMonth', initialView: 'dayGridMonth',
displayEventTime: false, displayEventTime: false,
events: function (fInfo, success) { success(display_events); }, events: function (fInfo, success) { success(display_events); },
eventContent: function(info) {
return {html: info.event.title};
},
eventDidMount: function (info) { eventDidMount: function (info) {
$(info.el) $(info.el)
.tooltip({ title: info.event.title }); .tooltip({ title: info.event.extendedProps.desc });
}, },
eventDisplay: 'block' eventDisplay: 'block'
}); });
@ -158,4 +171,4 @@ window.timezone_changed = function (newtz) {
} }
update_calendar(newtz); update_calendar(newtz);
}; };

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

@ -137,6 +137,7 @@
{% with session=entry %} {% with session=entry %}
{ {
group: '{% if session.group %}{{session.group.acronym}}{% endif %}{% if session.name %} - {{session.name}}{% endif %}', group: '{% if session.group %}{{session.group.acronym}}{% endif %}{% if session.name %} - {{session.name}}{% endif %}',
current_status: '{{ session.current_status }}',
filter_keywords: ["{{ session.filter_keywords|join:'","' }}"], filter_keywords: ["{{ session.filter_keywords|join:'","' }}"],
start_moment: moment.utc('{{session.official_timeslotassignment.timeslot.time | utc | date:"Y-m-d H:i"}}'), start_moment: moment.utc('{{session.official_timeslotassignment.timeslot.time | utc | date:"Y-m-d H:i"}}'),
end_moment: moment.utc('{{session.official_timeslotassignment.timeslot.end_time | utc | date:"Y-m-d H:i"}}'), end_moment: moment.utc('{{session.official_timeslotassignment.timeslot.end_time | utc | date:"Y-m-d H:i"}}'),
@ -157,4 +158,4 @@
agenda_filter.enable(); agenda_filter.enable();
}); });
</script> </script>
{% endblock %} {% endblock %}