version 1.40, 2006/02/03 18:22:44
|
version 1.53, 2006/03/21 16:03:19
|
Line 34 use Apache::Constants qw(:common :http :
|
Line 34 use Apache::Constants qw(:common :http :
|
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonnavmaps(); |
use Date::Manip; |
use Date::Manip; |
|
|
sub fail { |
sub fail { |
Line 47 sub fail {
|
Line 48 sub fail {
|
$r->print('<p>'.&mt('Failed.').'</p>'); |
$r->print('<p>'.&mt('Failed.').'</p>'); |
} |
} |
|
|
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
&return_link($r); |
&mt('Return to last resource').'</a></p>'); |
|
&end_page($r); |
&end_page($r); |
} |
} |
|
|
sub start_page { |
sub start_page { |
my ($r,$title)=@_; |
my ($r,$title)=@_; |
my $html=&Apache::lonxml::xmlbegin(); |
$r->print(&Apache::loncommon::start_page($title)); |
$r->print($html.'<head><title>'.&mt($title).'</title></head>'); |
|
$r->print(&Apache::loncommon::bodytag($title)); |
|
} |
} |
|
|
sub end_page { |
sub end_page { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(&Apache::loncommon::endbodytag().'</html>'); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
|
|
=pod |
=pod |
Line 113 sub space_available {
|
Line 111 sub space_available {
|
} |
} |
|
|
sub check_for_reservation { |
sub check_for_reservation { |
my ($symb)=@_; |
my ($symb,$mode)=@_; |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
$env{'user.domain'}, $env{'user.name'}); |
$env{'user.domain'}, $env{'user.name'}); |
|
|
Line 126 sub check_for_reservation {
|
Line 124 sub check_for_reservation {
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
|
|
foreach my $slot_name (@slots) { |
if (&network_error($student) || &network_error($course) || |
|
&network_error(%slots)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
my @got; |
|
foreach my $slot_name (sort { |
|
if (ref($slots{$a}) && ref($slots{$b})) { |
|
return $slots{$a}{'starttime'} <=> $slots{$b}{'starttime'} |
|
} |
|
if (ref($slots{$a})) { return -1;} |
|
if (ref($slots{$b})) { return 1;} |
|
return 0; |
|
} @slots) { |
next if (!defined($slots{$slot_name}) || |
next if (!defined($slots{$slot_name}) || |
!ref($slots{$slot_name})); |
!ref($slots{$slot_name})); |
&Apache::lonxml::debug(time." $slot_name ". |
&Apache::lonxml::debug(time." $slot_name ". |
Line 135 sub check_for_reservation {
|
Line 145 sub check_for_reservation {
|
if ($slots{$slot_name}->{'endtime'} > time && |
if ($slots{$slot_name}->{'endtime'} > time && |
$slots{$slot_name}->{'startreserve'} < time) { |
$slots{$slot_name}->{'startreserve'} < time) { |
# between start of reservation times and end of slot |
# between start of reservation times and end of slot |
return($slot_name, $slots{$slot_name}); |
if ($mode eq 'allslots') { |
|
push(@got,$slot_name); |
|
} else { |
|
return($slot_name, $slots{$slot_name}); |
|
} |
} |
} |
} |
} |
|
if ($mode eq 'allslots' && @got) { |
|
return @got; |
|
} |
return (undef,undef); |
return (undef,undef); |
} |
} |
|
|
|
sub get_consumed_uniqueperiods { |
|
my ($slots) = @_; |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
|
my @problems = $navmap->retrieveResources(undef, |
|
sub { $_[0]->is_problem() },1,0); |
|
my %used_slots; |
|
foreach my $problem (@problems) { |
|
my $symb = $problem->symb(); |
|
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", |
|
$symb, $env{'user.domain'}, |
|
$env{'user.name'}); |
|
my $course = &Apache::lonnet::EXT("resource.0.available", |
|
$symb, $env{'user.domain'}, |
|
$env{'user.name'}); |
|
if (&network_error($student) || &network_error($course)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
foreach my $slot (split(/:/,$student), split(/:/, $course)) { |
|
$used_slots{$slot}=1; |
|
} |
|
} |
|
|
|
if (!ref($slots)) { |
|
my ($cnum,$cdom)=&get_course(); |
|
my %slots=&Apache::lonnet::get('slots', [keys(%used_slots)], $cdom, $cnum); |
|
if (&network_error(%slots)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
$slots = \%slots; |
|
} |
|
|
|
my %consumed_uniqueperiods; |
|
foreach my $slot_name (keys(%used_slots)) { |
|
next if (!defined($slots->{$slot_name}) || |
|
!ref($slots->{$slot_name})); |
|
|
|
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
|
!ref($slots->{$slot_name}{'uniqueperiod'})); |
|
$consumed_uniqueperiods{$slot_name} = |
|
$slots->{$slot_name}{'uniqueperiod'}; |
|
} |
|
return \%consumed_uniqueperiods; |
|
} |
|
|
sub check_for_conflict { |
sub check_for_conflict { |
my ($symb,$new_slot_name)=@_; |
my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_; |
my $student = &Apache::lonnet::EXT("resource.0.availablestudent", $symb, |
|
$env{'user.domain'}, $env{'user.name'}); |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
my $course = &Apache::lonnet::EXT("resource.0.available", $symb, |
|
$env{'user.domain'}, $env{'user.name'}); |
|
my @slots = (split(/:/,$student), split(/:/, $course)); |
|
my ($cnum,$cdom)=&get_course(); |
|
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
|
my ($tmp) = %slots; |
|
if (&network_error($student) || &network_error($course) || |
|
&network_error($tmp)) { |
|
return 'error: Unable to determine current status'; |
|
} |
|
foreach my $slot_name (@slots) { |
|
next if (!defined($slots{$slot_name}) || |
|
!ref($slots{$slot_name})); |
|
|
|
next if (!defined($slots{$slot_name}->{'uniqueperiod'}) || |
if (!ref($consumed_uniqueperiods)) { |
!ref($slots{$slot_name}->{'uniqueperiod'})); |
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
my ($start,$end)=@{$slots{$slot_name}->{'uniqueperiod'}}; |
if (&network_error(%$consumed_uniqueperiods)) { |
if ($start<time && time < $end) { |
return 'error: Unable to determine current status'; |
|
} |
|
} |
|
|
|
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
|
foreach my $slot_name (keys(%$consumed_uniqueperiods)) { |
|
my ($start,$end)=@{$consumed_uniqueperiods->{$slot_name}}; |
|
if (! |
|
($start < $new_uniq_start && $end < $new_uniq_start) || |
|
($start > $new_uniq_end && $end > $new_uniq_end )) { |
return $slot_name; |
return $slot_name; |
} |
} |
} |
} |
Line 302 sub release_slot {
|
Line 359 sub release_slot {
|
my $description=&get_description($env{'form.slotname'},\%slot); |
my $description=&get_description($env{'form.slotname'},\%slot); |
|
|
if ($mgr ne 'F') { |
if ($mgr ne 'F') { |
if ($slot{$slot_name}{'starttime'} < time) { |
if ($slot{'starttime'} < time) { |
$r->print("<p>Not allowed to release Reservation: $description, as it has already ended.</p>"); |
$r->print("<p>Not allowed to release Reservation: $description, as it has already ended. </p>"); |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
&return_link($r); |
&mt('Return to last resource').'</a></p>'); |
|
return 0; |
return 0; |
} |
} |
} |
} |
Line 335 sub release_slot {
|
Line 391 sub release_slot {
|
'0_availablestudent', |
'0_availablestudent', |
1, $new_param, 'string', |
1, $new_param, 'string', |
$uname,$udom); |
$uname,$udom); |
my $description=&get_description($env{'form.slotname'},\%slot); |
|
$r->print("<p>Released Reservation: $description</p>"); |
$r->print("<p>Released Reservation: $description</p>"); |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
&mt('Return to slot list').'</a></p>'); |
&mt('Return to slot list').'</a></p>'); |
} |
} |
if (!$inhibit_return_link) { |
if (!$inhibit_return_link) { &return_link($r); } |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
&mt('Return to last resource').'</a></p>'); |
|
} |
|
return 1; |
return 1; |
} |
} |
|
|
Line 378 sub delete_slot {
|
Line 430 sub delete_slot {
|
} |
} |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
&mt('Return to slot list').'</a></p>'); |
&mt('Return to slot list').'</a></p>'); |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
&return_link($r); |
&mt('Return to last resource').'</a></p>'); |
|
} |
} |
|
|
sub return_link { |
sub return_link { |
Line 391 sub return_link {
|
Line 442 sub return_link {
|
sub get_slot { |
sub get_slot { |
my ($r,$symb)=@_; |
my ($r,$symb)=@_; |
|
|
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'}); |
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
|
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
|
|
if ($slot_name =~ /^error: (.*)/) { |
if ($slot_name =~ /^error: (.*)/) { |
$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>"); |
$r->print("<p>An error occured while attempting to make a reservation. ($1)</p>"); |
Line 428 STUFF
|
Line 480 STUFF
|
} |
} |
return; |
return; |
} |
} |
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
|
my $reserved=&make_reservation($env{'form.slotname'}, |
my $reserved=&make_reservation($env{'form.slotname'}, |
\%slot,$symb); |
\%slot,$symb); |
my $description=&get_description($env{'form.slotname'},\%slot); |
my $description=&get_description($env{'form.slotname'},\%slot); |
Line 468 or
|
Line 520 or
|
</p> |
</p> |
or |
or |
STUFF |
STUFF |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
&mt('Return to last resource').'</a></p>'); |
&return_link($r); |
return; |
return; |
} |
} |
|
|
sub allowed_slot { |
sub allowed_slot { |
my ($slot_name,$slot,$symb)=@_; |
my ($slot_name,$slot,$symb,$slots,$consumed_uniqueperiods)=@_; |
|
|
#already started |
#already started |
if ($slot->{'starttime'} < time) { |
if ($slot->{'starttime'} < time) { |
# all open slot to be schedulable |
# all open slot to be schedulable |
#return 0; |
#return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name starttime good"); |
&Apache::lonxml::debug("$slot_name starttime good"); |
|
|
#already ended |
#already ended |
if ($slot->{'endtime'} < time) { |
if ($slot->{'endtime'} < time) { |
return 0; |
return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name endtime good"); |
&Apache::lonxml::debug("$slot_name endtime good"); |
|
|
# not allowed to pick this one |
# not allowed to pick this one |
if (defined($slot->{'type'}) |
if (defined($slot->{'type'}) |
&& $slot->{'type'} ne 'schedulable_student') { |
&& $slot->{'type'} ne 'schedulable_student') { |
return 0; |
return 0; |
} |
} |
&Apache::lonxml::debug("$slot_name type good"); |
&Apache::lonxml::debug("$slot_name type good"); |
|
|
|
# reserve time not yet started |
|
if ($slot->{'startreserve'} > time) { |
|
return 0; |
|
} |
|
&Apache::lonxml::debug("$slot_name reserve good"); |
|
|
|
my $userallowed=0; |
|
# its for a different set of users |
|
if (defined($slot->{'allowedsections'})) { |
|
if (!defined($env{'request.role.sec'}) |
|
&& grep(/^No section assigned$/, |
|
split(',',$slot->{'allowedsections'}))) { |
|
$userallowed=1; |
|
} |
|
if (defined($env{'request.role.sec'}) |
|
&& grep(/^\Q$env{'request.role.sec'}\E$/, |
|
split(',',$slot->{'allowedsections'}))) { |
|
$userallowed=1; |
|
} |
|
} |
|
&Apache::lonxml::debug("$slot_name sections is $userallowed"); |
|
|
|
# its for a different set of users |
|
if (defined($slot->{'allowedusers'}) |
|
&& grep(/^\Q$env{'user.name'}:$env{'user.domain'}\E$/, |
|
split(',',$slot->{'allowedusers'}))) { |
|
$userallowed=1; |
|
} |
|
|
|
if (!defined($slot->{'allowedusers'}) |
|
&& !defined($slot->{'allowedsections'})) { |
|
$userallowed=1; |
|
} |
|
|
|
&Apache::lonxml::debug("$slot_name user is $userallowed"); |
|
return 0 if (!$userallowed); |
|
|
# not allowed for this resource |
# not allowed for this resource |
if (defined($slot->{'symb'}) |
if (defined($slot->{'symb'}) |
&& $slot->{'symb'} ne $symb) { |
&& $slot->{'symb'} ne $symb) { |
return 0; |
return 0; |
} |
} |
|
|
|
my $conflict = &check_for_conflict($symb,$slot_name,$slot,$slots, |
|
$consumed_uniqueperiods); |
|
if ($conflict) { |
|
if ($slots->{$conflict}{'starttime'} < time) { |
|
return 0; |
|
} |
|
} |
&Apache::lonxml::debug("$slot_name symb good"); |
&Apache::lonxml::debug("$slot_name symb good"); |
return 1; |
return 1; |
} |
} |
Line 517 sub show_choices {
|
Line 618 sub show_choices {
|
|
|
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
|
my $consumed_uniqueperiods = &get_consumed_uniqueperiods(\%slots); |
my $available; |
my $available; |
$r->print('<table border="1">'); |
$r->print('<table border="1">'); |
&Apache::lonxml::debug("Checking Slots"); |
&Apache::lonxml::debug("Checking Slots"); |
my ($got_slot)=&check_for_reservation($symb); |
my @got_slots=&check_for_reservation($symb,'allslots'); |
foreach my $slot (sort |
foreach my $slot (sort |
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} } |
{ return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'} } |
(keys(%slots))) { |
(keys(%slots))) { |
|
|
&Apache::lonxml::debug("Checking Slot $slot"); |
&Apache::lonxml::debug("Checking Slot $slot"); |
next if (!&allowed_slot($slot,$slots{$slot})); |
next if (!&allowed_slot($slot,$slots{$slot},undef,\%slots, |
|
$consumed_uniqueperiods)); |
|
|
$available++; |
$available++; |
|
|
my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
|
|
my $form=&mt('Unavailable'); |
my $form=&mt('Unavailable'); |
if (($slot eq $got_slot) || |
if ((grep(/^\Q$slot\E$/,@got_slots)) || |
&space_available($slot,$slots{$slot},$symb)) { |
&space_available($slot,$slots{$slot},$symb)) { |
my $text=&mt('Select'); |
my $text=&mt('Select'); |
my $command='get'; |
my $command='get'; |
if ($slot eq $got_slot) { |
if (grep(/^\Q$slot\E$/,@got_slots)) { |
$text=&mt('Free Reservation'); |
$text=&mt('Free Reservation'); |
$command='release'; |
$command='release'; |
|
} else { |
|
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
|
\%slots, |
|
$consumed_uniqueperiods); |
|
if ($conflict) { |
|
$text=&mt('Change Reservation'); |
|
$command='get'; |
|
} |
} |
} |
my $escsymb=&Apache::lonnet::escape($symb); |
my $escsymb=&Apache::lonnet::escape($symb); |
$form=<<STUFF; |
$form=<<STUFF; |
Line 658 sub show_table {
|
Line 769 sub show_table {
|
'order' => 'scalar', |
'order' => 'scalar', |
'deleted' => 'scalar', |
'deleted' => 'scalar', |
); |
); |
&Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters); |
&Apache::loncommon::store_course_settings('slotrequest', |
&Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters); |
\%Saveable_Parameters); |
|
&Apache::loncommon::restore_course_settings('slotrequest', |
|
\%Saveable_Parameters); |
|
&Apache::grades::init_perm(); |
|
my ($classlist,$section,$fullname)=&Apache::grades::getclasslist('all'); |
|
&Apache::grades::reset_perm(); |
|
|
my %show_fields=&Apache::lonlocal::texthash( |
my %show_fields=&Apache::lonlocal::texthash( |
'name' => 'Slot Name', |
'name' => 'Slot Name', |
'description' => 'Description', |
'description' => 'Description', |
'type' => 'Type', |
'type' => 'Type', |
'starttime' => 'Start time', |
'starttime' => 'Start time', |
'endtime' => 'End Time', |
'endtime' => 'End Time', |
'startreserve' => 'Time students can start reserving', |
'startreserve' => 'Time students can start reserving', |
'secret' => 'Secret Word', |
'secret' => 'Secret Word', |
'maxspace' => 'Maximum # of students', |
'maxspace' => 'Maximum # of students', |
'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
'symb' => 'Resource slot is restricted to.', |
'symb' => 'Resource slot is restricted to.', |
'uniqueperiod' => 'Period of time slot is unique', |
'allowedsections' => 'Sections slot is restricted to.', |
'proctor' => 'List of proctors'); |
'allowedusers' => 'Users slot is restricted to.', |
|
'uniqueperiod' => 'Period of time slot is unique', |
|
'scheduled' => 'Scheduled Students', |
|
'proctor' => 'List of proctors'); |
my @show_order=('name','description','type','starttime','endtime', |
my @show_order=('name','description','type','starttime','endtime', |
'startreserve','secret','maxspace','ip','symb', |
'startreserve','secret','maxspace','ip','symb', |
'uniqueperiod','proctor'); |
'allowedsections','allowedusers','uniqueperiod', |
|
'scheduled','proctor'); |
my @show = |
my @show = |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
(exists($env{'form.show'})) ? &Apache::loncommon::get_env_multiple('form.show') |
: keys(%show_fields); |
: keys(%show_fields); |
Line 695 sub show_table {
|
Line 815 sub show_table {
|
my $when = (exists($env{'form.when'})) ? $env{'form.when'} |
my $when = (exists($env{'form.when'})) ? $env{'form.when'} |
: 'now'; |
: 'now'; |
|
|
|
my %stu_display_fields= |
|
&Apache::lonlocal::texthash('username' => 'User name', |
|
'fullname' => 'Full name', |
|
); |
|
my @stu_display_order=('fullname','username'); |
|
my @stu_display = |
|
(exists($env{'form.studisplay'})) ? &Apache::loncommon::get_env_multiple('form.studisplay') |
|
: keys(%stu_display_fields); |
|
my %stu_display = map { $_ => 1 } (@stu_display); |
|
|
my $hide_radio = |
my $hide_radio = |
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); |
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); |
my $show_radio = |
my $show_radio = |
Line 705 sub show_table {
|
Line 835 sub show_table {
|
$r->print('<div>'); |
$r->print('<div>'); |
$r->print('<table class="inline"> |
$r->print('<table class="inline"> |
<tr><th>'.&mt('Show').'</th> |
<tr><th>'.&mt('Show').'</th> |
|
<th>'.&mt('Student Display').'</th> |
<th>'.&mt('Open').'</th> |
<th>'.&mt('Open').'</th> |
<th>'.&mt('Options').'</th> |
<th>'.&mt('Options').'</th> |
</tr> |
</tr> |
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
<tr><td>'.&Apache::loncommon::multiple_select_form('show',\@show,6,\%show_fields,\@show_order). |
'</td> |
'</td> |
|
<td> |
|
'.&Apache::loncommon::multiple_select_form('studisplay',\@stu_display, |
|
6,\%stu_display_fields, |
|
\@stu_display_order).' |
|
</td> |
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields). |
<td>'.&Apache::loncommon::select_form($when,'when',%when_fields). |
'</td> |
'</td> |
<td> |
<td> |
Line 736 sub show_table {
|
Line 872 sub show_table {
|
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
} |
} |
} |
} |
$r->print('<th>Scheduled Students</th></tr>'); |
|
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
my $slotsort = sub { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb)$/) { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) { |
if (lc($slots{$a}->{$env{'form.order'}}) |
if (lc($slots{$a}->{$env{'form.order'}}) |
ne lc($slots{$b}->{$env{'form.order'}})) { |
ne lc($slots{$b}->{$env{'form.order'}})) { |
return (lc($slots{$a}->{$env{'form.order'}}) |
return (lc($slots{$a}->{$env{'form.order'}}) |
Line 772 sub show_table {
|
Line 907 sub show_table {
|
#next; |
#next; |
} |
} |
my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
|
"^$slot\0"); |
|
my $ids; |
my $ids; |
|
if (exists($show{'scheduled'})) { |
my ($tmp)=%consumed; |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
if ($tmp !~ /^error: /) { |
"^$slot\0"); |
foreach my $entry (sort(keys(%consumed))) { |
my ($tmp)=%consumed; |
my (undef,$id)=split("\0",$entry); |
if ($tmp !~ /^error: /) { |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
foreach my $entry (sort(keys(%consumed))) { |
my $name = &Apache::loncommon::plainname($uname,$udom); |
my (undef,$id)=split("\0",$entry); |
$ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom, |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
$consumed{$entry}{'symb'}) |
$ids.= '<nobr>'; |
.'</nobr><br />'; |
foreach my $item (@stu_display_order) { |
|
if ($stu_display{$item}) { |
|
if ($item eq 'fullname') { |
|
$ids.=$fullname->{"$uname:$udom"}.' '; |
|
} elsif ($item eq 'username') { |
|
$ids.="<tt>$uname\@$udom</tt> "; |
|
} |
|
} |
|
} |
|
$ids.=&remove_link($slot,$entry,$uname,$udom, |
|
$consumed{$entry}{'symb'}).'</nobr><br />'; |
|
} |
} |
} |
} |
} |
|
|
Line 810 sub show_table {
|
Line 954 sub show_table {
|
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
} |
} |
|
|
|
my $allowedsections; |
|
if (exists($show{'allowedsections'})) { |
|
$allowedsections = |
|
join(', ',sort(split(/\s*,\s*/, |
|
$slots{$slot}->{'allowedsections'}))); |
|
} |
|
|
|
my @allowedusers; |
|
if (exists($show{'allowedusers'})) { |
|
@allowedusers= map { |
|
my ($uname,$udom)=split(/:/,$_); |
|
my $fullname=$name_cache{$_}; |
|
if (!defined($fullname)) { |
|
$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}->{'allowedusers'}))); |
|
} |
|
my $allowedusers=join(', ',@allowedusers); |
|
|
my @proctors; |
my @proctors; |
my $rowspan=1; |
my $rowspan=1; |
my $colspan=1; |
my $colspan=1; |
Line 819 sub show_table {
|
Line 985 sub show_table {
|
my ($uname,$udom)=split(/@/,$_); |
my ($uname,$udom)=split(/@/,$_); |
my $fullname=$name_cache{$_}; |
my $fullname=$name_cache{$_}; |
if (!defined($fullname)) { |
if (!defined($fullname)) { |
&Apache::lonnet::logthis("Gettign $uname $udom"); |
|
$fullname = &Apache::loncommon::plainname($uname,$udom); |
$fullname = &Apache::loncommon::plainname($uname,$udom); |
$fullname =~s/\s/ /g; |
$fullname =~s/\s/ /g; |
$name_cache{$_} = $fullname; |
$name_cache{$_} = $fullname; |
Line 869 DELETELINK
|
Line 1034 DELETELINK
|
if (exists($show{'symb'})) { |
if (exists($show{'symb'})) { |
$colspan++;$r->print("<td>$title</td>\n"); |
$colspan++;$r->print("<td>$title</td>\n"); |
} |
} |
if (exists($show{'uniqueperiod'})) { |
if (exists($show{'allowedsections'})) { |
$colspan++;$r->print("<td>$unique</td>\n"); |
$colspan++;$r->print("<td>$allowedsections</td>\n"); |
|
} |
|
if (exists($show{'allowedusers'})) { |
|
$colspan++;$r->print("<td>$allowedusers</td>\n"); |
|
} |
|
if (exists($show{'scheduled'})) { |
|
$colspan++;$r->print("<td>$ids</td>\n</tr>\n"); |
} |
} |
$colspan++;$r->print("<td>$ids</td>\n</tr>\n"); |
|
if (exists($show{'proctor'})) { |
if (exists($show{'proctor'})) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<tr> |
<tr> |
Line 1053 sub csvupload_fields {
|
Line 1223 sub csvupload_fields {
|
['maxspace','Maximum number of reservations'], |
['maxspace','Maximum number of reservations'], |
['symb','Resource Restriction'], |
['symb','Resource Restriction'], |
['uniqueperiod','Date range of slot exclusion'], |
['uniqueperiod','Date range of slot exclusion'], |
['secret','Secret word proctor uses to validate']); |
['secret','Secret word proctor uses to validate'], |
|
['allowedsections','Sections slot is restricted to'], |
|
['allowedusers','Users slot is restricted to'], |
|
); |
} |
} |
|
|
sub csv_upload_assign { |
sub csv_upload_assign { |