From 969e34aba1486e684d2d0120ffbbe91b440d51fd Mon Sep 17 00:00:00 2001 From: denise Date: Thu, 7 Feb 2013 12:22:32 -0500 Subject: [PATCH] CC-4930: Calendar -> Recorded shows have 'show partially filled' icon -fixed --- .../schedule/full-calendar-functions.js | 94 ++++++++++--------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 810ce0d88..192d811fe 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -233,55 +233,61 @@ function eventRender(event, element, view) { } //add the record/rebroadcast/soundcloud icons if needed - if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -1) { - $(element).find(".fc-event-time").before(''); - } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id > 0) { - $(element).find(".fc-event-time").before(''); - } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -2) { - $(element).find(".fc-event-time").before(''); - } else if ((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.record === 1 && event.soundcloud_id === -3) { - $(element).find(".fc-event-time").before(''); - } - - if(view.name === 'month' && event.record === 1 && event.soundcloud_id === -1) { - $(element).find(".fc-event-title").after(''); - } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id > 0) { - $(element).find(".fc-event-title").after(''); - } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -2) { - $(element).find(".fc-event-title").after(''); - } else if (view.name === 'month' && event.record === 1 && event.soundcloud_id === -3) { - $(element).find(".fc-event-title").after(''); - } - - if (view.name === 'agendaDay' || view.name === 'agendaWeek') { - if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) { - $(element) - .find(".fc-event-time") - .before(''); - } else if (event.show_partial_filled === true) { - $(element) - .find(".fc-event-time") - .before(''); + if (event.record === 1) { + if (view.name === 'agendaDay' || view.name === 'agendaWeek') { + if (event.soundcloud_id === -1) { + $(element).find(".fc-event-time").before(''); + } else if ( event.soundcloud_id > 0) { + $(element).find(".fc-event-time").before(''); + } else if (event.soundcloud_id === -2) { + $(element).find(".fc-event-time").before(''); + } else if (event.soundcloud_id === -3) { + $(element).find(".fc-event-time").before(''); + } + } else if (view.name === 'month') { + if(event.soundcloud_id === -1) { + $(element).find(".fc-event-title").after(''); + } else if (event.soundcloud_id > 0) { + $(element).find(".fc-event-title").after(''); + } else if (event.soundcloud_id === -2) { + $(element).find(".fc-event-title").after(''); + } else if (event.soundcloud_id === -3) { + $(element).find(".fc-event-title").after(''); + } } - } else if (view.name === 'month') { - if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) { - $(element) - .find(".fc-event-title") - .after(''); - } else if (event.show_partial_filled === true) { - $(element) - .find(".fc-event-title") - .after(''); + } + + if (event.record === 0 && event.rebroadcast === 0) { + if (view.name === 'agendaDay' || view.name === 'agendaWeek') { + if (event.show_empty === 1) { + $(element) + .find(".fc-event-time") + .before(''); + } else if (event.show_partial_filled === true) { + $(element) + .find(".fc-event-time") + .before(''); + } + } else if (view.name === 'month') { + if (event.show_empty === 1) { + $(element) + .find(".fc-event-title") + .after(''); + } else if (event.show_partial_filled === true) { + $(element) + .find(".fc-event-title") + .after(''); + } } } //rebroadcast icon - if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) { - $(element).find(".fc-event-time").before(''); - } - - if(view.name === 'month' && event.rebroadcast === 1) { - $(element).find(".fc-event-title").after(''); + if (event.rebroadcast === 1) { + if (view.name === 'agendaDay' || view.name === 'agendaWeek') { + $(element).find(".fc-event-time").before(''); + } else if (view.name === 'month') { + $(element).find(".fc-event-title").after(''); + } } }