X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FCalendarSlotSchedule;h=3af90ff3e9dcb10cde326d42a739cb9085407c12;hb=2513882cf22e165f704cf3a0f9891dedb213a310;hp=88202d417507693a3905cf3f7f2d9f1132b1dbe7;hpb=e052bf55b4c7e36422e053c5ba7b3c924283e603;p=freeside.git
diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule
index 88202d417..3af90ff3e 100644
--- a/rt/share/html/Elements/CalendarSlotSchedule
+++ b/rt/share/html/Elements/CalendarSlotSchedule
@@ -1,92 +1,45 @@
<%ARGS>
- $Date => undef,
+ $Date => undef
@Tickets => ()
- $slots => $default_slots,
- $sday => undef,
- $tod_row => undef,
- $timestep => $default_timestep,
+ $slots => $default_slots
+ $sday => undef
+ $tod_row => undef
+ $timestep => $default_timestep
@username => ()
%ARGS>
-<%SHARED>
-my @slots = ( [], [], [], [], [], [], [] );
-%SHARED>
-% #for my $t ( @{ $Tickets{$date->strftime("%F")} } ) {
+% foreach my $username ( @username ) {
+
+
% for my $t (@Tickets) {
+% next unless $t->OwnerObj->Name eq $username;
+%
+% next unless RTx::Calendar::LocalDate($t->StartsObj->Unix)
+% eq $Date->strftime('%F'); #today
%
% my($sm, $sh) = ($t->StartsObj->Localtime('user'))[1,2];
% my $starts = $sh*60 + $sm;
%
-% if ( RTx::Calendar::LocalDate($t->StartsObj->Unix) eq $Date->strftime('%F') #today
-% && $starts >= $tod_row && $starts < ($tod_row + $timestep) ) {
-% #then we're a new entry, find a slot for us
-% my $s = 0;
-% while ( ref($slots[$sday]->[$s]) ) { $s++ }
-% $slots[$sday]->[$s] = [ $t->Id, $t ];
-% }
-%
% my($dm, $dh) = ($t->DueObj->Localtime('user'))[1,2];
% my $due = $dh*60 + $dm;
%
-% if ( RTx::Calendar::LocalDate($t->DueObj->Unix) eq $Date->strftime('%F') #today
-% && $due <= $tod_row && $due > ($tod_row + $timestep ) ) {
-% #then find our slot and remove us
-% @{ $slots[$sday] } =
-% map { (!ref($_) || $_->[0] != $t->Id) ? $_ : '' }
-% @{ $slots[$sday] };
-% }
-%
-% }
-%
-% pop @{ $slots[$sday] } while @{ $slots[$sday] } && !ref($slots[$sday]->[-1]);
-%
-% #now display:
+% next if $starts >= ($tod_row+$timestep) || $due < $tod_row;
%
-% if ( scalar(@{$slots[$sday]}) > $slots ) {
-% #overflow situation, eek... could be handled better, how?
-
- |
- class="weekly
-%# <% $is_today ? 'today'
-%# : $is_yesterday ? 'yesterday'
-%# : $is_aweekago ? 'aweekago'
-%# : ''
-%# %>
- "
- >MULTIPLE
- |
-
-% } else {
-%
-% foreach my $slot ( @{ $slots[$sday] } ) {
-% my( $id, $ticket ) = @$slot;
-
- <% $id %>
- |
-
+% warn $starts. ' = '. ($tod_row+$timestep);
+% if ( $starts >= $tod_row ) {
+ <% $t->Id %>
+% } else {
+ cont<% $t->Id %>...
% }
-%
-% if ( scalar(@{$slots[$sday]}) < $slots ) {
-
-
- class="weekly
-%# <% $is_today ? 'today'
-%# : $is_yesterday ? 'yesterday'
-%# : $is_aweekago ? 'aweekago'
-%# : ''
-%# %>
- "
- >
- |
-% }
-%
% }
+
+% }
<%ONCE>
my $default_slots = RT->Config->Get('CalendarWeeklySlots') || 5;
my $default_timestep = RT->Config->Get('CalendarWeeklySizeMin') || 30; #1/2h