--- loncom/interface/slotrequest.pm 2005/10/27 15:11:03 1.27 +++ loncom/interface/slotrequest.pm 2005/11/08 03:13:20 1.29 @@ -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.27 2005/10/27 15:11:03 albertel Exp $ +# $Id: slotrequest.pm,v 1.29 2005/11/08 03:13:20 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -53,11 +53,10 @@ sub fail { } sub start_page { - my ($r)=@_; + my ($r,$title)=@_; my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.''. - &mt('Request another Worktime').''); - $r->print(&Apache::loncommon::bodytag('Requesting another Worktime')); + $r->print($html.''.&mt($title).''); + $r->print(&Apache::loncommon::bodytag($title)); } sub end_page { @@ -465,25 +464,56 @@ sub show_table { '); + $r->print('
+ +
'); } + + my %Saveable_Parameters = ('show' => 'array'); + + &Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); + &Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters); + + my %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 @order=('name','description','type','starttime','endtime', + 'startreserve','secret','maxspace','ip','symb', + 'uniqueperiod','proctor'); + my @sel = + (exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') + : keys(%fields); + my %sel = map { $_ => 1 } (@sel); + + $r->print('
+ +'); + $r->print('
Show: '.&Apache::loncommon::multiple_select_form('show',\@sel,6,\%fields,\@order). + '
'); my $linkstart=' - - '.$linkstart.'name" >Slot name - '.$linkstart.'type" >Type - '.$linkstart.'description" >Description - '.$linkstart.'starttime" >Start Time - '.$linkstart.'endtime" >End Time - '.$linkstart.'startreserve">Time Students Can Start Reserving - '.$linkstart.'secret" >Secret - '.$linkstart.'maxspace" >Max space - Scheduled Students - '.$linkstart.'unique" >Unique Period -'); + '); + foreach my $which (@order) { + if ($which ne 'proctor' && exists($sel{$which})) { + $r->print(''.$linkstart.$which.'">'.$fields{$which}.''); + } + } + $r->print('Scheduled Students'); + 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 +523,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]) { @@ -525,7 +555,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 +563,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=''.$title.''; + } + my @proctors; + my $rowspan=1; + my $colspan=1; + if (exists($sel{'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 - $r->print(< - $edit - $slot - $slots{$slot}->{'type'} - $description - $start - $end - $start_reserve - $slots{$slot}->{'secret'} - $slots{$slot}->{'maxspace'} - $ids - $unique - + + $r->print("\n$edit\n"); + if (exists($sel{'name'})) { + $colspan++;$r->print("$slot"); + } + if (exists($sel{'type'})) { + $colspan++;$r->print("$slots{$slot}->{'type'}\n"); + } + if (exists($sel{'description'})) { + $colspan++;$r->print("$description\n"); + } + if (exists($sel{'starttime'})) { + $colspan++;$r->print("$start\n"); + } + if (exists($sel{'endtime'})) { + $colspan++;$r->print("$end\n"); + } + if (exists($sel{'startreserve'})) { + $colspan++;$r->print("$start_reserve\n"); + } + if (exists($sel{'secret'})) { + $colspan++;$r->print("$slots{$slot}{'secret'}\n"); + } + if (exists($sel{'maxspace'})) { + $colspan++;$r->print("$slots{$slot}{'maxspace'}\n"); + } + if (exists($sel{'ip'})) { + $colspan++;$r->print("$slots{$slot}{'ip'}\n"); + } + if (exists($sel{'symb'})) { + $colspan++;$r->print("$title\n"); + } + if (exists($sel{'uniqueperiod'})) { + $colspan++;$r->print("$unique\n"); + } + $colspan++;$r->print("$ids\n\n"); + if (exists($sel{'proctor'})) { + $r->print(< - $proctors + $proctors STUFF + } } $r->print(''); } @@ -805,9 +873,15 @@ sub handler { my $r=shift; &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 +899,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);