studio-timeslot: add week in month

This commit is contained in:
Milan
2024-04-18 20:44:37 +02:00
parent f56ee0d53e
commit ea952a8021
9 changed files with 681 additions and 239 deletions

View File

@@ -4,9 +4,6 @@ use strict;
use warnings;
no warnings 'redefine';
use Data::Dumper;
use URI::Escape();
use params();
use config();
use entry();
@@ -24,11 +21,11 @@ use localization();
binmode STDOUT, ":utf8";
my $r = shift;
( my $cgi, my $params, my $error ) = params::get($r);
(my $cgi, my $params, my $error) = params::get($r);
my $config = config::get('../config/config.cgi');
my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
return if ( ( !defined $user ) || ( $user eq '' ) );
my ($user, $expires) = auth::get_user($config, $params, $cgi);
return if ((!defined $user) || ($user eq ''));
my $user_presets = uac::get_user_presets(
$config,
@@ -39,48 +36,45 @@ my $user_presets = uac::get_user_presets(
}
);
$params->{default_studio_id} = $user_presets->{studio_id};
$params = uac::setDefaultStudio( $params, $user_presets );
$params = uac::setDefaultProject( $params, $user_presets );
$params = uac::setDefaultStudio($params, $user_presets);
$params = uac::setDefaultProject($params, $user_presets);
my $request = {
url => $ENV{QUERY_STRING} || '',
params => {
original => $params,
checked => check_params( $config, $params ),
checked => check_params($config, $params),
},
};
$request = uac::prepare_request( $request, $user_presets );
$request = uac::prepare_request($request, $user_presets);
$params = $request->{params}->{checked};
#process header
my $headerParams = uac::set_template_permissions( $request->{permissions}, $params );
$headerParams->{loc} = localization::get( $config, { user => $user, file => 'all,menu' } );
my $headerParams = uac::set_template_permissions($request->{permissions}, $params);
$headerParams->{loc} = localization::get($config, {user => $user, file => 'all,menu'});
my $action = $params->{action} || '';
if ( $action eq 'show_dates' ) {
if ($action eq 'show_dates') {
#print "Content-type:text/html\n\n";
} else {
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;
if ( $action eq 'show_dates' ) {
if ($action eq 'show_dates') {
print "Content-Type:text/html\n\n";
} else {
template::process( $config, 'print', template::check( $config, 'studio-timeslots-header.html' ), $headerParams );
template::process($config, 'print', template::check($config, 'studio-timeslots-header.html'), $headerParams);
}
if ( defined $params->{action} ) {
save_schedule( $config, $request ) if ( $params->{action} eq 'save_schedule' );
delete_schedule( $config, $request ) if ( $params->{action} eq 'delete_schedule' );
if ( $params->{action} eq 'show_dates' ) {
showDates( $config, $request );
return;
}
if (defined $params->{action}) {
save_schedule($config, $request) if $params->{action} eq 'save_schedule';
delete_schedule($config, $request) if $params->{action} eq 'delete_schedule';
return showDates($config, $request) if $params->{action} eq 'show_dates';
}
$config->{access}->{write} = 0;
showTimeslotSchedule( $config, $request );
showTimeslotSchedule($config, $request);
return;
#insert or update a schedule and update all schedule dates
@@ -88,44 +82,40 @@ sub save_schedule {
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_studio_timeslot_schedule} == 1 ) {
uac::permissions_denied('update_studio_timeslot_schedule');
return;
}
return uac::permissions_denied('update_studio_timeslot_schedule')
unless $permissions->{update_studio_timeslot_schedule} == 1;
my $params = $request->{params}->{checked};
for my $attr ( 'project_id', 'studio_id', 'start', 'end', 'end_date', 'schedule_studio_id' ) {
unless ( defined $params->{$attr} ) {
uac::print_error( $attr . ' not given!' );
return;
}
}
for my $attr ('project_id', 'studio_id', 'start', 'end', 'end_date', 'schedule_studio_id') {
return uac::print_error($attr . ' not given!') unless defined $params->{$attr};
}
my $entry = {};
for my $attr ( 'project_id', 'start', 'end', 'end_date', 'frequency' ) {
$entry->{$attr} = $params->{$attr} if defined $params->{$attr};
}
if ($params->{period_type} eq 'days') {
entry::set_numbers($entry, $params, ['frequency']);
$entry->{period_type} = $params->{period_type};
}elsif($params->{period_type} eq 'week_of_month') {
entry::set_numbers($entry, $params, ['weekday', 'week_of_month', 'month']);
$entry->{period_type} = $params->{period_type};
}
my $entry = {map {$_ => $params->{$_}} ('project_id', 'start', 'end', 'end_date')};
#set schedule's studio to value from schedule_studio_id
$entry->{studio_id} = $params->{schedule_studio_id} if defined $params->{schedule_studio_id};
if ( ( $entry->{end} ne '' ) && ( $entry->{end} le $entry->{start} ) ) {
uac::print_error('start date should be before end date!');
return;
}
return uac::print_error('start date should be before end date!')
if $entry->{end} ne '' && $entry->{end} le $entry->{start};
$config->{access}->{write} = 1;
if ( defined $params->{schedule_id} ) {
if (defined $params->{schedule_id}) {
$entry->{schedule_id} = $params->{schedule_id};
studio_timeslot_schedule::update( $config, $entry );
my $updates = studio_timeslot_dates::update( $config, $entry );
studio_timeslot_schedule::update($config, $entry);
my $updates = studio_timeslot_dates::update($config, $entry);
uac::print_info("timeslot schedule saved. $updates dates scheduled");
} else {
$entry->{schedule_id} = studio_timeslot_schedule::insert( $config, $entry );
my $updates = studio_timeslot_dates::update( $config, $entry );
$entry->{schedule_id} = studio_timeslot_schedule::insert($config, $entry);
my $updates = studio_timeslot_dates::update($config, $entry);
uac::print_info("timeslot schedule added. $updates dates added");
}
@@ -135,27 +125,20 @@ sub delete_schedule {
my ($config, $request) = @_;
my $permissions = $request->{permissions};
unless ( $permissions->{update_studio_timeslot_schedule} == 1 ) {
uac::permissions_denied('update_studio_timeslot_schedule');
return;
}
return uac::permissions_denied('update_studio_timeslot_schedule')
unless $permissions->{update_studio_timeslot_schedule} == 1;
my $params = $request->{params}->{checked};
my $entry = {};
for my $attr ( 'project_id', 'studio_id', 'schedule_id' ) {
if ( defined $params->{$attr} ) {
$entry->{$attr} = $params->{$attr};
} else {
uac::print_error( $attr . ' not given!' );
return;
}
for my $attr ('project_id', 'studio_id', 'schedule_id') {
return uac::print_error($attr . ' not given!') unless defined $params->{$attr};
$entry->{$attr} = $params->{$attr};
}
$config->{access}->{write} = 1;
$entry->{schedule_id} = $params->{schedule_id};
studio_timeslot_schedule::delete( $config, $entry );
studio_timeslot_dates::update( $config, $entry );
studio_timeslot_schedule::delete($config, $entry);
studio_timeslot_dates::update($config, $entry);
uac::print_info("timeslot schedule deleted");
}
@@ -163,49 +146,38 @@ sub showTimeslotSchedule {
my ($config, $request) = @_;
$config->{access}->{write} = 0;
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{read_studio_timeslot_schedule} == 1 ) {
uac::permissions_denied('read_studio_timeslot_schedule');
return;
}
return uac::permissions_denied('read_studio_timeslot_schedule')
unless $permissions->{read_studio_timeslot_schedule} == 1;
for my $param ( 'project_id', 'studio_id' ) {
unless ( defined $params->{$param} ) {
uac::print_error("missing $param");
return;
}
for my $param ('project_id', 'studio_id') {
return uac::print_error("missing $param") unless defined $params->{$param};
}
#this will be updated later (especially allow_update_events)
for my $permission ( keys %{ $request->{permissions} } ) {
$params->{'allow'}->{$permission} = $request->{permissions}->{$permission};
}
$params->{'allow'}->{$_} = $request->{permissions}->{$_} for (keys %{$request->{permissions}});
$params->{loc} =
localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio-timeslots' } );
localization::get($config, {user => $params->{presets}->{user}, file => 'all,studio-timeslots'});
my $studio_id = $params->{studio_id};
my $project_id = $params->{project_id};
#get project schedule
my $schedules = studio_timeslot_schedule::get(
$config,
{
project_id => $project_id
# studio_id=>$studio_id
}
);
$config, {project_id => $project_id}
);
#list of all studios by id
my $studios = studios::get( $config, { project_id => $project_id } );
my $studios = studios::get($config, {project_id => $project_id});
#remove seconds from dates
for my $schedule (@$schedules) {
$schedule->{start} =~ s/(\d\d\:\d\d)\:\d\d/$1/;
$schedule->{end} =~ s/(\d\d\:\d\d)\:\d\d/$1/;
$schedule->{period_type_days} = 1 if $schedule->{period_type} eq 'days';
$schedule->{period_type_week_of_month} = 1 if $schedule->{period_type} eq 'week_of_month';
#insert assigned studio
for my $studio (@$studios) {
@@ -213,8 +185,8 @@ sub showTimeslotSchedule {
id => $studio->{id},
name => $studio->{name},
};
$entry->{selected} = 1 if ( $studio->{id} eq $schedule->{studio_id} );
push @{ $schedule->{studios} }, $entry;
$entry->{selected} = 1 if $studio->{id} eq $schedule->{studio_id};
push @{$schedule->{studios}}, $entry;
}
}
@@ -224,22 +196,17 @@ sub showTimeslotSchedule {
};
$result->{schedule} = $schedules;
$result->{studios} = $studios;
$result->{start} = $params->{start};
$result->{end} = $params->{end};
$result->{end_date} = $params->{end_date};
$result->{frequency} = $params->{frequency};
for my $attr ('start', 'end', 'end_date', 'frequency', 'period_type', 'weekday', 'week_of_month', 'month') {
$result->{$attr} = $params->{$attr};
}
#remove seconds from datetimes
$result->{start} =~ s/(\d\d\:\d\d)\:\d\d/$1/ if defined $result->{start};
$result->{end} =~ s/(\d\d\:\d\d)\:\d\d/$1/ if defined $result->{end};
#copy entry values to params
for my $key ( keys %$result ) {
$params->{$key} = $result->{$key};
}
$params->{$_} = $result->{$_} for keys %$result;
#print '<pre>'.Dumper($params).'</pre>';
template::process( $config, 'print', $params->{template}, $params );
template::process($config, 'print', $params->{template}, $params);
}
sub showDates {
@@ -249,22 +216,16 @@ sub showDates {
my $params = $request->{params}->{checked};
my $permissions = $request->{permissions};
unless ( $permissions->{read_studio_timeslot_schedule} == 1 ) {
uac::permissions_denied('read_studio_timeslot_schedule');
return;
}
return uac::permissions_denied('read_studio_timeslot_schedule')
unless $permissions->{read_studio_timeslot_schedule} == 1;
for my $param ( 'project_id', 'studio_id' ) {
unless ( defined $params->{$param} ) {
uac::print_error("missing $param");
return;
}
for my $param ('project_id', 'studio_id') {
return uac::print_error("missing $param") unless defined $params->{$param};
}
#this will be updated later (especially allow_update_events)
for my $permission ( keys %{ $request->{permissions} } ) {
$params->{'allow'}->{$permission} = $request->{permissions}->{$permission};
}
$params->{'allow'}->{$_} = $request->{permissions}->{$_}
for (keys %{$request->{permissions}});
my $studio_id = $params->{studio_id};
my $project_id = $params->{project_id};
@@ -277,15 +238,13 @@ sub showDates {
$config,
{
project_id => $project_id,
# studio_id=>$studio_id,
from => $fromDate,
till => $tillDate
}
);
$params->{loc} =
localization::get( $config, { user => $params->{presets}->{user}, file => 'all,studio-timeslots' } );
localization::get($config, {user => $params->{presets}->{user}, file => 'all,studio-timeslots'});
my $language = $params->{loc}->{region};
# translate weekday names to selected language
@@ -299,11 +258,8 @@ sub showDates {
'Su' => $params->{loc}->{weekday_Su},
};
my $studios = studios::get( $config, { project_id => $project_id } );
my $studio_by_id = {};
for my $studio (@$studios) {
$studio_by_id->{ $studio->{id} } = $studio;
}
my $studios = studios::get($config, {project_id => $project_id});
my $studio_by_id = {map {$_->{id} => $_} @$studios};
#remove seconds from dates
for my $date (@$timeslot_dates) {
@@ -313,11 +269,11 @@ sub showDates {
$date->{end} =~ s/(\d\d\:\d\d)\:\d\d/$1/;
# translate weekday
if ( $language ne 'en' ) {
$date->{start_weekday} = $weekday->{ $date->{start_weekday} };
$date->{end_weekday} = $weekday->{ $date->{end_weekday} };
}
$date->{studio_name} = $studio_by_id->{ $date->{studio_id} }->{name};
if ($language ne 'en') {
$date->{start_weekday} = $weekday->{$date->{start_weekday}};
$date->{end_weekday} = $weekday->{$date->{end_weekday}};
}
$date->{studio_name} = $studio_by_id->{$date->{studio_id}}->{name};
}
my $result = {
project_id => $project_id,
@@ -326,60 +282,53 @@ sub showDates {
};
#copy entry values to params
for my $key ( keys %$result ) {
$params->{$key} = $result->{$key};
}
$params->{$_} = $result->{$_} for keys %$result;
my $template = template::check( $config, 'studio-timeslot-dates' );
template::process( $config, 'print', $template, $params );
my $template = template::check($config, 'studio-timeslot-dates');
template::process($config, 'print', $template, $params);
}
sub check_params {
my $config = shift;
my $params = shift;
($config, $params) = @_;
my $checked = {};
$checked->{template} = template::check($config, $params->{template}, 'studio-timeslots');
#actions and roles
if ( defined $params->{action} ) {
if ( $params->{action} =~ /^(show|save_schedule|delete_schedule|show_dates)$/ ) {
$checked->{action} = $params->{action};
}
}
$checked->{action} = $params->{action}
if ($params->{action}//'') =~ /^(show|save_schedule|delete_schedule|show_dates)$/;
$checked->{exclude} = 0;
entry::set_numbers( $checked, $params, [
entry::set_numbers($checked, $params, [
'id', 'project_id', 'studio_id', 'default_studio_id', 'schedule_id', 'schedule_studio_id'
]);
$checked->{default_studio_id} = $checked->{studio_id} // -1;
if ( ( defined $params->{show_date} ) && ( $params->{show_date} =~ /^(\d\d\d\d)/ ) ) {
if (($params->{show_date}//'') =~ /^(\d\d\d\d)/) {
$checked->{show_date} = $1;
} else {
my $date = time::date_to_array( time::time_to_date() );
my $date = time::date_to_array(time::time_to_date());
$checked->{show_date} = $date->[0];
}
if ( defined $checked->{studio_id} ) {
$checked->{default_studio_id} = $checked->{studio_id};
} else {
$checked->{studio_id} = -1;
entry::set_numbers($checked, $params, ['frequency']);
if ($params->{period_type}eq 'days') {
$checked->{period_type} = $params->{period_type};
}elsif($params->{period_type}eq 'week_of_month') {
entry::set_numbers($checked, $params, ['weekday', 'week_of_month', 'month']);
$checked->{period_type} = $params->{period_type};
}
$checked->{template} = template::check( $config, $params->{template}, 'studio-timeslots' );
entry::set_numbers( $checked, $params, ['frequency'] );
for my $attr ( 'start', 'end' ) {
if ( ( defined $params->{$attr} ) && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/ ) ) {
$checked->{$attr} = $1 . ':00';
for my $attr ('start', 'end') {
if (($params->{$attr}//'') =~ /(\d\d\d\d\-\d\d\-\d\d[ T]\d\d\:\d\d)/) {
$checked->{$attr} = "$1:00";
}
}
for my $attr ('end_date') {
if ( ( defined $params->{$attr} ) && ( $params->{$attr} =~ /(\d\d\d\d\-\d\d\-\d\d)/ ) ) {
if (($params->{$attr}//'') =~ /(\d\d\d\d\-\d\d\-\d\d)/) {
$checked->{$attr} = $1;
}
}
return $checked;
}