X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FSearch%2FSchedule.html;h=43680b47c6a37a4ff0bf5dbe2266223617b64bd3;hb=660d0fe0876186513fdd4d6a2946816dc4a42db5;hp=4bc5134cbff6c832b5b9c6e9234ea03ae7ea01d6;hpb=ddcefead29544e7813f942e0eca062bf6433763e;p=freeside.git
diff --git a/rt/share/html/Search/Schedule.html b/rt/share/html/Search/Schedule.html
index 4bc5134cb..43680b47c 100644
--- a/rt/share/html/Search/Schedule.html
+++ b/rt/share/html/Search/Schedule.html
@@ -1,14 +1,9 @@
-<& /Elements/Header, Title => 'Schedule' &>
-
-%#init_overlib.html
-%foreach my $file (@files) {
-
-%}
-
-
+<& /Elements/Header, Title => 'Schedule', JavaScript => 0 &>
<& /Search/Calendar.html,
@_,
Query => "( Status = 'new' OR Status = 'open' OR Status = 'stalled')
- AND ( Type = 'reminder' OR 'Type' = 'ticket' )",
- #XXX and we have the magic custom field
- slots => scalar( @{ $ARGS{username} } ),
+ AND ( Type = 'reminder' OR 'Type' = 'ticket' )
+ AND Queue = $queueid ",
+ slots => scalar(@usernames),
Embed => 'Schedule.html',
DimPast => 1,
Display => 'Schedule',
- DisplayArgs => [ username => $ARGS{username},
+ DisplayArgs => [ username => \@usernames,
LengthMin => $LengthMin,
+ #oops, more freeside abstraction-leaking
+ custnum => $ARGS{custnum},
+ pkgnum => $ARGS{pkgnum},
],
&>
@@ -71,13 +222,33 @@ my $timestep = RT->Config->Get('CalendarWeeklySizeMin') || 30; #1/2h
%ONCE>
<%init>
+#abstraction-leaking
+my $conf = new FS::Conf;
+my $queueid = $conf->config('ticket_system-appointment-queueid')
+ or die "ticket_system-appointment-queueid configuration not set";
+
my @files = ();
#if ( ! $initialized ) {
push @files, map "overlibmws$_", ( '', qw( _iframe _draggable _crossframe ) );
push @files, map { "${_}contentmws" } qw( iframe ajax );
#%}
-my $LengthMin = 180; #XXX $ARGS{LengthMin};, passed in
+my @usernames = ();
+if ( ref($ARGS{username}) ) {
+ @usernames = @{ $ARGS{username} };
+} elsif ( $ARGS{username} ) {
+ @usernames = ( $ARGS{username} );
+} else {
+ #look them up ourslves... again, more FS abstraction-leaking, but
+ # we want to link to the schedule view, and better than doing this every
+ # menu render
+ use FS::Record qw( qsearch );
+ use FS::sched_item;
+ my @sched_item = qsearch('sched_item', { 'disabled' => '', });
+ @usernames = map $_->access_user->username, @sched_item;
+}
+
+( my $LengthMin = $ARGS{LengthMin} ) =~ /^\d+$/ or die 'non-numeric LengthMin';
my $cells = int($LengthMin / $timestep);
$cells++ if $LengthMin % $timestep;