--- loncom/interface/slotrequest.pm 2005/09/12 20:27:25 1.14
+++ loncom/interface/slotrequest.pm 2005/11/21 17:50:45 1.32
@@ -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.14 2005/09/12 20:27:25 albertel Exp $
+# $Id: slotrequest.pm,v 1.32 2005/11/21 17:50:45 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,12 +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('<p>'.$env{'form.command'}.'</p>');
+ $r->print($html.'<head><title>'.&mt($title).'</title></head>');
+ $r->print(&Apache::loncommon::bodytag($title));
}
sub end_page {
@@ -452,34 +450,157 @@ 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,$symb,$mgr)=@_;
+ my ($r,$mgr)=@_;
my ($cnum,$cdom)=&get_course();
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
+ if ( (keys(%slots))[0] =~ /^error: 2 /) {
+ undef(%slots);
+ }
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="hidden" name="symb" value="'.$env{'form.symb'}.'" />
<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>');
}
- $r->print('<table border="1">
+
+ 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 class="thinborder">
<tr>
- <th>Slot name</th>
- <th>Type</th>
- <th>Description</th>
- <th>Start Time</th>
- <th>End Time</th>
- <th>Max space</th>
- <th>Scheduled Students</th>
- <th>Proctors</th>
- <th>Unique Period</th>
-</tr>');
- foreach my $slot (sort
- { return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} }
- (keys(%slots))) {
+ <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|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'}})
+ cmp lc($slots{$b}->{$env{'form.order'}}));
+ }
+ } elsif ($env{'form.order'} eq 'name') {
+ if (lc($a) cmp lc($b)) {
+ return lc($a) cmp lc($b);
+ }
+ } elsif ($env{'form.order'} eq 'uniqueperiod') {
+
+ if ($slots{$a}->{'uniqueperiod'}[0]
+ ne $slots{$b}->{'uniqueperiod'}[0]) {
+ return ($slots{$a}->{'uniqueperiod'}[0]
+ cmp $slots{$b}->{'uniqueperiod'}[0]);
+ }
+ if ($slots{$a}->{'uniqueperiod'}[1]
+ ne $slots{$b}->{'uniqueperiod'}[1]) {
+ return ($slots{$a}->{'uniqueperiod'}[1]
+ cmp $slots{$b}->{'uniqueperiod'}[1]);
+ }
+ }
+ 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;
@@ -492,33 +613,97 @@ sub show_table {
my (undef,$id)=split("\0",$entry);
$ids.= $id.'-> '.$consumed{$entry}->{'name'}.'<br />';
}
- my $start=localtime($slots{$slot}->{'starttime'});
- my $end=localtime($slots{$slot}->{'endtime'});
+ my $start=($slots{$slot}->{'starttime'}?
+ &Apache::lonlocal::locallocaltime($slots{$slot}->{'starttime'}):'');
+ my $end=($slots{$slot}->{'endtime'}?
+ &Apache::lonlocal::locallocaltime($slots{$slot}->{'endtime'}):'');
+ my $start_reserve=($slots{$slot}->{'startreserve'}?
+ &Apache::lonlocal::locallocaltime($slots{$slot}->{'startreserve'}):'');
+
my $unique;
if (ref($slots{$slot}{'uniqueperiod'})) {
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','.
localtime($slots{$slot}{'uniqueperiod'}[1]);
}
+ 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);
- $r->print(<<STUFF);
+ my $edit=(<<EDITLINK);
+<a href="/adm/helper/newslot.helper?name=$slot">Edit</a>
+EDITLINK
+
+ $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>$slot</td>
- <td>$slots{$slot}->{'type'}</td>
- <td>$description</td>
- <td>$start</td>
- <td>$end</td>
- <td>$slots{$slot}->{'maxspace'}</td>
- <td>$ids</td>
- <td>$slots{$slot}->{'proctor'}</td>
- <td>$unique</td>
+ <td colspan="$colspan">$proctors</td>
</tr>
STUFF
+ }
}
$r->print('</table>');
}
sub upload_start {
- my ($r,$symb)=@_;
+ my ($r)=@_;
$r->print(&Apache::grades::checkforfile_js());
my $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
$result.=' <b>'.
@@ -529,7 +714,6 @@ sub upload_start {
my $ignore=&mt('Ignore First Line');
$result.=<<ENDUPFORM;
<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload">
-<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="csvuploadmap" />
$upfile_select
<br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Data" />
@@ -542,7 +726,7 @@ ENDUPFORM
}
sub csvuploadmap_header {
- my ($r,$symb,$datatoken,$distotal)= @_;
+ my ($r,$datatoken,$distotal)= @_;
my $javascript;
if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&csvupload_javascript_reverse_associate();
@@ -566,7 +750,6 @@ to this page if the data selected is ins
<input type="hidden" name="upfiletype" value="$env{'form.upfiletype'}" />
<input type="hidden" name="upfile_associate"
value="$env{'form.upfile_associate'}" />
-<input type="hidden" name="symb" value="$symb" />
<input type="hidden" name="command" value="csvuploadassign" />
<hr />
<script type="text/javascript" language="Javascript">
@@ -641,7 +824,7 @@ ENDPICK
}
sub csv_upload_map {
- my ($r,$symb)= @_;
+ my ($r)= @_;
my $datatoken;
if (!$env{'form.datatoken'}) {
@@ -652,7 +835,7 @@ sub csv_upload_map {
}
my @records=&Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@records); }
- &csvuploadmap_header($r,$symb,$datatoken,$#records+1);
+ &csvuploadmap_header($r,$datatoken,$#records+1);
my ($i,$keyfields);
if (@records) {
my @fields=&csvupload_fields();
@@ -681,6 +864,7 @@ sub csvupload_fields {
['type','Type of slot'],
['starttime','Start Time of slot'],
['endtime','End Time of slot'],
+ ['startreserve','Reservation Start Time'],
['ip','IP or DNS restriction'],
['proctor','List of proctor ids'],
['description','Slot Description'],
@@ -691,7 +875,7 @@ sub csvupload_fields {
}
sub csv_upload_assign {
- my ($r,$symb)= @_;
+ my ($r,$mgr)= @_;
&Apache::loncommon::load_tmp_file($r);
my @slotdata = &Apache::loncommon::upfile_record_sep();
if ($env{'form.noFirstLine'}) { shift(@slotdata); }
@@ -700,21 +884,43 @@ sub csv_upload_assign {
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my $countdone=0;
+ my @errors;
foreach my $slot (@slotdata) {
my %slot;
my %entries=&Apache::loncommon::record_sep($slot);
my $domain;
my $name=$entries{$fields{'name'}};
+ if ($name=~/^\s*$/) {
+ push(@errors,"Did not create slot with no name");
+ next;
+ }
+ if ($name=~/\s/) {
+ push(@errors,"$name not created -- Name must not contain spaces");
+ next;
+ }
+ if ($name=~/\W/) {
+ push(@errors,"$name not created -- Name must contain only letters, numbers and _");
+ next;
+ }
if ($entries{$fields{'type'}}) {
$slot{'type'}=$entries{$fields{'type'}};
} else {
$slot{'type'}='preassigned';
}
+ if ($slot{'type'} ne 'preassigned' &&
+ $slot{'type'} ne 'schedulable_student') {
+ push(@errors,"$name not created -- invalid type ($slot{'type'}) must be either preassigned or schedulable_student");
+ next;
+ }
if ($entries{$fields{'starttime'}}) {
$slot{'starttime'}=&UnixDate($entries{$fields{'starttime'}},"%s");
}
if ($entries{$fields{'endtime'}}) {
- $slot{'endtime'}=&UnixDate($entries{$fields{'starttime'}},"%s");
+ $slot{'endtime'}=&UnixDate($entries{$fields{'endtime'}},"%s");
+ }
+ if ($entries{$fields{'startreserve'}}) {
+ $slot{'startreserve'}=
+ &UnixDate($entries{$fields{'startreserve'}},"%s");
}
foreach my $key ('ip','proctor','description','maxspace',
'secret','symb') {
@@ -734,44 +940,59 @@ sub csv_upload_assign {
$r->rflush();
$countdone++;
}
- $r->print("<br />Created $countdone slots\n");
- $r->print("<br />\n");
- &show_table($r,$symb);
+ $r->print("<p>Created $countdone slots\n</p>");
+ foreach my $error (@errors) {
+ $r->print("<p>$error\n</p>");
+ }
+ &show_table($r,$mgr);
return '';
}
sub handler {
my $r=shift;
- &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
- &start_page($r);
- my $symb=&Apache::lonnet::unescape($env{'form.symb'});
- my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
- if ($res !~ /\.task$/) {
- &fail($r,'not_valid');
+ &Apache::loncommon::content_type($r,'text/html');
+ &Apache::loncommon::no_cache($r);
+ if ($r->header_only()) {
+ $r->send_http_header();
return OK;
}
- $env{'request.symb'}=$symb;
+
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
+
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,$symb,$mgr);
+ &show_table($r,$mgr);
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') {
- &upload_start($r,$symb);
+ &upload_start($r);
} elsif ($env{'form.command'} eq 'csvuploadmap' && $mgr eq 'F') {
- &csv_upload_map($r,$symb);
+ &csv_upload_map($r);
} elsif ($env{'form.command'} eq 'csvuploadassign' && $mgr eq 'F') {
if ($env{'form.associate'} ne 'Reverse Association') {
- &csv_upload_assign($r,$symb);
+ &csv_upload_assign($r,$mgr);
} else {
if ( $env{'form.upfile_associate'} ne 'reverse' ) {
$env{'form.upfile_associate'} = 'reverse';
} else {
$env{'form.upfile_associate'} = 'forward';
}
- &csv_upload_map($r,$symb);
+ &csv_upload_map($r);
}
} else {
+ my $symb=&Apache::lonnet::unescape($env{'form.symb'});
+ my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb);
+ if ($res !~ /\.task$/) {
+ &fail($r,'not_valid');
+ return OK;
+ }
+ $env{'request.symb'}=$symb;
my ($status) = &Apache::lonhomework::check_task_access('0');
if ($status eq 'CAN_ANSWER' ||
$status eq 'NEEDS_CHECKIN' ||