kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor event and series editor

Browse Source
This commit is contained in:
Milan
2020-03-01 22:48:15 +01:00
parent 9860eee1e2
commit 87094ac537
2 changed files with 195 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
website/agenda/planung/event.cgi
View File

@@ -4,7 +4,6 @@ use strict;
use warnings; use warnings;
no warnings 'redefine'; no warnings 'redefine';
#use URI::Escape();
use Encode(); use Encode();
use Data::Dumper; use Data::Dumper;
use MIME::Base64(); use MIME::Base64();
@@ -41,7 +40,6 @@ my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
return if ( ( !defined $user ) || ( $user eq '' ) ); return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(
$config, $config,
{ {
@@ -62,8 +60,6 @@ my $request = {
}, },
}; };
#print STDERR Dumper($request)."\n";
#set user at params->presets->user #set user at params->presets->user
$request = uac::prepare_request( $request, $user_presets ); $request = uac::prepare_request( $request, $user_presets );
@@ -73,7 +69,8 @@ $params = $request->{params}->{checked};
unless ( params::isJson() ) { unless ( params::isJson() ) {
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );
$headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } );
template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); template::process( $config, 'print', template::check( $config, 'default.html' ),
$headerParams );
} }
return unless uac::check( $config, $params, $user_presets ) == 1; return unless uac::check( $config, $params, $user_presets ) == 1;
@@ -167,11 +164,10 @@ sub show_event {
uac::print_error("event not found"); uac::print_error("event not found");
} }
#print STDERR "show:".Dumper($event->{draft});
#print STDERR "show event".Dumper($event);
my $editLock = 1; my $editLock = 1;
if ( ( defined $permissions->{update_event_after_week} ) && ( $permissions->{update_event_after_week} eq '1' ) ) { if ( ( defined $permissions->{update_event_after_week} )
&& ( $permissions->{update_event_after_week} eq '1' ) )
{
$editLock = 0; $editLock = 0;
} else { } else {
$editLock = 0 $editLock = 0
@@ -205,9 +201,12 @@ sub show_event {
); );
if ( defined $event2 ) { if ( defined $event2 ) {
for my $attr ( for my $attr (
'title', 'user_title', 'excerpt', 'user_excerpt', 'title', 'user_title',
'content', 'topic', 'image', 'image_label', 'excerpt', 'user_excerpt',
'series_image', 'series_image_label', 'live no_event_sync', 'podcast_url', 'content', 'topic',
'image', 'image_label',
'series_image', 'series_image_label',
'live no_event_sync', 'podcast_url',
'archive_url' 'archive_url'
) )
{ {
@@ -285,9 +284,9 @@ sub show_event {
); );
$params->{series_users} = $users; $params->{series_users} = $users;
#print STDERR Dumper($users);
$params->{series_users_email_list} = join( ',', ( map { $_->{email} } (@$users) ) ); $params->{series_users_email_list} = join( ',', ( map { $_->{email} } (@$users) ) );
$params->{series_user_names} = join( ' und ', ( map { ( split( /\s+/, $_->{full_name} ) )[0] } (@$users) ) ); $params->{series_user_names} =
join( ' und ', ( map { ( split( /\s+/, $_->{full_name} ) )[0] } (@$users) ) );
for my $permission ( sort keys %{$permissions} ) { for my $permission ( sort keys %{$permissions} ) {
$params->{'allow'}->{$permission} = $permissions->{$permission}; $params->{'allow'}->{$permission} = $permissions->{$permission};
@@ -296,11 +295,14 @@ sub show_event {
for my $key ( keys %$event ) { for my $key ( keys %$event ) {
$params->{$key} = $event->{$key}; $params->{$key} = $event->{$key};
} }
$params->{event_edited} = 1 if ( ( $params->{action} eq 'save' ) && ( !( defined $params->{error} ) ) );
$params->{event_edited} = 1 if ( $params->{action} eq 'delete' );
$params->{event_edited} = 1 if ( ( $params->{action} eq 'create_event' ) && ( !( defined $params->{error} ) ) );
$params->{event_edited} = 1 $params->{event_edited} = 1
if ( ( $params->{action} eq 'create_event_from_schedule' ) && ( !( defined $params->{error} ) ) ); if ( ( $params->{action} eq 'save' ) && ( !( defined $params->{error} ) ) );
$params->{event_edited} = 1 if ( $params->{action} eq 'delete' );
$params->{event_edited} = 1
if ( ( $params->{action} eq 'create_event' ) && ( !( defined $params->{error} ) ) );
$params->{event_edited} = 1
if ( ( $params->{action} eq 'create_event_from_schedule' )
&& ( !( defined $params->{error} ) ) );
$params->{user} = $params->{presets}->{user}; $params->{user} = $params->{presets}->{user};
# remove all edit permissions if event is over for more than 2 weeks # remove all edit permissions if event is over for more than 2 weeks
@@ -313,8 +315,8 @@ sub show_event {
$params->{edit_lock} = 1; $params->{edit_lock} = 1;
} }
#print STDERR Dumper($params); $params->{loc} =
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event' } ); localization::get( $config, { user => $params->{presets}->{user}, file => 'event' } );
template::process( $config, 'print', template::check( $config, 'edit-event' ), $params ); template::process( $config, 'print', template::check( $config, 'edit-event' ), $params );
} }
@@ -458,10 +460,9 @@ sub show_new_event {
$params->{'allow'}->{$permission} = $request->{permissions}->{$permission}; $params->{'allow'}->{$permission} = $request->{permissions}->{$permission};
} }
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'event,comment' } ); $params->{loc} =
localization::get( $config, { user => $params->{presets}->{user}, file => 'event,comment' } );
template::process( $config, 'print', template::check( $config, 'edit-event' ), $params ); template::process( $config, 'print', template::check( $config, 'edit-event' ), $params );
#print '<pre>'.Dumper($params).'</pre>';
} }
sub delete_event { sub delete_event {
@@ -535,7 +536,6 @@ sub save_event {
} }
} }
#print Dumper($params);
my $start = $params->{start_date}; my $start = $params->{start_date};
my $end = time::add_minutes_to_datetime( $params->{start_date}, $params->{duration} ); my $end = time::add_minutes_to_datetime( $params->{start_date}, $params->{duration} );
@@ -565,8 +565,9 @@ sub save_event {
#content fields #content fields
for my $key ( for my $key (
'content', 'topic', 'title', 'excerpt', 'episode', 'image', 'content', 'topic', 'title', 'excerpt',
'series_image', 'image_label', 'series_image_label', 'podcast_url', 'archive_url' 'episode', 'image', 'series_image', 'image_label',
'series_image_label', 'podcast_url', 'archive_url'
) )
{ {
next unless defined $permissions->{ 'update_event_field_' . $key }; next unless defined $permissions->{ 'update_event_field_' . $key };
@@ -577,8 +578,6 @@ sub save_event {
} }
} }
#print STDERR "event to update1: ".Dumper($entry);
#user extension fields #user extension fields
for my $key ( 'title', 'excerpt' ) { for my $key ( 'title', 'excerpt' ) {
next unless defined $permissions->{ 'update_event_field_' . $key . '_extension' }; next unless defined $permissions->{ 'update_event_field_' . $key . '_extension' };
@@ -590,7 +589,9 @@ sub save_event {
} }
#status field #status field
for my $key ( 'live', 'published', 'playout', 'archived', 'rerun', 'disable_event_sync', 'draft' ) { for
my $key ( 'live', 'published', 'playout', 'archived', 'rerun', 'disable_event_sync', 'draft' )
{
next unless defined $permissions->{ 'update_event_status_' . $key }; next unless defined $permissions->{ 'update_event_status_' . $key };
if ( $permissions->{ 'update_event_status_' . $key } eq '1' ) { if ( $permissions->{ 'update_event_status_' . $key } eq '1' ) {
$entry->{$key} = $params->{$key} || 0; $entry->{$key} = $params->{$key} || 0;
@@ -615,7 +616,8 @@ sub save_event {
return; return;
} }
my $series = series::get($config, my $series = series::get(
$config,
{ {
project_id => $params->{project_id}, project_id => $params->{project_id},
studio_id => $params->{studio_id}, studio_id => $params->{studio_id},
@@ -630,8 +632,6 @@ sub save_event {
$entry->{image} = images::normalizeName( $serie->{image} ); $entry->{image} = images::normalizeName( $serie->{image} );
$entry->{series_image} = images::normalizeName( $serie->{series_image} ); $entry->{series_image} = images::normalizeName( $serie->{series_image} );
#print STDERR "event to update2: ".Dumper($entry);
$config->{access}->{write} = 1; $config->{access}->{write} = 1;
#update content #update content
@@ -643,7 +643,9 @@ sub save_event {
} }
#update time #update time
if ( ( defined $permissions->{update_event_time} ) && ( $permissions->{update_event_time} eq '1' ) ) { if ( ( defined $permissions->{update_event_time} )
&& ( $permissions->{update_event_time} eq '1' ) )
{
my $entry = { my $entry = {
id => $params->{event_id}, id => $params->{event_id},
start_date => $params->{start_date}, start_date => $params->{start_date},
@@ -755,7 +757,6 @@ sub download {
print STDERR "event.cgi::download look for : $archive_dir/$datetime*.mp3\n"; print STDERR "event.cgi::download look for : $archive_dir/$datetime*.mp3\n";
my @files = glob( $archive_dir . '/' . $datetime . '*.mp3' ); my @files = glob( $archive_dir . '/' . $datetime . '*.mp3' );
#print STDERR Dumper(\@files);
if ( @files > 0 ) { if ( @files > 0 ) {
my $file = $files[0]; my $file = $files[0];
my $key = int( rand(99999999999999999) ); my $key = int( rand(99999999999999999) );
@@ -799,8 +800,9 @@ sub check_params {
#numeric values #numeric values
for my $param ( for my $param (
'id', 'project_id', 'studio_id', 'default_studio_id', 'user_id', 'series_id', 'id', 'project_id', 'studio_id', 'default_studio_id',
'event_id', 'source_event_id', 'episode' 'user_id', 'series_id', 'event_id', 'source_event_id',
'episode'
) )
{ {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
@@ -831,7 +833,11 @@ sub check_params {
} }
#checkboxes #checkboxes
for my $param ( 'live', 'published', 'playout', 'archived', 'rerun', 'draft', 'disable_event_sync', 'get_rerun' ) { for my $param (
'live', 'published', 'playout', 'archived',
'rerun', 'draft', 'disable_event_sync', 'get_rerun'
)
{
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /([01])/ ) ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /([01])/ ) ) {
$checked->{$param} = $1; $checked->{$param} = $1;
} }
@@ -839,8 +845,9 @@ sub check_params {
#strings #strings
for my $param ( for my $param (
'series_name', 'title', 'excerpt', 'content', 'topic', 'program', 'series_name', 'title', 'excerpt', 'content',
'category', 'image', 'series_image', 'user_content', 'user_title', 'user_excerpt', 'topic', 'program', 'category', 'image',
'series_image', 'user_content', 'user_title', 'user_excerpt',
'podcast_url', 'archive_url', 'setImage' 'podcast_url', 'archive_url', 'setImage'
) )
{ {
@@ -855,43 +862,21 @@ sub check_params {
#dates #dates
for my $param ( 'start_date', 'end_date' ) { for my $param ( 'start_date', 'end_date' ) {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d\d\d\d\-\d\d\-\d\d \d\d\:\d\d)/ ) ) { if ( ( defined $params->{$param} )
&& ( $params->{$param} =~ /(\d\d\d\d\-\d\d\-\d\d \d\d\:\d\d)/ ) )
{
$checked->{$param} = $1 . ':00'; $checked->{$param} = $1 . ':00';
} }
} }
#actions and roles #actions
$checked->{action} = ''; $checked->{action} = '';
if ( defined $params->{action} ) { if ( defined $params->{action} ) {
if ( $params->{action} =~ $checked->{action} = $params->{action} if List::Util::any { $_ eq $params->{action} } qw{
/^(save|delete|download|show_new_event|show_new_event_from_schedule|create_event|create_event_from_schedule|get_json)$/ save delete download show_new_event show_new_event_from_schedule
) create_event create_event_from_schedule get_json
{ };
$checked->{action} = $params->{action};
} }
} print STDERR Dumper($checked);
#print STDERR "event params:".Dumper($checked);
return $checked; return $checked;
} }
__DATA__
#requires studio_id,series_id,location
sub get_series_events{
my $config=shift;
my $options=shift;
return undef unless defined $options->{project_id};
return undef unless defined $options->{studio_id};
return undef unless defined $options->{series_id};
$options->{template}= 'no'; # deprecated
$options->{limit} = 200; # deprecated
$options->{get} = 'no_content'; # deprecated
$options->{archive} = 'all'; # deprecated
my $events=series::get_events($config, $options);
return $events;
}

154
website/agenda/planung/series.cgi
View File

@@ -35,7 +35,6 @@ my $r = shift;
my $config = config::get('../config/config.cgi'); my $config = config::get('../config/config.cgi');
my $debug = $config->{system}->{debug}; my $debug = $config->{system}->{debug};
my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
print STDERR Dumper($user);
return if ( !defined $user ) || ( $user eq '' ); return if ( !defined $user ) || ( $user eq '' );
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(
@@ -65,7 +64,8 @@ $params = $request->{params}->{checked};
unless ( params::isJson() ) { unless ( params::isJson() ) {
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );
$headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } );
template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); template::process( $config, 'print', template::check( $config, 'default.html' ),
$headerParams );
} }
return unless uac::check( $config, $params, $user_presets ) == 1; return unless uac::check( $config, $params, $user_presets ) == 1;
@@ -96,11 +96,11 @@ if ( defined $params->{action} ) {
if ( $params->{action} eq 'rebuild_episodes' ) { if ( $params->{action} eq 'rebuild_episodes' ) {
rebuild_episodes( $config, $request ); rebuild_episodes( $config, $request );
return; return;
}; }
if ( $params->{action} eq 'set_rebuilt_episodes' ) { if ( $params->{action} eq 'set_rebuilt_episodes' ) {
set_rebuilt_episodes( $config, $request ); set_rebuilt_episodes( $config, $request );
return; return;
}; }
# save_scan ($config, $request) if ($params->{action} eq 'save_scan'); # save_scan ($config, $request) if ($params->{action} eq 'save_scan');
} }
@@ -108,7 +108,8 @@ if ( defined $params->{action} ) {
$config->{access}->{write} = 0; $config->{access}->{write} = 0;
if ( defined $params->{series_id} ) { if ( defined $params->{series_id} ) {
print q{<script src="js/edit-series.js" type="text/javascript"></script>} unless params::isJson(); print q{<script src="js/edit-series.js" type="text/javascript"></script>}
unless params::isJson();
show_series( $config, $request ); show_series( $config, $request );
} else { } else {
print q{ print q{
@@ -133,7 +134,6 @@ sub save_schedule {
return; return;
} }
#print Dumper($params);
for my $attr ( 'project_id', 'studio_id', 'series_id', 'start' ) { for my $attr ( 'project_id', 'studio_id', 'series_id', 'start' ) {
unless ( defined $params->{$attr} ) { unless ( defined $params->{$attr} ) {
uac::print_error( $attr . ' not given!' ); uac::print_error( $attr . ' not given!' );
@@ -151,7 +151,6 @@ sub save_schedule {
$entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} ); $entry->{$attr} = $params->{$attr} if ( defined $params->{$attr} );
} }
#print STDERR Dumper($entry);
unless ( project::is_series_assigned( $config, $entry ) == 1 ) { unless ( project::is_series_assigned( $config, $entry ) == 1 ) {
uac::print_error('series is not assigned to project!'); uac::print_error('series is not assigned to project!');
return undef; return undef;
@@ -290,7 +289,6 @@ sub delete_series {
my $studio_id = $params->{studio_id}; my $studio_id = $params->{studio_id};
my $series_id = $entry->{series_id}; my $series_id = $entry->{series_id};
#print Dumper($entry);
$config->{access}->{write} = 1; $config->{access}->{write} = 1;
if ( $entry->{series_id} ne '' ) { if ( $entry->{series_id} ne '' ) {
my $result = series::delete( $config, $entry ); my $result = series::delete( $config, $entry );
@@ -342,8 +340,8 @@ sub save_series {
$entry->{project_id} = $params->{project_id}; $entry->{project_id} = $params->{project_id};
$entry->{studio_id} = $params->{studio_id}; $entry->{studio_id} = $params->{studio_id};
$entry->{series_id} = $params->{series_id} || ''; $entry->{series_id} = $params->{series_id} || '';
$entry->{live} = $params->{live} || 0; $entry->{live} = $params->{live} // 0;
$entry->{count_episodes} = $params->{count_episodes} || 0; $entry->{count_episodes} = $params->{count_episodes} // 0;
$entry->{predecessor_id} = $params->{predecessor_id} // 0; $entry->{predecessor_id} = $params->{predecessor_id} // 0;
#$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} ); #$entry->{html_content} = Encode::decode( 'utf-8', $entry->{content} );
@@ -399,7 +397,6 @@ sub save_series {
$config->{access}->{write} = 0; $config->{access}->{write} = 0;
#print STDERR Dumper($entry);
unless ( defined $series_id ) { unless ( defined $series_id ) {
uac::print_error('could not insert series'); uac::print_error('could not insert series');
return; return;
@@ -423,12 +420,13 @@ sub save_series {
uac::permissions_denied('update due to entry already exists'); uac::permissions_denied('update due to entry already exists');
return; return;
} }
if ( ( scalar(@$series_ids) == 1 ) && ( $series_ids->[0]->{series_id} ne $params->{series_id} ) ) { if ( ( scalar(@$series_ids) == 1 )
&& ( $series_ids->[0]->{series_id} ne $params->{series_id} ) )
{
uac::permissions_denied('update due to series id does not match to existing entry'); uac::permissions_denied('update due to series id does not match to existing entry');
return; return;
} }
#print STDERR Dumper($entry);
$config->{access}->{write} = 1; $config->{access}->{write} = 1;
my $result = series::update( $config, $entry ); my $result = series::update( $config, $entry );
@@ -499,7 +497,6 @@ sub save_scan {
assign_event_title => $params->{assign_event_title}, assign_event_title => $params->{assign_event_title},
}; };
#print STDERR '<br>'.Dumper($entry)."\n";
$config->{access}->{write} = 1; $config->{access}->{write} = 1;
series::update( $config, $entry ); series::update( $config, $entry );
$config->{access}->{write} = 0; $config->{access}->{write} = 0;
@@ -527,8 +524,6 @@ sub scan_events {
} }
); );
#print STDERR Dumper($series);
$params->{scan_results} = q{ $params->{scan_results} = q{
<table> <table>
<tr> <tr>
@@ -580,11 +575,8 @@ sub scan_events {
. $title . '</td>' . '<td>' . $title . '</td>' . '<td>'
. scalar(@$event_ids) . '</td>' . '</tr>' . "\n"; . scalar(@$event_ids) . '</td>' . '</tr>' . "\n";
#if($serie->{series_id}==66){ series::set_event_ids( $config, $params->{project_id}, $params->{studio_id}, $serie,
#print STDERR $serie->{series_name}.' - '.$serie->{title}.' '.Dumper($event_ids); $event_ids );
series::set_event_ids( $config, $params->{project_id}, $params->{studio_id}, $serie, $event_ids );
#}
} }
$params->{scan_results} .= "</table><hr>\n"; $params->{scan_results} .= "</table><hr>\n";
$config->{access}->{write} = 0; $config->{access}->{write} = 0;
@@ -614,8 +606,6 @@ sub assign_event {
} }
} }
#print STDERR "found all parameters:\n".Dumper($entry);
# check if event exists, # check if event exists,
# this has to use events::get, since it cannot check for series_id # this has to use events::get, since it cannot check for series_id
# TODO: check location of studio_id # TODO: check location of studio_id
@@ -640,7 +630,6 @@ sub assign_event {
my $events = events::get( $config, $request2 ); my $events = events::get( $config, $request2 );
#print STDERR "found events:".Dumper($events);
if ( scalar(@$events) != 1 ) { if ( scalar(@$events) != 1 ) {
uac::print_error("no event found for event_id=$entry->{event_id}, archive=all"); uac::print_error("no event found for event_id=$entry->{event_id}, archive=all");
return undef; return undef;
@@ -778,8 +767,6 @@ sub unassign_event {
return undef; return undef;
} }
#print Dumper($event);
#is series assigned to studio #is series assigned to studio
my $result = series_events::check_permission( my $result = series_events::check_permission(
$request, $request,
@@ -996,14 +983,14 @@ sub list_series {
$params->{newSeries} = $newSeries; $params->{newSeries} = $newSeries;
$params->{oldSeries} = $oldSeries; $params->{oldSeries} = $oldSeries;
$params->{image} = studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) $params->{image} =
studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } )
if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) ); if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) );
$params->{image} = project::getImageById( $config, { project_id => $project_id } ) $params->{image} = project::getImageById( $config, { project_id => $project_id } )
if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) ); if ( ( !defined $params->{image} ) || ( $params->{image} eq '' ) );
#print STDERR Dumper $params->{image}; $params->{loc} =
localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } );
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } );
template::process( $config, 'print', $params->{template}, $params ); template::process( $config, 'print', $params->{template}, $params );
} }
@@ -1062,12 +1049,15 @@ sub show_series {
my $series = series::get( $config, $series_conditions ); my $series = series::get( $config, $series_conditions );
if ( @$series > 1 ) { if ( @$series > 1 ) {
uac::print_error( "too much series found for studio '" . $studio_by_id->{$studio_id}->{name} . "'" ); uac::print_error(
"too much series found for studio '" . $studio_by_id->{$studio_id}->{name} . "'" );
return; return;
} }
if ( @$series == 0 ) { if ( @$series == 0 ) {
uac::print_error( "selected series not assigned to studio '" . $studio_by_id->{$studio_id}->{name} . "'" ); uac::print_error( "selected series not assigned to studio '"
. $studio_by_id->{$studio_id}->{name}
. "'" );
return; return;
} }
my $serie = $series->[0]; my $serie = $series->[0];
@@ -1078,9 +1068,11 @@ sub show_series {
#} #}
#get all users currently assigned to the user #get all users currently assigned to the user
my $user_studios = uac::get_studios_by_user( $config, { project_id => $project_id, user => $request->{user} } ); my $user_studios =
uac::get_studios_by_user( $config, { project_id => $project_id, user => $request->{user} } );
my $studio_users = uac::get_users_by_studio( $config, { project_id => $project_id, studio_id => $studio_id } ); my $studio_users =
uac::get_users_by_studio( $config, { project_id => $project_id, studio_id => $studio_id } );
for my $studio_user (@$studio_users) { for my $studio_user (@$studio_users) {
$studio_user->{user_id} = $studio_user->{id}; $studio_user->{user_id} = $studio_user->{id};
} }
@@ -1089,8 +1081,10 @@ sub show_series {
$studio_users = \@users; $studio_users = \@users;
#show events from last month until next 3 months #show events from last month until next 3 months
my $from = DateTime->now( time_zone => $config->{date}->{time_zone} )->subtract( months => 1 )->datetime(); my $from = DateTime->now( time_zone => $config->{date}->{time_zone} )->subtract( months => 1 )
my $till = DateTime->now( time_zone => $config->{date}->{time_zone} )->add( months => 3 )->datetime(); ->datetime();
my $till =
DateTime->now( time_zone => $config->{date}->{time_zone} )->add( months => 3 )->datetime();
#add name of current studio #add name of current studio
my $studio = $studio_by_id->{ $serie->{studio_id} }; my $studio = $studio_by_id->{ $serie->{studio_id} };
@@ -1099,13 +1093,12 @@ sub show_series {
my $location = $studio->{location}; my $location = $studio->{location};
# set default image from studio # set default image from studio
$serie->{image} = studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } ) $serie->{image} =
studios::getImageById( $config, { project_id => $project_id, studio_id => $studio_id } )
if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) ); if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) );
$serie->{image} = project::getImageById( $config, { project_id => $project_id } ) $serie->{image} = project::getImageById( $config, { project_id => $project_id } )
if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) ); if ( ( !defined $serie->{image} ) || ( $serie->{image} eq '' ) );
#print STDERR Dumper $serie->{image};
#add users #add users
$serie->{series_users} = series::get_users( $serie->{series_users} = series::get_users(
$config, $config,
@@ -1115,7 +1108,8 @@ sub show_series {
series_id => $serie->{series_id} series_id => $serie->{series_id}
} }
); );
uac::print_warn("There is no user assigned, yet. Please assign a user!") if scalar @{ $serie->{series_users} } == 0; uac::print_warn("There is no user assigned, yet. Please assign a user!")
if scalar @{ $serie->{series_users} } == 0;
#add events #add events
$serie->{events} = series::get_events( $serie->{events} = series::get_events(
@@ -1225,8 +1219,8 @@ sub show_series {
$params->{$key} = $serie->{$key}; $params->{$key} = $serie->{$key};
} }
#print STDERR '<pre>'.Dumper($params).'</pre>'; $params->{loc} =
$params->{loc} = localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } ); localization::get( $config, { user => $params->{presets}->{user}, file => 'all,series' } );
template::process( $config, 'print', $params->{template}, $params ); template::process( $config, 'print', $params->{template}, $params );
} }
@@ -1263,21 +1257,27 @@ sub set_rebuilt_episodes{
my $project_id = $params->{project_id}; my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id}; my $studio_id = $params->{studio_id};
my $series_id = $params->{series_id}; my $series_id = $params->{series_id};
my $events = series::get_rebuilt_episodes( $config, { my $events = series::get_rebuilt_episodes(
$config,
{
project_id => $project_id, project_id => $project_id,
studio_id => $studio_id, studio_id => $studio_id,
series_id => $series_id series_id => $series_id
}); }
);
my $updates = 0; my $updates = 0;
for my $event (@$events) { for my $event (@$events) {
next if $event->{project_id} ne $project_id; next if $event->{project_id} ne $project_id;
next if $event->{studio_id} ne $studio_id; next if $event->{studio_id} ne $studio_id;
next if $event->{old_episode} eq $event->{episode}; next if $event->{old_episode} eq $event->{episode};
series_events::set_episode( $config, { series_events::set_episode(
$config,
{
id => $event->{id}, id => $event->{id},
episode => $event->{episode} episode => $event->{episode}
}); }
);
$updates++; $updates++;
} }
print "$updates changes done.\n"; print "$updates changes done.\n";
@@ -1316,11 +1316,14 @@ sub rebuild_episodes{
my $project_id = $params->{project_id}; my $project_id = $params->{project_id};
my $studio_id = $params->{studio_id}; my $studio_id = $params->{studio_id};
my $series_id = $params->{series_id}; my $series_id = $params->{series_id};
my $events = series::get_rebuilt_episodes( $config, { my $events = series::get_rebuilt_episodes(
$config,
{
project_id => $project_id, project_id => $project_id,
studio_id => $studio_id, studio_id => $studio_id,
series_id => $series_id series_id => $series_id
}); }
);
my $events_by_id = {}; my $events_by_id = {};
for my $event (@$events) { for my $event (@$events) {
@@ -1367,10 +1370,12 @@ sub rebuild_episodes{
} }
print "$errors errors, $changes changes\n"; print "$errors errors, $changes changes\n";
if ( ( $changes > 0 ) and ( $errors == 0 ) ) { if ( ( $changes > 0 ) and ( $errors == 0 ) ) {
my $url = "series.cgi?action=set_rebuilt_episodes&project_id=$project_id&studio_id=$studio_id&series_id=$series_id"; my $url =
"series.cgi?action=set_rebuilt_episodes&project_id=$project_id&studio_id=$studio_id&series_id=$series_id";
print qq{<a class="button" href="$url"><button>apply changes</button></a>}; print qq{<a class="button" href="$url"><button>apply changes</button></a>};
} }
my @cols=qw(id start series_name title episode old_episode recurrence recurrence_start project_name studio_name); my @cols =
qw(id start series_name title episode old_episode recurrence recurrence_start project_name studio_name);
print "<table>\n"; print "<table>\n";
print "<tr>" . join( "", map { "<th>" . ( $_ // '-' ) . "</th>" } @cols ) . "</tr>\n"; print "<tr>" . join( "", map { "<th>" . ( $_ // '-' ) . "</th>" } @cols ) . "</tr>\n";
@@ -1396,23 +1401,33 @@ sub check_params {
} }
$checked->{debug} = $debug; $checked->{debug} = $debug;
#actions and roles #actions
$checked->{action} = ''; $checked->{action} = '';
if ( defined $params->{action} ) { if ( defined $params->{action} ) {
$checked->{action} = $params->{action} if $params->{action} =~ $checked->{action} = $params->{action} if List::Util::any { $_ eq $params->{action} } qw{
/^(add_user|remove_user|create|delete|save|details|show|save_schedule|delete_schedule|save_scan|scan_events|assign_event|unassign_event|reassign_event|rebuild_episodes|set_rebuilt_episodes)$/ add_user remove_user
; create delete save details show
save_schedule delete_schedule
save_scan scan_events
assign_event unassign_event reassign_event
rebuild_episodes set_rebuilt_episodes
};
} }
#numeric values #numeric values
$checked->{exclude} = 0; $checked->{exclude} = 0;
$checked->{action} = $params->{action}; $checked->{action} = $params->{action};
for my $param ( for my $param (
'id', 'project_id', 'studio_id', 'default_studio_id', 'id', 'project_id',
'user_id', 'new_series_id', 'series_id', 'schedule_id', 'studio_id', 'default_studio_id',
'exclude', 'show_hint_to_add_schedule', 'event_id', 'weekday', 'user_id', 'new_series_id',
'week_of_month', 'month', 'nextDay', 'predecessor_id' 'series_id', 'schedule_id',
){ 'exclude', 'show_hint_to_add_schedule',
'event_id', 'weekday',
'week_of_month', 'month',
'nextDay', 'predecessor_id'
)
{
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /^\d+$/ ) ) {
$checked->{$param} = $params->{$param}; $checked->{$param} = $params->{$param};
} }
@@ -1435,8 +1450,10 @@ sub check_params {
$checked->{create_events} = 0; $checked->{create_events} = 0;
$checked->{publish_events} = 0; $checked->{publish_events} = 0;
} }
for my $param ( 'frequency', 'duration', 'default_duration', 'create_events', 'publish_events', 'live', for my $param (
'count_episodes' ) 'frequency', 'duration', 'default_duration', 'create_events',
'publish_events', 'live', 'count_episodes'
)
{ {
if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) { if ( ( defined $params->{$param} ) && ( $params->{$param} =~ /(\d+)/ ) ) {
$checked->{$param} = $1; $checked->{$param} = $1;
@@ -1452,8 +1469,15 @@ sub check_params {
} }
} }
for my $param ( 'series_name', 'title', 'excerpt', 'content', 'topic', 'image', 'image_label', for my $param (
'assign_event_series_name', 'assign_event_title', 'comment', 'podcast_url', 'archive_url', 'setImage' ) 'series_name', 'title',
'excerpt', 'content',
'topic', 'image',
'image_label', 'assign_event_series_name',
'assign_event_title', 'comment',
'podcast_url', 'archive_url',
'setImage'
)
{ {
if ( defined $params->{$param} ) { if ( defined $params->{$param} ) {
@@ -1465,7 +1489,9 @@ sub check_params {
} }
for my $attr ('start') { for my $attr ('start') {
if ( ( defined $params->{$attr} ) && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) ) { if ( ( defined $params->{$attr} )
&& ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) )
{
$checked->{$attr} = $1 . ':00'; $checked->{$attr} = $1 . ':00';
} }
} }