version 1.43, 2006/02/03 23:42:54
|
version 1.48, 2006/02/26 19:40:14
|
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 159 sub check_for_reservation {
|
Line 160 sub check_for_reservation {
|
return (undef,undef); |
return (undef,undef); |
} |
} |
|
|
sub check_for_conflict { |
sub get_consumed_uniqueperiods { |
my ($symb,$new_slot_name,$new_slot,$slots)=@_; |
my ($slots) = @_; |
|
my $navmap=Apache::lonnavmaps::navmap->new; |
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
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; |
|
} |
|
} |
|
|
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'}); |
|
my @slots = (split(/:/,$student), split(/:/, $course)); |
|
my ($cnum,$cdom)=&get_course(); |
|
if (!ref($slots)) { |
if (!ref($slots)) { |
my %slots=&Apache::lonnet::get('slots', [@slots], $cdom, $cnum); |
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; |
$slots = \%slots; |
} |
} |
|
|
if (&network_error($student) || &network_error($course) || |
my %consumed_uniqueperiods; |
&network_error(%$slots)) { |
foreach my $slot_name (keys(%used_slots)) { |
return 'error: Unable to determine current status'; |
|
} |
|
|
|
my ($new_uniq_start,$new_uniq_end) = @{$new_slot->{'uniqueperiod'}}; |
|
foreach my $slot_name (@slots) { |
|
next if (!defined($slots->{$slot_name}) || |
next if (!defined($slots->{$slot_name}) || |
!ref($slots->{$slot_name})); |
!ref($slots->{$slot_name})); |
|
|
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
next if (!defined($slots->{$slot_name}{'uniqueperiod'}) || |
!ref($slots->{$slot_name}{'uniqueperiod'})); |
!ref($slots->{$slot_name}{'uniqueperiod'})); |
my ($start,$end)=@{$slots->{$slot_name}{'uniqueperiod'}}; |
$consumed_uniqueperiods{$slot_name} = |
|
$slots->{$slot_name}{'uniqueperiod'}; |
|
} |
|
return \%consumed_uniqueperiods; |
|
} |
|
|
|
sub check_for_conflict { |
|
my ($symb,$new_slot_name,$new_slot,$slots,$consumed_uniqueperiods)=@_; |
|
|
|
if (!defined($new_slot->{'uniqueperiod'})) { return undef; } |
|
|
|
if (!ref($consumed_uniqueperiods)) { |
|
$consumed_uniqueperiods = &get_consumed_uniqueperiods($slots); |
|
if (&network_error(%$consumed_uniqueperiods)) { |
|
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 (! |
if (! |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start < $new_uniq_start && $end < $new_uniq_start) || |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
($start > $new_uniq_end && $end > $new_uniq_end )) { |
Line 362 sub release_slot {
|
Line 393 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">'. |
Line 452 STUFF
|
Line 482 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 498 STUFF
|
Line 528 STUFF
|
} |
} |
|
|
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 |
Line 521 sub allowed_slot {
|
Line 551 sub allowed_slot {
|
&& $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 541 sub show_choices {
|
Line 578 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"); |
Line 550 sub show_choices {
|
Line 588 sub show_choices {
|
(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++; |
|
|
Line 566 sub show_choices {
|
Line 605 sub show_choices {
|
$command='release'; |
$command='release'; |
} else { |
} else { |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
my $conflict = &check_for_conflict($symb,$slot,$slots{$slot}, |
\%slots); |
\%slots, |
|
$consumed_uniqueperiods); |
if ($conflict) { |
if ($conflict) { |
$text=&mt('Change Reservation'); |
$text=&mt('Change Reservation'); |
$command='get'; |
$command='get'; |
Line 689 sub show_table {
|
Line 729 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', |
Line 704 sub show_table {
|
Line 749 sub show_table {
|
'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', |
'uniqueperiod' => 'Period of time slot is unique', |
|
'scheduled' => 'Scheduled Students', |
'proctor' => 'List of proctors'); |
'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'); |
'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 726 sub show_table {
|
Line 772 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 736 sub show_table {
|
Line 792 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 767 sub show_table {
|
Line 829 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 { |
Line 803 sub show_table {
|
Line 864 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 903 DELETELINK
|
Line 973 DELETELINK
|
if (exists($show{'uniqueperiod'})) { |
if (exists($show{'uniqueperiod'})) { |
$colspan++;$r->print("<td>$unique</td>\n"); |
$colspan++;$r->print("<td>$unique</td>\n"); |
} |
} |
$colspan++;$r->print("<td>$ids</td>\n</tr>\n"); |
if (exists($show{'scheduled'})) { |
|
$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> |