diff --git a/lib/calcms/events.pm b/lib/calcms/events.pm
index 2dc14e7..09668d4 100644
--- a/lib/calcms/events.pm
+++ b/lib/calcms/events.pm
@@ -1211,7 +1211,7 @@ sub render {
if ( $project->{name} ne '' );
$template_parameters->{controllers} = $config->{controllers};
- $template_parameters->{hide_event_images}=1 if $config->{permissions}->{hide_event_images} == 1;
+ $template_parameters->{hide_event_images}=1 if (defined $config->{permissions}->{hide_event_images}) && ($config->{permissions}->{hide_event_images} == 1);
# use Data::Dumper;print STDERR Dumper($template_parameters)."\n";
template::process( $_[0], $params->{template}, $template_parameters );
diff --git a/lib/calcms/series_dates.pm b/lib/calcms/series_dates.pm
index 9eb53b0..545e938 100644
--- a/lib/calcms/series_dates.pm
+++ b/lib/calcms/series_dates.pm
@@ -145,7 +145,7 @@ sub get_series{
my $condition=shift;
my $date_range_include=0;
- $date_range_include=1 if $condition->{date_range_include}==1;
+ $date_range_include=1 if (defined $condition->{date_range_include}) && ($condition->{date_range_include}==1);
my $dbh=db::connect($config);
diff --git a/lib/calcms/studio_timeslot_dates.pm b/lib/calcms/studio_timeslot_dates.pm
index 7cb4006..226434e 100644
--- a/lib/calcms/studio_timeslot_dates.pm
+++ b/lib/calcms/studio_timeslot_dates.pm
@@ -35,7 +35,7 @@ sub get{
my $condition=shift;
my $date_range_include=0;
- $date_range_include=1 if $condition->{date_range_include}==1;
+ $date_range_include=1 if (defined $condition->{date_range_include}) && ($condition->{date_range_include}==1);
my $dbh=db::connect($config);
diff --git a/lib/calcms/work_dates.pm b/lib/calcms/work_dates.pm
index e53af98..8319f03 100644
--- a/lib/calcms/work_dates.pm
+++ b/lib/calcms/work_dates.pm
@@ -40,7 +40,7 @@ sub get{
my $condition=shift;
my $date_range_include=0;
- $date_range_include=1 if $condition->{date_range_include}==1;
+ $date_range_include=1 if (defined $condition->{date_range_include}) && ($condition->{date_range_include}==1);
my $dbh=db::connect($config);
diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi
index cdf4a00..30f4d94 100755
--- a/website/agenda/planung/calendar.cgi
+++ b/website/agenda/planung/calendar.cgi
@@ -28,6 +28,7 @@ use markup;
use user_settings;
use localization;
use DateTime;
+use audio_recordings;
binmode STDOUT, ":utf8";
@@ -423,9 +424,12 @@ sub showCalendar {
$events_by_start->{ $date->{start} }->{duration} = $date->{duration} || 0;
$events_by_start->{ $date->{start} }->{rms_left} = $date->{rms_left} || 0;
$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} ;
}
push @$events, $date;
}
+
}
#output
@@ -490,6 +494,15 @@ sub showCalendar {
}
}
+ for my $event (@$events){
+ next unless defined $event->{uploaded_at};
+ #print STDERR "uploadAt=$event->{uploaded_at}, playoutModified:$event->{playout_modified_at}, playoutUpdatedAt:$event->{playout_updated_at}\n";
+ next if (defined $event->{playout_updated_at}) && ( $event->{uploaded_at} lt $event->{playout_updated_at} );
+ #print STDERR Dumper($event);
+ $event->{upload} ='pending' ;
+ #$event->{title}.='
pending';
+ }
+
if ( $params->{list} == 1 ) {
showEventList( $config, $permissions, $params, $events_by_day );
} else {
@@ -1405,6 +1418,10 @@ sub print_event {
$attr .= ' start="' . $event->{start} . '"' if defined $event->{start};
}
+ if (defined $event->{upload}){
+ $content.='
uploading ';
+ }
+
if ($showIcons) {
$content = '