X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FCalendarSlotSchedule;h=5b400406295fe0a4200a6e7696fa708d77cb4115;hb=ddcefead29544e7813f942e0eca062bf6433763e;hp=e94bddfe24b411db27f603f8f6895a0a642f19c0;hpb=282d98b8ebad35123455dd8ccb414805a1624c6c;p=freeside.git

diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule
index e94bddfe2..5b4004062 100644
--- a/rt/share/html/Elements/CalendarSlotSchedule
+++ b/rt/share/html/Elements/CalendarSlotSchedule
@@ -1,90 +1,68 @@
 <%ARGS>
-  @Tickets  => ()
-  $slots    => $default_slots,
-  $sday     => undef,
-  $tod_row  => undef,
-  $timestep => $default_timestep,
+  $Date      => undef
+  @Tickets   => ()
+  $slots     => $default_slots
+  $sday      => undef
+  $tod_row   => undef
+  $timestep  => $default_timestep
+  @username  => ()
+  $LengthMin => $default_timestep
 </%ARGS>
-<%SHARED>
-my @slots = ( [], [], [], [], [], [], [] );
-</%SHARED>
-% warn $sday;
-%       #for my $t ( @{ $Tickets{$date->strftime("%F")} } ) {
-%       for my $t (@Tickets) {
+% foreach my $username ( @username ) {
 %
-%         #XXX off by 1h on daylight savings boundaries... 2 sundays a year
-%         my $starts = ($t->StartsObj->Unix - $t->StartsObj->SetToMidnight(Timezone=>'user'))/60;
+%   my %schedule = UserDaySchedule( username => $username,
+%                                   'date'   => $Date->strftime('%F'),
+%                                   Tickets  => \@Tickets,
+%                                 );
 %
-%         if ( $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 $bgcolor = '666666;border-color:#555555';
+%   my $content = '';
+%   my $onmouse = 0;
 %
-%         #XXX also off by 1h on daylight savings boundaries
-%         my $due = $t->DueObj->Unix - $t->DueObj->SetToMidnight;
+%   #white out available times
+%   foreach my $avail ( @{ $schedule{'avail'} } ) {
+%     my( $start, $end ) = @$avail;
+%     next if $start >= ($tod_row+$timestep) || $end <= $tod_row;
+%     $bgcolor = 'FFFFFF';
+%     $onmouse = 1
+%       if $LengthMin <= $end - $tod_row  #the slot is long enough
+%       && ! grep { $_ > $tod_row && $LengthMin > $_ - $tod_row }
+%              map $_->[0], values %{ $schedule{'scheduled'} };
+%   }
 %
-%         if ( $due <= $tod_row && $due > ($tod_row + $timestep ) ) {
-%           #then find our slot and remove us
-%           @{ $slots[$sday] } =
-%             map { (!ref($_) || $_->[0] != $t->Id) ? $_ : '' }
-%               @{ $slots[$sday] };
-%         }
+%   #block out / show / color code existing appointments
+%   foreach my $id ( keys %{ $schedule{'scheduled'} } ) {
 %
-%       }
+%     my( $starts, $due, $col, $t ) = @{ $schedule{'scheduled'}->{$id} };
 %
-%       pop @{ $slots[$sday] } while @{ $slots[$sday] } && !ref($slots[$sday]->[-1]);
+%     next if $starts >= ($tod_row+$timestep) || $due < $tod_row;
 %
-%       #now display:
+%     $bgcolor = $col;
+%     $onmouse = 0;
 %
-%       if ( scalar(@{$slots[$sday]}) > $slots ) {
-%         #overflow situation, eek... could be handled better, how?
+%     if ( $starts >= $tod_row ) { #first row
+%       $content .= ($content?', ':''). $id; #XXX more
+%     }
+%   }
 
-          <td colspan=<%$slots%>
-              class="weekly
-%#                     <%   $is_today     ? 'today'
-%#                        : $is_yesterday ? 'yesterday'
-%#                        : $is_aweekago  ? 'aweekago'
-%#                        : ''
-%#                     %>
-                         "
-          >MULTIPLE
-          </td>
-
-%       } else {
-%
-%         foreach my $slot ( @{ $slots[$sday] } ) {
-%           my( $id, $ticket ) = @$slot;
-
-            <td class="weekly
-%#                       <%   $is_today     ? 'today'
-%#                          : $is_yesterday ? 'yesterday'
-%#                          : $is_aweekago  ? 'aweekago'
-%#                          : ''
-%#                       %>
-                           "
-            ><% $id %>
-            </td>
-
-%         }
-%
-%         if ( scalar(@{$slots[$sday]}) < $slots ) {
-
-            <td colspan=<% $slots - scalar(@{$slots[$sday]}) %>
-                class="weekly
-%#                       <%   $is_today     ? 'today'
-%#                          : $is_yesterday ? 'yesterday'
-%#                          : $is_aweekago  ? 'aweekago'
-%#                          : ''
-%#                       %>
-                           "
-            >
-            </td>
-%         }
-%
-%       }
+    <td style="background:#<%$bgcolor%>" class="weekly"
+%#               <%   $is_today     ? 'today'
+%#                  : $is_yesterday ? 'yesterday'
+%#                  : $is_aweekago  ? 'aweekago'
+%#                  : ''
+%#               %>"
+%     if ( $onmouse ) {
+        onmouseover="boxon(this);"
+        onmouseout ="boxoff(this);"
+%     }
+    ><% $content %></td>
+% }
 <%ONCE>
 my $default_slots = RT->Config->Get('CalendarWeeklySlots') || 5;
 my $default_timestep = RT->Config->Get('CalendarWeeklySizeMin') || 30; #1/2h
 </%ONCE>
+<%INIT>
+
+use RTx::Schedule qw( UserDaySchedule );
+
+</%INIT>