X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FCalendarSlotSchedule;h=f12b4a6bebefee7e3988dacfe3dfa2addcec7dc0;hp=55c45cd4155ec33d5d694ce9c64e632e070f1cf9;hb=01721976fa3324f41a3093cda68bc38a7eec5ff5;hpb=01ffb4debe929b4d28f2ff9aee2f2bfc9b67fb47 diff --git a/rt/share/html/Elements/CalendarSlotSchedule b/rt/share/html/Elements/CalendarSlotSchedule index 55c45cd41..f12b4a6be 100644 --- a/rt/share/html/Elements/CalendarSlotSchedule +++ b/rt/share/html/Elements/CalendarSlotSchedule @@ -9,7 +9,9 @@ $LengthMin => $default_timestep $custnum => undef $pkgnum => undef + $RedirectToBasics => 0 %ARGS> +% my $scheduling = ($custnum && $LengthMin) ? 1 : 0; % foreach my $username ( @username ) { % % my %schedule = UserDaySchedule( username => $username, @@ -17,15 +19,23 @@ % Tickets => \@Tickets, % ); % -% my $bgcolor = '666666;border-color:#555555'; -% my $content = ''; -% my $selectable = 0; +% my $bgcolor = '#666666'; +% my $border = '1px solid #555555'; +% my $label_time = ''; +% my $label_title = ''; +% my $selectable = 0; # can we schedule a new appointment +% my $ticketid = 0; +% my $draggable_length = 0; +% my $droppable = 0; # can we reschedule an appointment here +% my $cells = 0; # total cell count for appointment +% my $offset = 0; # position of cell in appointment % % #white out available times % foreach my $avail ( @{ $schedule{'avail'} } ) { % my( $start, $end ) = @$avail; % next if $start >= ($tod_row+$timestep) || $end <= $tod_row; -% $bgcolor = 'FFFFFF'; +% $bgcolor = '#FFFFFF'; +% $border = '1px solid #D7D7D7'; % $selectable = 1 % if $LengthMin <= $end - $tod_row #the slot is long enough % && ! grep { $_ > $tod_row && $LengthMin > $_ - $tod_row } @@ -33,68 +43,137 @@ % } % % #block out / show / color code existing appointments -% #my %line = (); +% my $maxstarts = 0; % foreach my $id ( keys %{ $schedule{'scheduled'} } ) { % % my( $starts, $due, $col, $t ) = @{ $schedule{'scheduled'}->{$id} }; % +% # misleading loop--at most one id should pass this test % next if $starts >= ($tod_row+$timestep) || $due <= $tod_row; % -% $bgcolor = $col; +% # but, if for any reason a scheduling conflict occurs, +% # use the later starting one to minimize UI conflicts-- +% # not to imply that this scenario has been tested or should ever happen!!! +% next if $starts < $maxstarts; +% $maxstarts = $starts; +% +% $ticketid = $id; +% $bgcolor = '#'.$col; +% $border = '1px solid #D7D7D7'; +% # can't schedule a new appointment % $selectable = 0; +% # but can reschedule a ticket overlapping its old slot (filtered by can_drop) +% $droppable = 1 unless $scheduling; +% $draggable_length = $due - $starts; +% $cells = int( ($due-$starts) / $timestep ); +% $cells++ if ($due-$starts) % $timestep; % -% if ( $starts >= $tod_row ) { #first row -% $content .= ($content?', ':''). $id. -% ': '. FS::sched_avail::pretty_time($starts). '-'. -% FS::sched_avail::pretty_time($due); -% #'install for custname XX miles away'; #XXX placeholder/more -% #} else { -% # $content .= ($content?', ':''). $id; -% } +% #false laziness w/misc/xmlhttp-ticket-update.html & CalendarDaySchedule +% my %hash = $m->comp('/Ticket/Elements/Customers', Ticket => $t); +% my @cust_main = values( %{$hash{cust_main}} ); +% +% #false laziness w/xmlhttp-ticket-update.html +% $label_time = FS::sched_avail::pretty_time($starts). '-'. +% FS::sched_avail::pretty_time($due); +% $label_title = $cust_main[0]->_FreesideURILabel; +% #'install for custname XX miles away'; #XXX placeholder/more +% +% $offset = int( ($tod_row - $starts) / $timestep ); +% $offset++ if ($tod_row - $starts) % $timestep; % } +% +% my $td_id = 'td_'. $Date->epoch. '_'. $tod_row. '_'. $username; -