[otrs-cvs] CVS: Calendar/Kernel/Modules AgentCalendar.pm,1.11,1.12
cvs-log at otrs.org
cvs-log at otrs.org
Wed Oct 4 23:04:50 CEST 2006
Update of /home/cvs/Calendar/Kernel/Modules
In directory lancelot:/tmp/cvs-serv19527/Kernel/Modules
Modified Files:
AgentCalendar.pm
Log Message:
added sequence feature
Index: AgentCalendar.pm
===================================================================
RCS file: /home/cvs/Calendar/Kernel/Modules/AgentCalendar.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** AgentCalendar.pm 1 Feb 2006 17:27:16 -0000 1.11
--- AgentCalendar.pm 4 Oct 2006 20:04:48 -0000 1.12
***************
*** 1,5 ****
# --
# Kernel/Modules/AgentCalendar.pm - a calendar
! # Copyright (C) 2001-2006 Martin Edenhofer <martin+code at otrs.org>
# --
# $Id$
--- 1,5 ----
# --
# Kernel/Modules/AgentCalendar.pm - a calendar
! # Copyright (C) 2001-2006 OTRS GmbH, http://otrs.org/
# --
# $Id$
***************
*** 108,111 ****
--- 108,112 ----
$GetParam{EndHour} = '09';
}
+ $Frontend{'SequenceType::None'} = 'checked';
$Frontend{StartDateString} = $Self->{LayoutObject}->BuildDateSelection(
Format => 'DateInputFormatLong',
***************
*** 122,125 ****
--- 123,136 ----
EndMinute => '00',
);
+ $Frontend{SequenceEndDateString} = $Self->{LayoutObject}->BuildDateSelection(
+ YearDiff => 50,
+ Format => 'DateInputFormatLong',
+ Prefix => 'SequenceEnd',
+ # DiffTime => 60*60*24*365*10,
+ %GetParam,
+ SequenceEndYear => '2030',
+ SequenceEndHour => '59',
+ SequenceEndMinute => '00',
+ );
$Frontend{State} = $Self->{LayoutObject}->OptionStrgHashRef(
Data => {
***************
*** 132,135 ****
--- 143,170 ----
SelectedID => $Param{State} || 'public',
);
+ $Frontend{MonthlyString} = $Self->{LayoutObject}->OptionStrgHashRef(
+ Data => {
+ 1 => '1. first',
+ 2 => '2. second',
+ 3 => '3. third',
+ 4 => '4. fourth',
+ },
+ Name => 'MonthlyType',
+ SelectedID => $Param{MonthlyType} || '',
+ );
+ $Frontend{Reminder} = $Self->{LayoutObject}->OptionStrgHashRef(
+ Data => {
+ '' => '-',
+ 15 => '15 Minutes',
+ 30 => '30 Minutes',
+ 45 => '45 Minutes',
+ 60 => '1 Hour',
+ 120 => '2 Hours',
+ 240 => '4 Hours',
+ 3600 => '1 Day',
+ },
+ Name => 'Reminder',
+ SelectedID => $Param{Reminder} || '',
+ );
my %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
***************
*** 141,144 ****
--- 176,180 ----
Multiple => 1,
Size => 5,
+ SelectedIDRefArray => [$Self->{UserID}],
);
***************
*** 175,188 ****
$GetParam{"Start$_"} = $Self->{ParamObject}->GetParam(Param => "Start$_");
$GetParam{"End$_"} = $Self->{ParamObject}->GetParam(Param => "End$_");
}
foreach (qw(Month Day Hour Minute)) {
$GetParam{"Start$_"} = sprintf("%02d", $GetParam{"Start$_"});
$GetParam{"End$_"} = sprintf("%02d", $GetParam{"End$_"});
}
! foreach (qw(Title Content State)) {
$GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
}
$GetParam{StartTime} = "$GetParam{StartYear}-$GetParam{StartMonth}-$GetParam{StartDay} $GetParam{StartHour}:$GetParam{StartMinute}:00";
$GetParam{EndTime} = "$GetParam{EndYear}-$GetParam{EndMonth}-$GetParam{EndDay} $GetParam{EndHour}:$GetParam{EndMinute}:00";
my @UserIDs = $Self->{ParamObject}->GetArray(Param => 'UserIDs');
$GetParam{UserIDs} = \@UserIDs;
--- 211,228 ----
$GetParam{"Start$_"} = $Self->{ParamObject}->GetParam(Param => "Start$_");
$GetParam{"End$_"} = $Self->{ParamObject}->GetParam(Param => "End$_");
+ $GetParam{"SequenceEnd$_"} = $Self->{ParamObject}->GetParam(Param => "SequenceEnd$_");
}
foreach (qw(Month Day Hour Minute)) {
$GetParam{"Start$_"} = sprintf("%02d", $GetParam{"Start$_"});
$GetParam{"End$_"} = sprintf("%02d", $GetParam{"End$_"});
+ $GetParam{"SequenceEnd$_"} = sprintf("%02d", $GetParam{"SequenceEnd$_"});
}
! # foreach (qw(Title Content State SequenceType Reminder)) {
! foreach (qw(Title Content State SequenceType)) {
$GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
}
$GetParam{StartTime} = "$GetParam{StartYear}-$GetParam{StartMonth}-$GetParam{StartDay} $GetParam{StartHour}:$GetParam{StartMinute}:00";
$GetParam{EndTime} = "$GetParam{EndYear}-$GetParam{EndMonth}-$GetParam{EndDay} $GetParam{EndHour}:$GetParam{EndMinute}:00";
+ $GetParam{SequenceEndTime} = "$GetParam{SequenceEndYear}-$GetParam{SequenceEndMonth}-$GetParam{SequenceEndDay} $GetParam{SequenceEndHour}:$GetParam{SequenceEndMinute}:00";
my @UserIDs = $Self->{ParamObject}->GetArray(Param => 'UserIDs');
$GetParam{UserIDs} = \@UserIDs;
***************
*** 218,221 ****
--- 258,313 ----
}
}
+ if ($Event{SequenceType} =~ /^(Monthly::...)::(.+?)$/) {
+ $Event{'SequenceType'} = $1;
+ $Event{'MonthlyType'} = $2;
+ }
+ if ($Event{SequenceType} eq 'Yearly') {
+ $Frontend{'SequenceType::Yearly'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Mon') {
+ $Frontend{'SequenceType::Weekly::Mon'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Tue') {
+ $Frontend{'SequenceType::Weekly::Tue'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Wed') {
+ $Frontend{'SequenceType::Weekly::Wed'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Thu') {
+ $Frontend{'SequenceType::Weekly::Thu'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Fri') {
+ $Frontend{'SequenceType::Weekly::Fri'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Sat') {
+ $Frontend{'SequenceType::Weekly::Sat'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Weekly::Sun') {
+ $Frontend{'SequenceType::Weekly::Sun'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Mon') {
+ $Frontend{'SequenceType::Monthly::Mon'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Tue') {
+ $Frontend{'SequenceType::Monthly::Tue'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Wed') {
+ $Frontend{'SequenceType::Monthly::Wed'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Thu') {
+ $Frontend{'SequenceType::Monthly::Thu'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Fri') {
+ $Frontend{'SequenceType::Monthly::Fri'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Sat') {
+ $Frontend{'SequenceType::Monthly::Sat'} = 'checked';
+ }
+ elsif ($Event{SequenceType} eq 'Monthly::Sun') {
+ $Frontend{'SequenceType::Monthly::Sun'} = 'checked';
+ }
+ else {
+ $Frontend{'SequenceType::None'} = 'checked';
+ }
$Frontend{StartDateString} = $Self->{LayoutObject}->BuildDateSelection(
Format => 'DateInputFormatLong',
***************
*** 228,231 ****
--- 320,329 ----
%Event,
);
+ $Frontend{SequenceEndDateString} = $Self->{LayoutObject}->BuildDateSelection(
+ Format => 'DateInputFormatLong',
+ Prefix => 'SequenceEnd',
+ %Event,
+ YearDiff => 50,
+ );
$Frontend{StateString} = $Self->{LayoutObject}->OptionStrgHashRef(
Data => {
***************
*** 238,241 ****
--- 336,364 ----
SelectedID => $Event{State} || 'public',
);
+ $Frontend{MonthlyString} = $Self->{LayoutObject}->OptionStrgHashRef(
+ Data => {
+ 1 => '1. first',
+ 2 => '2. second',
+ 3 => '3. third',
+ 4 => '4. fourth',
+ },
+ Name => 'MonthlyType',
+ SelectedID => $Event{MonthlyType} || '',
+ );
+ $Frontend{ReminderString} = $Self->{LayoutObject}->OptionStrgHashRef(
+ Data => {
+ '' => ' - ',
+ 15 => ' 15 Minutes',
+ 30 => ' 30 Minutes',
+ 45 => ' 45 Minutes',
+ 60 => ' 1 Hour',
+ 120 => ' 2 Hours',
+ 240 => ' 4 Hours',
+ 480 => ' 8 Hours',
+ 3600 => '1 Day',
+ },
+ Name => 'Reminder',
+ SelectedID => $Param{Reminder} || '',
+ );
my %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
***************
*** 283,294 ****
$GetParam{"Start$_"} = $Self->{ParamObject}->GetParam(Param => "Start$_");
$GetParam{"End$_"} = $Self->{ParamObject}->GetParam(Param => "End$_");
}
foreach (qw(Month Day Hour Minute)) {
$GetParam{"Start$_"} = sprintf("%02d", $GetParam{"Start$_"});
$GetParam{"End$_"} = sprintf("%02d", $GetParam{"End$_"});
}
! foreach (qw(EventID Title Content State Delete)) {
$GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
}
# check delete
if ($GetParam{Delete}) {
--- 406,423 ----
$GetParam{"Start$_"} = $Self->{ParamObject}->GetParam(Param => "Start$_");
$GetParam{"End$_"} = $Self->{ParamObject}->GetParam(Param => "End$_");
+ $GetParam{"SequenceEnd$_"} = $Self->{ParamObject}->GetParam(Param => "SequenceEnd$_");
}
foreach (qw(Month Day Hour Minute)) {
$GetParam{"Start$_"} = sprintf("%02d", $GetParam{"Start$_"});
$GetParam{"End$_"} = sprintf("%02d", $GetParam{"End$_"});
+ $GetParam{"SequenceEnd$_"} = sprintf("%02d", $GetParam{"SequenceEnd$_"});
}
! # foreach (qw(EventID Title Content State SequenceType Reminder Delete MonthlyType)) {
! foreach (qw(EventID Title Content State SequenceType Delete MonthlyType)) {
$GetParam{$_} = $Self->{ParamObject}->GetParam(Param => $_);
}
+ if ($GetParam{SequenceType} =~ /^Monthly::/) {
+ $GetParam{SequenceType} .= '::'.$GetParam{MonthlyType};
+ }
# check delete
if ($GetParam{Delete}) {
***************
*** 315,318 ****
--- 444,448 ----
$GetParam{StartTime} = "$GetParam{StartYear}-$GetParam{StartMonth}-$GetParam{StartDay} $GetParam{StartHour}:$GetParam{StartMinute}:00";
$GetParam{EndTime} = "$GetParam{EndYear}-$GetParam{EndMonth}-$GetParam{EndDay} $GetParam{EndHour}:$GetParam{EndMinute}:00";
+ $GetParam{SequenceEndTime} = "$GetParam{SequenceEndYear}-$GetParam{SequenceEndMonth}-$GetParam{SequenceEndDay} $GetParam{SequenceEndHour}:$GetParam{SequenceEndMinute}:00";
# update event
if ($Self->{CalendarObject}->EventUpdate(%GetParam)) {
***************
*** 595,601 ****
foreach (@{$Data{EventIDs}}) {
$Noting = 0;
! my %Event = $Self->{CalendarObject}->EventGet(EventID => $_);
my $Preffix = '';
! foreach my $User (@{$Event{UserIDs}}) {
my %User = $Self->{UserObject}->GetUserData(
UserID => $User,
--- 725,733 ----
foreach (@{$Data{EventIDs}}) {
$Noting = 0;
! # my %Event = $Self->{CalendarObject}->EventGet(EventID => $_);
! my %Event = %{$_};
! my %EventOrig = $Self->{CalendarObject}->EventGet(EventID => $Event{EventID});
my $Preffix = '';
! foreach my $User (@{$EventOrig{UserIDs}}) {
my %User = $Self->{UserObject}->GetUserData(
UserID => $User,
***************
*** 607,614 ****
$Preffix .= $User{UserLogin};
}
! $Event{Title} = '('.$Preffix.') '.$Event{Title};
if ($Event{State} =~ /private/i && $Event{UserID} ne $Self->{UserID}) {
my $Hit = 0;
! foreach (@{$Event{UserIDs}}) {
if ($_ eq $Self->{UserID}) {
$Hit = 1;
--- 739,748 ----
$Preffix .= $User{UserLogin};
}
! if ($Preffix) {
! $Event{Title} = '('.$Preffix.') '.$Event{Title};
! }
if ($Event{State} =~ /private/i && $Event{UserID} ne $Self->{UserID}) {
my $Hit = 0;
! foreach (@{$EventOrig{UserIDs}}) {
if ($_ eq $Self->{UserID}) {
$Hit = 1;
***************
*** 730,736 ****
foreach (@{$Data{EventIDs}}) {
$Noting = 0;
! my %Event = $Self->{CalendarObject}->EventGet(EventID => $_);
my $Preffix = '';
! foreach my $User (@{$Event{UserIDs}}) {
my %User = $Self->{UserObject}->GetUserData(
UserID => $User,
--- 864,872 ----
foreach (@{$Data{EventIDs}}) {
$Noting = 0;
! # my %Event = $Self->{CalendarObject}->EventGet(EventID => $_);
! my %Event = %{$_};
! my %EventOrig = $Self->{CalendarObject}->EventGet(EventID => $Event{EventID});
my $Preffix = '';
! foreach my $User (@{$EventOrig{UserIDs}}) {
my %User = $Self->{UserObject}->GetUserData(
UserID => $User,
***************
*** 742,749 ****
$Preffix .= $User{UserLogin};
}
! $Event{Title} = '('.$Preffix.') '.$Event{Title};
if ($Event{State} =~ /private/i && $Event{UserID} ne $Self->{UserID}) {
my $Hit = 0;
! foreach (@{$Event{UserIDs}}) {
if ($_ eq $Self->{UserID}) {
$Hit = 1;
--- 878,887 ----
$Preffix .= $User{UserLogin};
}
! if ($Preffix) {
! $Event{Title} = '('.$Preffix.') '.$Event{Title};
! }
if ($Event{State} =~ /private/i && $Event{UserID} ne $Self->{UserID}) {
my $Hit = 0;
! foreach (@{$EventOrig{UserIDs}}) {
if ($_ eq $Self->{UserID}) {
$Hit = 1;
***************
*** 799,809 ****
my $Self = shift;
my $StartYear = shift;
! my $StartMonth = shift;
! my $StartDay = shift;
my $StartHour = shift;
my $StartMinute = shift;
my $EndYear = shift;
! my $EndMonth = shift;
! my $EndDay = shift;
my $EndHour = shift;
my $EndMinute = shift;
--- 937,947 ----
my $Self = shift;
my $StartYear = shift;
! my $StartMonth = sprintf("%02d",shift);
! my $StartDay = sprintf("%02d",shift);
my $StartHour = shift;
my $StartMinute = shift;
my $EndYear = shift;
! my $EndMonth = sprintf("%02d",shift);
! my $EndDay = sprintf("%02d",shift);
my $EndHour = shift;
my $EndMinute = shift;
More information about the cvs-log
mailing list