X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fshare%2Fhtml%2FSearch%2FCalendar.html;h=a693bd64594ee2428cd187cc036574fc9300083c;hb=9931b2eeff85811118d0b495dd4e460bc939b744;hp=f66f27d792862907d63af52671ea03c343efb064;hpb=cb304f6953644812382d0aa55486fa4858a8fd6a;p=freeside.git
diff --git a/rt/share/html/Search/Calendar.html b/rt/share/html/Search/Calendar.html
index f66f27d79..a693bd645 100644
--- a/rt/share/html/Search/Calendar.html
+++ b/rt/share/html/Search/Calendar.html
@@ -72,7 +72,7 @@ $OrigYear => undef
- |
+> |
% for ( @{$week{$weekstart}} ) {
<%$rtdate->GetWeekday($_)%> |
% }
@@ -81,54 +81,136 @@ $OrigYear => undef
+
% if ( $WeekDay ) {
- <& td_week_collapse, date=>$date, Month=>$OrigMonth, Year=>$OrigYear, QueryString=>$QueryString &>
+ valign="middle">
+ <& week_collapse, date=>$date, Month=>$OrigMonth, Year=>$OrigYear, QueryString=>$QueryString &>
+ |
+
% } else {
<& td_week_expand, date=>$date, Month=>$Month, Year=>$Year, QueryString=>$QueryString &>
% }
-% while ($date <= $end) {
+
+% if ( $WeekDay ) {
+
+ |
+
+% $date = $start;
+% while ($date <= $end) {
%
-% my $offmonth = !$WeekDay && $date->month != ($Month + 1);
-% my $is_today = (DateTime->compare($today, $date) == 0);
-% my $is_yesterday = (DateTime->compare($yesterday, $date) == 0);
-% my $is_aweekago = (DateTime->compare($aweekago, $date) == 0);
-
-
- <% ( $WeekDay ? $rtdate->GetMonth($date->month-1). ' ' : '' ).
- $date->day
- %>
-
-% my $sp = 3;
-% for my $t ( @{ $Tickets{$date->strftime("%F")} } ) {
-% $sp--;
- <& /Elements/CalendarEvent, Object => $t, Date => $date, DateTypes => \%DateTypes &>
+% my $is_today = (DateTime->compare($today, $date) == 0);
+% my $is_yesterday = (DateTime->compare($yesterday, $date) == 0);
+% my $is_aweekago = (DateTime->compare($aweekago, $date) == 0);
+
+ |
+ <% $rtdate->GetMonth($date->month-1). ' '. $date->day %>
+
+ |
+
+% $date = $set->next($date);
+% if ( $date->day_of_week == $startday_of_week ) {
+
+% if ( $date <= $end ) { #a second week? not going to work for week view yet
+
+ valign="middle">
+ <& week_collapse, date=>$date, Month=>$OrigMonth, Year=>$OrigYear, QueryString=>$QueryString &>
+ |
+% }
% }
- <% ($sp>0) ? '
'x$sp : '' |n %>
-
+% } #while ($date <= $end)
-% $date = $set->next($date);
-% if ( $date->day_of_week == $startday_of_week ) {
-
-% if ( $date <= $end ) {
-
-% if ( $WeekDay ) {
- <& td_week_collapse, date=>$date, Month=>$OrigMonth, Year=>$OrigYear, QueryString=>$QueryString &>
-% } else {
- <& td_week_expand, date=>$date, Month=>$Month, Year=>$Year, QueryString=>$QueryString &>
+% foreach my $row ( @week_rows ) {
+
+ <& td_time, $row &>
+
+% $date = $start;
+% while ($date <= $end) {
+%
+% my $is_today = (DateTime->compare($today, $date) == 0);
+% my $is_yesterday = (DateTime->compare($yesterday, $date) == 0);
+% my $is_aweekago = (DateTime->compare($aweekago, $date) == 0);
+
+
+
+% #XXX display these in a time aware fashion
+%#% my $sp = 3;
+%#% for my $t ( @{ $Tickets{$date->strftime("%F")} } ) {
+%#% $sp--;
+%# <& /Elements/CalendarEvent, Object => $t, Date => $date, DateTypes => \%DateTypes &>
+%#% }
+%# <% ($sp>0) ? ' 'x$sp : '' |n %>
+
+ |
+
+% $date = $set->next($date);
+% if ( $date->day_of_week == $startday_of_week ) {
+
+% if ( $date <= $end ) { #a second week? not going to work for week view yet
+
+ valign="middle">
+ <& week_collapse, date=>$date, Month=>$OrigMonth, Year=>$OrigYear, QueryString=>$QueryString &>
+ |
% }
+% }
+
+% } #while ($date <= $end)
+% } #foreach my $row ( @week_rows )
+
+% } else {
+
+% while ($date <= $end) {
+%
+% my $offmonth = !$WeekDay && $date->month != ($Month + 1);
+% my $is_today = (DateTime->compare($today, $date) == 0);
+% my $is_yesterday = (DateTime->compare($yesterday, $date) == 0);
+% my $is_aweekago = (DateTime->compare($aweekago, $date) == 0);
+
+
+ <% $date->day %>
+
+% my $sp = 3;
+% for my $t ( @{ $Tickets{$date->strftime("%F")} } ) {
+% $sp--;
+ <& /Elements/CalendarEvent, Object => $t, Date => $date, DateTypes => \%DateTypes &>
+% }
+ <% ($sp>0) ? ' 'x$sp : '' |n %>
+
+ |
+
+% $date = $set->next($date);
+% if ( $date->day_of_week == $startday_of_week ) {
+
+% if ( $date <= $end ) {
+
+ <& td_week_expand, date=>$date, Month=>$Month, Year=>$Year, QueryString=>$QueryString &>
+% }
% }
-% }
+
+% } #while ($date <= $end)
% }
@@ -214,6 +296,16 @@ my %legend = (
'starts_due' => ['Starts','Due'],
);
+my $stime = 480; #8am
+my $etime = 1080; #6pm
+my $timestep = 30; #1/2h
+#my $timestep = 120; #2h
+my $rowspan = ($etime-$stime) / $timestep;
+
+my $wt = $stime;
+my @week_rows = ();
+while ( $wt < $etime ) { push @week_rows, $wt; $wt+=$timestep }
+
%ONCE>
<%INIT>
use RTx::Calendar qw(FirstDay LastDay LastDayOfWeek);
@@ -224,6 +316,9 @@ my @DateTypes = qw/Created Starts Started Due LastUpdated Resolved/;
my $rtdate = RT::Date->new($session{'CurrentUser'});
+my $time_zone = $session{'CurrentUser'}->UserObj->Timezone
+ || RT->Config->Get('Timezone');
+
my $weekstart = 'Sunday'; #RT::SiteConfig? user pref?
my %week = (
'Saturday' => [6,0..5],
@@ -233,18 +328,23 @@ my %week = (
my $startday_of_week = ${$week{$weekstart}}[0] || 7;
my $endday_of_week = ${$week{$weekstart}}[-1] || 7;
-my $today = DateTime->today;
+my $today = DateTime->today( time_zone=>$time_zone );
my $yesterday = $today->clone->subtract( days=>1 );
my $aweekago = $today->clone->subtract( days=>7 );
-my( $date, $end );
+my( $start, $end );
if ( $WeekDay ) {
- $date = DateTime->new( year=>$WeekYear, month=>$WeekMonth+1, day=>$WeekDay );
+ $start = DateTime->new( year => $WeekYear,
+ month => $WeekMonth+1,
+ day => $WeekDay,
+ time_zone => $time_zone,
+ );
$end = LastDayOfWeek( $WeekYear, $WeekMonth+1, $WeekDay, $endday_of_week );
} else {
- $date = FirstDay($Year, $Month + 1, $startday_of_week );
- $end = LastDay ($Year, $Month + 1, $endday_of_week );
+ $start = FirstDay($Year, $Month + 1, $startday_of_week );
+ $end = LastDay ($Year, $Month + 1, $endday_of_week );
}
+my $date = $start;
# use this to loop over days until $end
my $set = DateTime::Set->from_recurrence(
@@ -304,14 +404,36 @@ my %Tickets = RTx::Calendar::FindTickets($session{'CurrentUser'}, $TempQuery, \@
%def>
-<%def td_week_collapse>
+<%def week_collapse>
<%args>
$date => undef
$Month => undef
$Year => undef
$QueryString => undef
%args>
-