--- loncom/interface/slotrequest.pm 2005/10/26 23:37:51 1.26
+++ loncom/interface/slotrequest.pm 2005/11/14 23:21:55 1.30
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.26 2005/10/26 23:37:51 banghart Exp $
+# $Id: slotrequest.pm,v 1.30 2005/11/14 23:21:55 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -34,7 +34,7 @@ use Apache::Constants qw(:common :http :
use Apache::loncommon();
use Apache::lonlocal;
use Apache::lonnet;
-# use Date::Manip;
+use Date::Manip;
sub fail {
my ($r,$code)=@_;
@@ -53,11 +53,10 @@ sub fail {
}
sub start_page {
- my ($r)=@_;
+ my ($r,$title)=@_;
my $html=&Apache::lonxml::xmlbegin();
- $r->print($html.'<head><title>'.
- &mt('Request another Worktime').'</title></head>');
- $r->print(&Apache::loncommon::bodytag('Requesting another Worktime'));
+ $r->print($html.'<head><title>'.&mt($title).'</title></head>');
+ $r->print(&Apache::loncommon::bodytag($title));
}
sub end_page {
@@ -451,6 +450,49 @@ STUFF
$r->print('</table>');
}
+sub to_show {
+ my ($when,$slot) = @_;
+ my $time=time;
+ my $week=60*60*24*7;
+ if ($when eq 'now') {
+ if ($time > $slot->{'starttime'} &&
+ $time < $slot->{'endtime'}) {
+ return 1;
+ }
+ return 0;
+ } elsif ($when eq 'nextweek') {
+ if ( ($time < $slot->{'starttime'} &&
+ ($time+$week) > $slot->{'starttime'})
+ ||
+ ($time < $slot->{'endtime'} &&
+ ($time+$week) > $slot->{'endtime'}) ) {
+ return 1;
+ }
+ return 0;
+ } elsif ($when eq 'lastweek') {
+ if ( ($time > $slot->{'starttime'} &&
+ ($time-$week) < $slot->{'starttime'})
+ ||
+ ($time > $slot->{'endtime'} &&
+ ($time-$week) < $slot->{'endtime'}) ) {
+ return 1;
+ }
+ return 0;
+ } elsif ($when eq 'willopen') {
+ if ($time < $slot->{'starttime'}) {
+ return 1;
+ }
+ return 0;
+ } elsif ($when eq 'wereopen') {
+ if ($time > $slot->{'endtime'}) {
+ return 1;
+ }
+ return 0;
+ }
+
+ return 1;
+}
+
sub show_table {
my ($r,$mgr)=@_;
@@ -461,29 +503,78 @@ sub show_table {
}
my $available;
if ($mgr eq 'F') {
+ $r->print('<div>');
$r->print('<form method="POST" action="/adm/slotrequest">
<input type="hidden" name="command" value="uploadstart" />
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" />
</form>');
+ $r->print('<form method="POST" action="/adm/helper/newslot.helper">
+<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" />
+</form>');
+ $r->print('</div>');
}
+
+ my %Saveable_Parameters = ('show' => 'array',
+ 'when' => 'scalar',
+ 'order' => 'scalar');
+
+ &Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters);
+ &Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters);
+
+ my %show_fields=&Apache::lonlocal::texthash(
+ 'name' => 'Slot Name',
+ 'description' => 'Description',
+ 'type' => 'Type',
+ 'starttime' => 'Start time',
+ 'endtime' => 'End Time',
+ 'startreserve' => 'Time students can start reserving',
+ 'secret' => 'Secret Word',
+ 'maxspace' => 'Maxium # of students',
+ 'ip' => 'IP or DNS restrictions',
+ 'symb' => 'Resource slot is restricted to.',
+ 'uniqueperiod' => 'Period of time slot is unique',
+ 'proctor' => 'List of proctors');
+ my @show_order=('name','description','type','starttime','endtime',
+ 'startreserve','secret','maxspace','ip','symb',
+ 'uniqueperiod','proctor');
+ my @show =
+ (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show')
+ : keys(%show_fields);
+ my %show = map { $_ => 1 } (@show);
+
+ my %when_fields=&Apache::lonlocal::texthash(
+ 'now' => 'Open now',
+ 'nextweek' => 'Open within the next week',
+ 'lastweek' => 'Were open last week',
+ 'willopen' => 'Will open later',
+ 'wereopen' => 'Were open');
+ my @when_order=('now','nextweek','lastweek','willopen','wereopen');
+ $when_fields{'select_form_order'} = \@when_order;
+ my $when = (exists($env{'form.when'})) ? $env{'form.when'}
+ : 'now';
+
+ $r->print('<form method="POST" action="/adm/slotrequest">
+<input type="hidden" name="command" value="showslots" />');
+ $r->print('<div>');
+ $r->print('<table class="inline"><tr><th>'.&mt('Show').'</th><th>'.&mt('Open').'</th></tr><tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order).
+ '</td><td>'.&Apache::loncommon::select_form($when,'when',%when_fields).
+ '</td></tr></table>');
+ $r->print('</div>');
+ $r->print('<p><input type="submit" name="start" value="'.&mt('Update Display').'" /></p>');
my $linkstart='<a href="/adm/slotrequest?command=showslots&order=';
- $r->print('<table border="1">
+ $r->print('<table class="thinborder">
<tr>
- <th></th>
- <th>'.$linkstart.'name" >Slot name</a></th>
- <th>'.$linkstart.'type" >Type</a></th>
- <th>'.$linkstart.'description" >Description</a></th>
- <th>'.$linkstart.'starttime" >Start Time</a></th>
- <th>'.$linkstart.'endtime" >End Time</a></th>
- <th>'.$linkstart.'startreserve">Time Students Can Start Reserving</a></th>
- <th>'.$linkstart.'secret" >Secret</a></th>
- <th>'.$linkstart.'maxspace" >Max space</a></th>
- <th> Scheduled Students</th>
- <th>'.$linkstart.'unique" >Unique Period</a></th>
-</tr>');
+ <th></th>');
+ foreach my $which (@show_order) {
+ if ($which ne 'proctor' && exists($show{$which})) {
+ $r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>');
+ }
+ }
+ $r->print('<th>Scheduled Students</th></tr>');
+
my %name_cache;
my $slotsort = sub {
- if ($env{'form.order'}=~/^(type|description|endtime|maxspace)$/) {
+ if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb)$/) {
if (lc($slots{$a}->{$env{'form.order'}})
ne lc($slots{$b}->{$env{'form.order'}})) {
return (lc($slots{$a}->{$env{'form.order'}})
@@ -493,7 +584,7 @@ sub show_table {
if (lc($a) cmp lc($b)) {
return lc($a) cmp lc($b);
}
- } elsif ($env{'form.order'} eq 'unique') {
+ } elsif ($env{'form.order'} eq 'uniqueperiod') {
if ($slots{$a}->{'uniqueperiod'}[0]
ne $slots{$b}->{'uniqueperiod'}[0]) {
@@ -509,6 +600,7 @@ sub show_table {
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'};
};
foreach my $slot (sort $slotsort (keys(%slots))) {
+ if (!&to_show($when,$slots{$slot})) { next; }
if (defined($slots{$slot}->{'type'})
&& $slots{$slot}->{'type'} ne 'schedulable_student') {
#next;
@@ -525,7 +617,7 @@ sub show_table {
&Apache::lonlocal::locallocaltime($slots{$slot}->{'starttime'}):'');
my $end=($slots{$slot}->{'endtime'}?
&Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):'');
- my $start_reserve=($slots{$slot}->{'endtime'}?
+ my $start_reserve=($slots{$slot}->{'startreserve'}?
&Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):'');
my $unique;
@@ -533,18 +625,31 @@ sub show_table {
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','.
localtime($slots{$slot}{'uniqueperiod'}[1]);
}
- my @proctors = map {
- my ($uname,$udom)=split(/@/,$_);
- my $fullname=$name_cache{$_};
- if (!defined($fullname)) {
- &Apache::lonnet::logthis("Gettign $uname $udom");
- $fullname = &Apache::loncommon::plainname($uname,$udom);
- $fullname =~s/\s/ /g;
- $name_cache{$_} = $fullname;
- }
- &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
- } (split(/\s*,\s*/,$slots{$slot}->{'proctor'}));
-
+ my $title;
+ if (exists($slots{$slot}{'symb'})) {
+ my (undef,undef,$res)=
+ &Apache::lonnet::decode_symb($slots{$slot}{'symb'});
+ $res = &Apache::lonnet::clutter($res);
+ $title = &Apache::lonnet::gettitle($slots{$slot}{'symb'});
+ $title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>';
+ }
+ my @proctors;
+ my $rowspan=1;
+ my $colspan=1;
+ if (exists($show{'proctor'})) {
+ $rowspan=2;
+ @proctors= map {
+ my ($uname,$udom)=split(/@/,$_);
+ my $fullname=$name_cache{$_};
+ if (!defined($fullname)) {
+ &Apache::lonnet::logthis("Gettign $uname $udom");
+ $fullname = &Apache::loncommon::plainname($uname,$udom);
+ $fullname =~s/\s/ /g;
+ $name_cache{$_} = $fullname;
+ }
+ &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
+ } (sort(split(/\s*,\s*/,$slots{$slot}->{'proctor'})));
+ }
my $proctors=join(', ',@proctors);
my $edit=(<<EDITFORM);
@@ -553,24 +658,49 @@ sub show_table {
<input type="submit" name="Edit" value="Edit" />
</form>
EDITFORM
- $r->print(<<STUFF);
-<tr>
- <td rowspan="2">$edit</td>
- <td>$slot</td>
- <td>$slots{$slot}->{'type'}</td>
- <td>$description</td>
- <td>$start</td>
- <td>$end</td>
- <td>$start_reserve</td>
- <td>$slots{$slot}->{'secret'}</td>
- <td>$slots{$slot}->{'maxspace'}</td>
- <td>$ids</td>
- <td>$unique</td>
-</tr>
+
+ $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit</td>\n");
+ if (exists($show{'name'})) {
+ $colspan++;$r->print("<td>$slot</td>");
+ }
+ if (exists($show{'type'})) {
+ $colspan++;$r->print("<td>$slots{$slot}->{'type'}</td>\n");
+ }
+ if (exists($show{'description'})) {
+ $colspan++;$r->print("<td>$description</td>\n");
+ }
+ if (exists($show{'starttime'})) {
+ $colspan++;$r->print("<td>$start</td>\n");
+ }
+ if (exists($show{'endtime'})) {
+ $colspan++;$r->print("<td>$end</td>\n");
+ }
+ if (exists($show{'startreserve'})) {
+ $colspan++;$r->print("<td>$start_reserve</td>\n");
+ }
+ if (exists($show{'secret'})) {
+ $colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n");
+ }
+ if (exists($show{'maxspace'})) {
+ $colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\n");
+ }
+ if (exists($show{'ip'})) {
+ $colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n");
+ }
+ if (exists($show{'symb'})) {
+ $colspan++;$r->print("<td>$title</td>\n");
+ }
+ if (exists($show{'uniqueperiod'})) {
+ $colspan++;$r->print("<td>$unique</td>\n");
+ }
+ $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+ if (exists($show{'proctor'})) {
+ $r->print(<<STUFF);
<tr>
- <td colspan="10">$proctors</td>
+ <td colspan="$colspan">$proctors</td>
</tr>
STUFF
+ }
}
$r->print('</table>');
}
@@ -804,10 +934,23 @@ sub csv_upload_assign {
sub handler {
my $r=shift;
+ &Apache::loncommon::content_type($r,'text/html');
+ &Apache::loncommon::no_cache($r);
+ if ($r->header_only()) {
+ $r->send_http_header();
+ return OK;
+ }
+
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
- &start_page($r);
+
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'});
my $mgr=&Apache::lonnet::allowed('mgr',$env{'request.course.id'});
+ my $title='Requesting Another Worktime';
+ if ($env{'form.command'} =~ /^(showslots|uploadstart|csvuploadmap|csvuploadassign)$/ && $vgr eq 'F') {
+ $title = 'Managing Slots';
+ }
+ &start_page($r,$title);
+
if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') {
&show_table($r,$mgr);
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
@@ -825,8 +968,6 @@ sub handler {
}
&csv_upload_map($r);
}
- } elsif ($env{'form.command'} eq 'editslot' && $mgr eq 'F') {
- &show_slot_edit($r);
} else {
my $symb=&Apache::lonnet::unescape($env{'form.symb'});
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);