From 380b16735454f2d0230cba08efe8be8363886372 Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 23 May 2020 23:26:15 +0200 Subject: [PATCH] calendar: show playout path on icon move icon generation from javascript to perl --- website/agenda/planung/calendar.cgi | 23 ++++++++++++++++++++++- website/agenda/planung/js/calendar.js | 20 -------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index 132e043..3f1137f 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -449,6 +449,7 @@ sub showCalendar { $events_by_start->{ $date->{start} }->{rms_right} = $date->{rms_right} || 0; $events_by_start->{ $date->{start} }->{playout_modified_at} = $date->{modified_at}; $events_by_start->{ $date->{start} }->{playout_updated_at} = $date->{updated_at}; + $events_by_start->{ $date->{start} }->{file} = $date->{file}; } push @$events, $date; } @@ -1504,7 +1505,27 @@ sub print_event { } if ($showIcons) { - $content = '
' . $content . '
'; + my $attr = { map { $_ => undef } split( /\s+/, $class) }; + + my $file = $event->{file} + ? 'playout: ' . $event->{file} =~ s/\'/\'/gr + : 'playout'; + + my $icons=''; + if ( exists $attr->{event} ){ + $icons.='' + if exists($attr->{live}) && exists($attr->{no_rerun}); + $icons.='' + if exists($attr->{preproduced}) && exists($attr->{no_rerun}); + $icons.='' + if exists $attr->{rerun}; + $icons.=qq{} + if exists $attr->{playout}; + $icons.='' + if exists $attr->{archived}; + } + + $content = qq{
$content
$icons
}; } my $time = ''; diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index 9d31832..031c0ae 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -346,25 +346,6 @@ function checkStudio(){ return 1; } -function setIcons(){ - var img=''; - - img=''; - $('#calendar div.event.live.no_rerun div.icons').append(img); - - img=''; - $('#calendar div.event.preproduced.no_rerun div.icons').append(img); - - img=''; - $('#calendar div.event.rerun div.icons').append(img); - - img=''; - $('#calendar div.event.playout div.icons').append(img); - - img=''; - $('#calendar div.event.archived div.icons').append(img); -} - function show_not_assigned_to_series_dialog(){ $("#event_no_series").dialog({ resizable: false, @@ -773,7 +754,6 @@ function updateTable(){ ); //set checkboxes from url parameters and update all urls - setIcons(); $('#calendar').show(); showMouse();