version 1.70, 2006/10/29 16:22:13
|
version 1.76, 2007/04/10 23:30:41
|
Line 433 sub release_slot {
|
Line 433 sub release_slot {
|
|
|
if ($mgr eq 'F' |
if ($mgr eq 'F' |
&& defined($env{'form.symb'})) { |
&& defined($env{'form.symb'})) { |
$symb = $env{'form.symb'}; |
$symb = &unescape($env{'form.symb'}); |
} |
} |
|
|
my ($result,$msg) = |
my ($result,$msg) = |
Line 548 sub return_link {
|
Line 548 sub return_link {
|
} |
} |
|
|
sub get_slot { |
sub get_slot { |
my ($r,$symb)=@_; |
my ($r,$symb,$conflictable_slot,$inhibit_return_link)=@_; |
|
|
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
my $slot_name=&check_for_conflict($symb,$env{'form.slotname'},\%slot); |
Line 556 sub get_slot {
|
Line 556 sub get_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>"); |
&return_link($r); |
&return_link($r); |
return; |
return 0; |
} |
} |
if ($slot_name) { |
if ($slot_name && $slot_name ne $conflictable_slot) { |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my $description1=&get_description($slot_name,\%slot); |
my $description1=&get_description($slot_name,\%slot); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
Line 586 STUFF
|
Line 586 STUFF
|
} else { |
} else { |
&return_link($r); |
&return_link($r); |
} |
} |
return; |
return 0; |
} |
} |
|
|
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); |
if (defined($reserved)) { |
if (defined($reserved)) { |
|
my $retvalue = 0; |
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>"); |
} elsif ($reserved > -1) { |
} elsif ($reserved > -1) { |
$r->print("<p>Success: $description</p>"); |
$r->print("<p>Success: $description</p>"); |
|
$retvalue = 1; |
} elsif ($reserved < 0) { |
} elsif ($reserved < 0) { |
$r->print("<p>Already reserved: $description</p>"); |
$r->print("<p>Already reserved: $description</p>"); |
} |
} |
&return_link($r); |
if (!$inhibit_return_link) { &return_link($r); } |
return; |
return 1; |
} |
} |
|
|
my %lt=('request'=>"Availibility list", |
my %lt=('request'=>"Availibility list", |
'try' =>'Try again'); |
'try' =>'Try again'); |
%lt=&Apache::lonlocal::texthash(%lt); |
%lt=&Apache::lonlocal::texthash(%lt); |
|
|
|
my $extra_input; |
|
if ($conflictable_slot) { |
|
$extra_input='<input type="hidden" name="releaseslot" value="'.$env{'form.slotname'}.'" />'; |
|
} |
|
|
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<p> <font color="red">Failed</font> to reserve a spot for $description. </p> |
<p> <font color="red">Failed</font> to reserve a spot for $description. </p> |
<p> |
<p> |
Line 615 STUFF
|
Line 622 STUFF
|
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="submit" name="Try Again" value="$lt{'try'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
<input type="hidden" name="slotname" value="$env{'form.slotname'}" /> |
<input type="hidden" name="command" value="get" /> |
<input type="hidden" name="command" value="$env{'form.command'}" /> |
|
$extra_input |
</form> |
</form> |
? |
? |
</p> |
</p> |
Line 629 or
|
Line 637 or
|
or |
or |
STUFF |
STUFF |
|
|
&return_link($r); |
if (!$inhibit_return_link) { &return_link($r); } |
return; |
return 0; |
} |
} |
|
|
sub allowed_slot { |
sub allowed_slot { |
Line 639 sub allowed_slot {
|
Line 647 sub allowed_slot {
|
#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"); |
|
|
Line 892 sub show_table {
|
Line 900 sub show_table {
|
} |
} |
my $available; |
my $available; |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
|
# FIXME: This line should be deleted once Slots uses breadcrumbs |
|
$r->print(&Apache::loncommon::help_open_topic('Slot About', 'Help on slots')); |
|
|
$r->print('<div>'); |
$r->print('<div>'); |
$r->print('<form method="post" action="/adm/slotrequest"> |
$r->print('<form method="post" action="/adm/slotrequest"> |
<input type="hidden" name="command" value="uploadstart" /> |
<input type="hidden" name="command" value="uploadstart" /> |
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" /> |
<input type="submit" name="start" value="'.&mt('Upload Slot List').'" /> |
</form>'); |
</form>'); |
|
$r->print(&Apache::loncommon::help_open_topic('Slot CommaDelimited')); |
$r->print('<form method="post" action="/adm/helper/newslot.helper"> |
$r->print('<form method="post" action="/adm/helper/newslot.helper"> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
<input type="submit" name="newslot" value="'.&mt('Create a New Slot').'" /> |
</form>'); |
</form>'); |
|
$r->print(&Apache::loncommon::help_open_topic('Slot AddInterface')); |
$r->print('</div>'); |
$r->print('</div>'); |
} |
} |
|
|
Line 927 sub show_table {
|
Line 940 sub show_table {
|
'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', |
'space' => '# of students/max', |
'ip' => 'IP or DNS restrictions', |
'ip' => 'IP or DNS restrictions', |
'symb' => 'Resource slot is restricted to.', |
'symb' => 'Resource slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
'allowedsections' => 'Sections slot is restricted to.', |
Line 936 sub show_table {
|
Line 949 sub show_table {
|
'scheduled' => 'Scheduled Students', |
'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','space','ip','symb', |
'allowedsections','allowedusers','uniqueperiod', |
'allowedsections','allowedusers','uniqueperiod', |
'scheduled','proctor'); |
'scheduled','proctor'); |
my @show = |
my @show = |
Line 1048 sub show_table {
|
Line 1061 sub show_table {
|
|
|
my %name_cache; |
my %name_cache; |
my $slotsort = sub { |
my $slotsort = sub { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|maxspace|ip|symb|allowedsections|allowedusers)$/) { |
if ($env{'form.order'}=~/^(type|description|endtime|startreserve|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'}}) |
cmp lc($slots{$b}->{$env{'form.order'}})); |
cmp lc($slots{$b}->{$env{'form.order'}})); |
} |
} |
|
} elsif ($env{'form.order'} eq 'space') { |
|
if ($slots{$a}{'maxspace'} ne $slots{$b}{'maxspace'}) { |
|
return ($slots{$a}{'maxspace'} cmp $slots{$b}{'maxspace'}); |
|
} |
} elsif ($env{'form.order'} eq 'name') { |
} elsif ($env{'form.order'} eq 'name') { |
if (lc($a) cmp lc($b)) { |
if (lc($a) cmp lc($b)) { |
return lc($a) cmp lc($b); |
return lc($a) cmp lc($b); |
Line 1073 sub show_table {
|
Line 1090 sub show_table {
|
} |
} |
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
}; |
}; |
|
|
|
my %consumed; |
|
if (exists($show{'scheduled'}) || exists($show{'space'}) ) { |
|
%consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum); |
|
my ($tmp)=%consumed; |
|
if ($tmp =~ /^error: /) { undef(%consumed); } |
|
} |
|
|
foreach my $slot (sort $slotsort (keys(%slots))) { |
foreach my $slot (sort $slotsort (keys(%slots))) { |
if (!&to_show($slot,$slots{$slot},$when, |
if (!&to_show($slot,$slots{$slot},$when, |
$env{'form.deleted'},$name_filter)) { next; } |
$env{'form.deleted'},$name_filter)) { next; } |
Line 1081 sub show_table {
|
Line 1106 sub show_table {
|
#next; |
#next; |
} |
} |
my $description=&get_description($slot,$slots{$slot}); |
my $description=&get_description($slot,$slots{$slot}); |
my $ids; |
my ($id_count,$ids); |
if (exists($show{'scheduled'})) { |
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
if (exists($show{'scheduled'}) || exists($show{'space'}) ) { |
"^$slot\0"); |
my @this_slot = grep(/^$slot\0/,keys(%consumed)); |
my ($tmp)=%consumed; |
$id_count = scalar(@this_slot); |
if ($tmp !~ /^error: /) { |
if (exists($show{'scheduled'})) { |
foreach my $entry (sort { $consumed{$a}{name} cmp |
foreach my $entry (sort { $consumed{$a}{name} cmp |
$consumed{$b}{name} } |
$consumed{$b}{name} } |
(keys(%consumed))) { |
(keys(%consumed))) { |
Line 1211 DELETELINK
|
Line 1236 DELETELINK
|
if (exists($show{'secret'})) { |
if (exists($show{'secret'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'secret'}</td>\n"); |
} |
} |
if (exists($show{'maxspace'})) { |
if (exists($show{'space'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\n"); |
my $display = $id_count; |
|
if ($slots{$slot}{'maxspace'}>0) { |
|
$display.='/'.$slots{$slot}{'maxspace'}; |
|
if ($slots{$slot}{'maxspace'} <= $id_count) { |
|
$display = '<strong>'.$display.' (full) </strong>'; |
|
} |
|
} |
|
$colspan++;$r->print("<td>$display</td>\n"); |
} |
} |
if (exists($show{'ip'})) { |
if (exists($show{'ip'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
Line 1278 sub csvuploadmap_header {
|
Line 1310 sub csvuploadmap_header {
|
|
|
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $checked=(($env{'form.noFirstLine'})?' checked="checked"':''); |
my $ignore=&mt('Ignore First Line'); |
my $ignore=&mt('Ignore First Line'); |
|
my $help_field = &Apache::loncommon::help_open_topic('Slot SelectingField'); |
|
|
$r->print(<<ENDPICK); |
$r->print(<<ENDPICK); |
<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload"> |
<form method="post" enctype="multipart/form-data" action="/adm/slotrequest" name="slotupload"> |
<h3>Identify fields</h3> |
<h3>Identify fields $help_field</h3> |
Total number of records found in file: $distotal <hr /> |
Total number of records found in file: $distotal <hr /> |
Enter as many fields as you can. The system will inform you and bring you back |
Enter as many fields as you can. The system will inform you and bring you back |
to this page if the data selected is insufficient to create the slots.<hr /> |
to this page if the data selected is insufficient to create the slots.<hr /> |
Line 1598 sub handler {
|
Line 1632 sub handler {
|
} elsif ($env{'form.command'} eq 'get') { |
} elsif ($env{'form.command'} eq 'get') { |
&get_slot($r,$symb); |
&get_slot($r,$symb); |
} elsif ($env{'form.command'} eq 'change') { |
} elsif ($env{'form.command'} eq 'change') { |
if (&release_slot($r,$symb,$env{'form.releaseslot'},1)) { |
if (&get_slot($r,$symb,$env{'form.releaseslot'},1)) { |
&get_slot($r,$symb); |
&release_slot($r,$symb,$env{'form.releaseslot'}); |
} |
} |
} else { |
} else { |
$r->print("<p>Unknown command: ".$env{'form.command'}."</p>"); |
$r->print("<p>Unknown command: ".$env{'form.command'}."</p>"); |