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

use central methods for setting default project and studio

Browse Source
This commit is contained in:
Milan
2018-10-14 00:01:19 +02:00
parent ac4d2676a3
commit a949cea7bd
27 changed files with 113 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/calcms/uac.pm
View File

@@ -777,6 +777,24 @@ sub get_user_presets {
return $result; return $result;
} }
sub setDefaultProject {
my $params = shift;
my $user_presets = shift;
$params->{project_id} = $user_presets->{project_id}
if ( !defined $params->{authAction} ) || ( $params->{authAction} eq '' ) || ( $params->{authAction} eq 'login' );
return $params;
}
sub setDefaultStudio {
my $params = shift;
my $user_presets = shift;
$params->{studio_id} = $user_presets->{studio_id}
if ( !defined $params->{authAction} ) || ( $params->{authAction} eq '' ) || ( $params->{authAction} eq 'login' );
return $params;
}
#set user preset properties to request #set user preset properties to request
sub prepare_request { sub prepare_request {
my $request = shift; my $request = shift;

6
website/agenda/planung/assign_series.cgi
View File

@@ -43,10 +43,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";
my $request = { my $request = {

6
website/agenda/planung/assignments.cgi
View File

@@ -44,10 +44,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";
my $request = { my $request = {

6
website/agenda/planung/audio_recordings.cgi
View File

@@ -68,10 +68,8 @@ my $user_presets = uac::get_user_presets(
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

38
website/agenda/planung/calendar.cgi
View File

@@ -2,9 +2,11 @@
use warnings "all"; use warnings "all";
use strict; use strict;
use Data::Dumper; use Data::Dumper;
use URI::Escape(); use URI::Escape();
#use Encode(); use DateTime();
use utf8(); use utf8();
use params(); use params();
use config(); use config();
@@ -18,15 +20,13 @@ use project();
use studios(); use studios();
use events(); use events();
use series(); use series();
use markup();
use series_dates(); use series_dates();
use markup();
use localization();
use studio_timeslot_dates(); use studio_timeslot_dates();
use work_dates(); use work_dates();
use playout(); use playout();
use markup();
use user_settings(); use user_settings();
use localization();
use DateTime();
use audio_recordings(); use audio_recordings();
binmode STDOUT, ":utf8"; binmode STDOUT, ":utf8";
@@ -48,8 +48,7 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{project_id} = $user_presets->{project_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
$params->{expires} = $expires; $params->{expires} = $expires;
my $scriptName = 'calendar.cgi'; my $scriptName = 'calendar.cgi';
@@ -76,9 +75,7 @@ my $request = {
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}; $params = $request->{params}->{checked};
if ( if (
@@ -387,9 +384,9 @@ sub showCalendar {
$date->{event_id} = $id; $date->{event_id} = $id;
$date->{title} = ''; $date->{title} = '';
$date->{title} .= '<b>errors</b>: ' . $date->{errors} . '<br>' if defined $date->{errors}; $date->{title} .= '<b>errors</b>: ' . $date->{errors} . '<br>' if defined $date->{errors};
$date->{title} .= formatDuration( $date->{duration} ) . "s<br>" if defined $date->{duration}; $date->{title} .= formatDuration( $date->{duration} ) . "<br>" if defined $date->{duration};
$date->{title} .= formatLoudness( "L:", $date->{rms_left} ) . ' dB, ' if defined $date->{rms_left}; $date->{title} .= formatLoudness( "L:", $date->{rms_left} ) . ', ' if defined $date->{rms_left};
$date->{title} .= formatLoudness( "R:", $date->{rms_right} ) . ' dB<br>' if defined $date->{rms_right}; $date->{title} .= formatLoudness( "R:", $date->{rms_right} ) . '<br>' if defined $date->{rms_right};
$date->{title} .= formatBitrate( $date->{bitrate} ) . ' ' . $date->{bitrate_mode} . '<br>' if defined $date->{bitrate}; $date->{title} .= formatBitrate( $date->{bitrate} ) . ' ' . $date->{bitrate_mode} . '<br>' if defined $date->{bitrate};
$date->{title} .= '<b>replay gain</b> ' . sprintf( "%.1f", $date->{replay_gain} ) . '<br>' if defined $date->{replay_gain}; $date->{title} .= '<b>replay gain</b> ' . sprintf( "%.1f", $date->{replay_gain} ) . '<br>' if defined $date->{replay_gain};
$date->{title} .= ( ( $date->{sampling_rate} || '0' ) / 1000 ) . ' kHz<br>' if defined $date->{sampling_rate}; $date->{title} .= ( ( $date->{sampling_rate} || '0' ) / 1000 ) . ' kHz<br>' if defined $date->{sampling_rate};
@@ -543,24 +540,24 @@ sub formatLoudness {
return '' if $value eq ''; return '' if $value eq '';
#print STDERR "'$value'\n"; #print STDERR "'$value'\n";
$value = sprintf( "%.1f", $value ); $value = sprintf( "%d", $value+0.5 );
my $class = 'ok'; my $class = 'ok';
$class = 'warn' if $value > -18.5; $class = 'warn' if $value > -18.5;
$class = 'error' if $value > -16.0; $class = 'error' if $value > -16.0;
$class = 'warn' if $value < -24.0; $class = 'warn' if $value < -24.0;
$class = 'error' if $value < -27.0; $class = 'error' if $value < -27.0;
return qq{$label<span class="$class">} . $value . qq{</span>}; return qq{<span class="$class">$label} . $value . qq{dB</span>};
} }
sub formatDuration { sub formatDuration {
my $duration = shift; my $duration = shift;
return '' unless defined $duration; return '' unless defined $duration;
return '' if $duration eq ''; return '' if $duration eq '';
my $result = int( ( $duration + 3600 ) * 10 + 0.5 ) % 600; my $result = int( ( $duration +30.5 ) % 60)-30;
my $class = "ok"; my $class = "ok";
$class = "warn" if $result > 1; $class = "warn" if abs($result) > 1;
$class = "error" if $result > 10; $class = "error" if abs($result) > 2;
return sprintf( qq{<span class="%s">%.01f</span>}, $class, $duration ); return sprintf( qq{<span class="%s">%ds</span>}, $class, $duration );
} }
sub formatBitrate { sub formatBitrate {
@@ -1133,9 +1130,10 @@ sub printTableBody {
if ( $event->{class} eq 'event' ) { if ( $event->{class} eq 'event' ) {
$event->{content} .= '<br><span class="weak">'; $event->{content} .= '<br><span class="weak">';
$event->{content} .= formatDuration( $event->{duration} ) . 's ' if defined $event->{duration}; $event->{content} .= formatDuration( $event->{duration} ) . ' ' if defined $event->{duration};
$event->{content} .= formatLoudness( 'L', $event->{rms_left} ) . ' ' if defined $event->{rms_left}; $event->{content} .= formatLoudness( 'L', $event->{rms_left} ) . ' ' if defined $event->{rms_left};
$event->{content} .= formatLoudness( 'R', $event->{rms_right} ) if defined $event->{rms_right}; $event->{content} .= formatLoudness( 'R', $event->{rms_right} ) if defined $event->{rms_right};
#$event->{content} .= formatBitrate( $event->{bitrate} ) if defined $event->{bitrate};
$event->{content} .= '</span>'; $event->{content} .= '</span>';
} }
@@ -1402,7 +1400,7 @@ sub print_event {
$ystart = int( $ystart * $yzoom ); $ystart = int( $ystart * $yzoom );
$yend = int( $yend * $yzoom ); $yend = int( $yend * $yzoom );
my $height = $yend - $ystart + 2; my $height = $yend - $ystart +1;
if ( $ypos > 0 ) { if ( $ypos > 0 ) {
$height = q{height:} . ($height) . 'px;'; $height = q{height:} . ($height) . 'px;';

6
website/agenda/planung/comment.cgi
View File

@@ -43,10 +43,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/create_events.cgi
View File

@@ -38,10 +38,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( !defined $params->{action} ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( !defined $params->{action} ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";
my $request = { my $request = {

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

@@ -51,10 +51,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

3
website/agenda/planung/event_history.cgi
View File

@@ -35,8 +35,7 @@ return if ( ( !defined $user ) || ( $user eq '' ) );
my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } ); my $user_presets = uac::get_user_presets( $config, { user => $user, studio_id => $params->{studio_id} } );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/help.cgi
View File

@@ -36,10 +36,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/image.cgi
View File

@@ -45,10 +45,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/imageUpload.cgi
View File

@@ -84,10 +84,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/notify_events.cgi
View File

@@ -40,10 +40,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

8
website/agenda/planung/playout.cgi
View File

@@ -49,12 +49,8 @@ my $user_presets = uac::get_user_presets(
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
#print STDERR $params->{project_id}."\n";
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/projects.cgi
View File

@@ -34,10 +34,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

3
website/agenda/planung/roles.cgi
View File

@@ -45,8 +45,7 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
$params->{project_id} = $user_presets->{project_id}; $params->{project_id} = $user_presets->{project_id};
my $request = { my $request = {

6
website/agenda/planung/selectEvent.cgi
View File

@@ -33,10 +33,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/selectSeries.cgi
View File

@@ -32,10 +32,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

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

@@ -1,13 +1,15 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
use warnings "all";
use strict; use strict;
use warnings;
no warnings 'redefine'; #no warnings 'redefine';
use Data::Dumper; use Data::Dumper;
use URI::Escape; use URI::Escape();
use Encode(); use Encode();
use utf8();
use params(); use params();
use config(); use config();
use log(); use log();
@@ -19,12 +21,12 @@ use project();
use studios(); use studios();
use events(); use events();
use series(); use series();
use series_schedule();
use series_events();
use series_dates(); use series_dates();
use user_stats();
use markup(); use markup();
use localization(); use localization();
use series_schedule();
use series_events();
use user_stats();
binmode STDOUT, ":utf8"; binmode STDOUT, ":utf8";
@@ -34,22 +36,20 @@ 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 );
return if ( ( !defined $user ) || ( $user eq '' ) ); print STDERR Dumper($user);
return if ( !defined $user ) || ( $user eq '' );
#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(
$config, $config,
{ {
user => $user,
project_id => $params->{project_id}, project_id => $params->{project_id},
studio_id => $params->{studio_id}, studio_id => $params->{studio_id}
user => $user
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
#print STDERR $params->{project_id}."\n"; #print STDERR $params->{project_id}."\n";
my $request = { my $request = {

35
website/agenda/planung/show-playout.cgi
View File

@@ -25,9 +25,8 @@ 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 );
return if ( ( !defined $user ) || ( $user eq '' ) ); return if ( !defined $user ) || ( $user eq '' );
#print STDERR $params->{project_id}."\n";
my $user_presets = uac::get_user_presets( my $user_presets = uac::get_user_presets(
$config, $config,
{ {
@@ -37,12 +36,9 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
#print STDERR $params->{project_id}."\n";
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',
params => { params => {
@@ -92,36 +88,39 @@ sub showPlayout {
} }
} }
my $today=time::time_to_date(time());
my $startDate=time::add_days_to_date( $today, -14 );
my $events = playout::get( my $events = playout::get(
$config, $config,
{ {
project_id => $params->{project_id}, project_id => $params->{project_id},
studio_id => $params->{studio_id}, studio_id => $params->{studio_id},
order => 'modified_at desc, start desc', order => 'modified_at asc, start asc',
limit => 500 from => $startDate
} }
); );
# print '<pre>'.Dumper($events).'</pre>';
unless ( defined $events ) { unless ( defined $events ) {
uac::print_error("not found"); uac::print_error("not found");
return; return;
} }
for my $event (@$events) { for my $event (@$events) {
$event->{stream_size} =~ s/(\d)(\d\d\d)$/$1\.$2/g; $event->{stream_size} =~ s/(\d)(\d\d\d)$/$1\.$2/g;
$event->{stream_size} =~ s/(\d)(\d\d\d\.\d\d\d)$/$1\.$2/g; $event->{stream_size} =~ s/(\d)(\d\d\d\.\d\d\d)$/$1\.$2/g;
$event->{duration} =~ s/(\d\.\d)(\d+)$/$1/g; $event->{duration} =~ s/(\d\.\d)(\d+)$/$1/g;
$event->{duration} =~ s/(\d)\.0/$1/g; $event->{duration} =~ s/(\d)\.0/$1/g;
$event->{rms_left} = formatLoudness( $event->{rms_left} ); $event->{rms_left} = formatLoudness( $event->{rms_left} );
$event->{rms_right} = formatLoudness( $event->{rms_right} ); $event->{rms_right} = formatLoudness( $event->{rms_right} );
$event->{bitrate} = formatBitrate($event); $event->{bitrate} = formatBitrate($event);
$event->{duration} = formatDuration($event); $event->{duration} = formatDuration($event);
if ($event->{start} lt $today){
$event->{class} = "past";
}
} }
$params->{events} = $events; $params->{events} = $events;
#print Dumper($events);
} }
sub formatDuration { sub formatDuration {
@@ -129,10 +128,10 @@ sub formatDuration {
my $duration = $event->{duration}; my $duration = $event->{duration};
return '' unless defined $duration; return '' unless defined $duration;
return '' if $duration eq ''; return '' if $duration eq '';
my $result = int( ( $duration + 3600 ) * 10 ) % 600; my $result = ( ( $duration +30 ) % 60)-30;
my $class = "ok"; my $class = "ok";
$class = "warn" if $result > 1; $class = "warn" if abs($result) > 1;
$class = "error" if $result > 10; $class = "error" if abs($result) > 2;
return sprintf( qq{<div class="%s">%.01f</div>}, $class, $duration ); return sprintf( qq{<div class="%s">%.01f</div>}, $class, $duration );
} }

7
website/agenda/planung/showImage.cgi
View File

@@ -34,10 +34,9 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/studio_timeslots.cgi
View File

@@ -41,10 +41,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/studios.cgi
View File

@@ -34,10 +34,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/user_settings.cgi
View File

@@ -32,10 +32,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

7
website/agenda/planung/user_stats.cgi
View File

@@ -34,10 +34,9 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

6
website/agenda/planung/users.cgi
View File

@@ -30,10 +30,8 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',

7
website/agenda/planung/work_time.cgi
View File

@@ -41,12 +41,9 @@ my $user_presets = uac::get_user_presets(
} }
); );
$params->{default_studio_id} = $user_presets->{studio_id}; $params->{default_studio_id} = $user_presets->{studio_id};
$params->{studio_id} = $params->{default_studio_id} $params = uac::setDefaultStudio( $params, $user_presets );
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) ); $params = uac::setDefaultProject( $params, $user_presets );
$params->{project_id} = $user_presets->{project_id}
if ( ( !( defined $params->{action} ) ) || ( $params->{action} eq '' ) || ( $params->{action} eq 'login' ) );
#print STDERR $params->{project_id}."\n";
my $request = { my $request = {
url => $ENV{QUERY_STRING} || '', url => $ENV{QUERY_STRING} || '',
params => { params => {