version 1.29, 2005/11/08 03:13:20
|
version 1.36, 2005/11/21 22:16:24
|
Line 231 sub make_reservation {
|
Line 231 sub make_reservation {
|
return undef; |
return undef; |
} |
} |
|
|
|
sub remove_registration { |
|
my ($r) = @_; |
|
my $name = &Apache::loncommon::plainname($env{'form.uname'}, |
|
$env{'form.udom'}); |
|
|
|
my $title = &Apache::lonnet::gettitle($env{'form.symb'}); |
|
|
|
my $hidden_input; |
|
foreach my $parm ('uname','udom','slotname','entry','symb') { |
|
$hidden_input .= |
|
'<input type="hidden" name="'.$parm.'" value="' |
|
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n"; |
|
} |
|
$r->print(<<"END_CONFIRM"); |
|
<p> Remove $name from slot $env{'form.slotname'} for $title</p> |
|
<form action="/adm/slotrequest" method="POST"> |
|
<input type="hidden" name="command" value="release" /> |
|
$hidden_input |
|
<input type="submit" name="Yes" value="yes" /> |
|
</form> |
|
<form action="/adm/slotrequest" method="POST"> |
|
<input type="hidden" name="command" value="showslots" /> |
|
<input type="submit" name="No" value="no" /> |
|
</form> |
|
END_CONFIRM |
|
|
|
} |
|
|
sub release_slot { |
sub release_slot { |
my ($r,$symb,$slot_name,$inhibit_return_link)=@_; |
my ($r,$symb,$slot_name,$inhibit_return_link,$mgr)=@_; |
|
|
if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } |
if ($slot_name eq '') { $slot_name=$env{'form.slotname'}; } |
my ($cnum,$cdom)=&get_course(); |
my ($cnum,$cdom)=&get_course(); |
|
|
|
my ($uname,$udom) = ($env{'user.name'}, $env{'user.domain'}); |
|
if ($mgr eq 'F' |
|
&& defined($env{'form.uname'}) && defined($env{'form.udom'})) { |
|
($uname,$udom) = ($env{'form.uname'}, $env{'form.udom'}); |
|
} |
|
|
|
if ($mgr eq 'F' |
|
&& defined($env{'form.symb'})) { |
|
$symb = $env{'form.symb'}; |
|
} |
|
|
# get parameter string, check for existance, rebuild string with the slot |
# get parameter string, check for existance, rebuild string with the slot |
|
|
my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent", |
my @slots = split(/:/,&Apache::lonnet::EXT("resource.0.availablestudent", |
$symb,$env{'user.domain'}, |
$symb,$udom,$uname)); |
$env{'user.name'})); |
|
my @new_slots; |
my @new_slots; |
foreach my $exist_slot (@slots) { |
foreach my $exist_slot (@slots) { |
if ($exist_slot eq $slot_name) { next; } |
if ($exist_slot eq $slot_name) { next; } |
Line 253 sub release_slot {
|
Line 291 sub release_slot {
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
"^$slot_name\0"); |
"^$slot_name\0"); |
foreach my $entry (keys(%consumed)) { |
foreach my $entry (keys(%consumed)) { |
if ( $consumed{$entry}->{'name'} eq |
if ( $consumed{$entry}->{'name'} eq ($uname.'@'.$udom) ) { |
($env{'user.name'}.'@'.$env{'user.domain'}) ) { |
|
&Apache::lonnet::del('slot_reservations',[$entry], |
&Apache::lonnet::del('slot_reservations',[$entry], |
$cdom,$cnum); |
$cdom,$cnum); |
} |
} |
} |
} |
|
|
# store new parameter string |
# store new parameter string |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
my $result=&Apache::lonparmset::storeparm_by_symb($symb, |
'0_availablestudent', |
'0_availablestudent', |
1, $new_param, 'string', |
1, $new_param, 'string', |
$env{'user.name'}, |
$uname,$udom); |
$env{'user.domain'}); |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
my %slot=&Apache::lonnet::get_slot($slot_name); |
my $description=&get_description($env{'form.slotname'},\%slot); |
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') { |
|
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
|
&mt('Return to slot list').'</a></p>'); |
|
} |
if (!$inhibit_return_link) { |
if (!$inhibit_return_link) { |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
&mt('Return to last resource').'</a></p>'); |
&mt('Return to last resource').'</a></p>'); |
Line 275 sub release_slot {
|
Line 316 sub release_slot {
|
return 1; |
return 1; |
} |
} |
|
|
|
sub delete_slot { |
|
my ($r)=@_; |
|
|
|
my $slot_name = $env{'form.slotname'}; |
|
my %slot=&Apache::lonnet::get_slot($slot_name); |
|
|
|
my ($cnum,$cdom)=&get_course(); |
|
my %consumed=&Apache::lonnet::dump('slot_reservations',$cdom,$cnum, |
|
"^$slot_name\0"); |
|
|
|
if (%slot && !%consumed) { |
|
$slot{'type'} = 'deleted'; |
|
my $ret = &Apache::lonnet::cput('slots', {$slot_name => \%slot}, |
|
$cdom, $cnum); |
|
if ($ret eq 'ok') { |
|
$r->print("<p>Slot <tt>$slot_name</tt> marked as deleted.</p>"); |
|
} else { |
|
$r->print("<p> An error ($ret) occurse when attempting to delete Slot <tt>$slot_name</tt>.</p>"); |
|
} |
|
} else { |
|
if (%consumed) { |
|
$r->print("<p>Slot <tt>$slot_name</tt> has active reservations.</p>"); |
|
} else { |
|
$r->print("<p>Slot <tt>$slot_name</tt> does not exist.</p>"); |
|
} |
|
} |
|
$r->print('<p><a href="/adm/slotrequest?command=showslots">'. |
|
&mt('Return to slot list').'</a></p>'); |
|
$r->print('<p><a href="/adm/flip?postdata=return:">'. |
|
&mt('Return to last resource').'</a></p>'); |
|
} |
|
|
sub get_slot { |
sub get_slot { |
my ($r,$symb)=@_; |
my ($r,$symb)=@_; |
|
|
Line 450 STUFF
|
Line 523 STUFF
|
$r->print('</table>'); |
$r->print('</table>'); |
} |
} |
|
|
|
sub to_show { |
|
my ($slot,$when,$deleted) = @_; |
|
my $time=time; |
|
my $week=60*60*24*7; |
|
if ($deleted eq 'hide' && $slot->{'type'} eq 'deleted') { |
|
return 0; |
|
} |
|
if ($when eq 'any') { |
|
return 1; |
|
} elsif ($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 remove_link { |
|
my ($slotname,$entry,$uname,$udom,$symb) = @_; |
|
|
|
$slotname = &Apache::lonnet::escape($slotname); |
|
$entry = &Apache::lonnet::escape($entry); |
|
$uname = &Apache::lonnet::escape($uname); |
|
$udom = &Apache::lonnet::escape($udom); |
|
$symb = &Apache::lonnet::escape($symb); |
|
|
|
my $remove= &mt('Remove'); |
|
|
|
return <<"END_LINK"; |
|
<a href="/adm/slotrequest?command=remove_registration&slotname=$slotname&entry=$entry&uname=$uname&udom=$udom&symb=$symb" |
|
>($remove)</a> |
|
END_LINK |
|
|
|
} |
|
|
sub show_table { |
sub show_table { |
my ($r,$mgr)=@_; |
my ($r,$mgr)=@_; |
|
|
Line 460 sub show_table {
|
Line 599 sub show_table {
|
} |
} |
my $available; |
my $available; |
if ($mgr eq 'F') { |
if ($mgr eq 'F') { |
|
$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').'" /> |
Line 467 sub show_table {
|
Line 607 sub show_table {
|
$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('</div>'); |
} |
} |
|
|
my %Saveable_Parameters = ('show' => 'array'); |
my %Saveable_Parameters = ('show' => 'array', |
|
'when' => 'scalar', |
|
'order' => 'scalar', |
|
'deleted' => 'scalar', |
|
); |
|
&Apache::loncommon::store_course_settings('slotrequest',\%Saveable_Parameters); |
|
&Apache::loncommon::restore_course_settings('slotrequest',\%Saveable_Parameters); |
|
|
&Apache::loncommon::store_course_settings('chart',\%Saveable_Parameters); |
my %show_fields=&Apache::lonlocal::texthash( |
&Apache::loncommon::restore_course_settings('chart',\%Saveable_Parameters); |
|
|
|
my %fields=&Apache::lonlocal::texthash( |
|
'name' => 'Slot Name', |
'name' => 'Slot Name', |
'description' => 'Description', |
'description' => 'Description', |
'type' => 'Type', |
'type' => 'Type', |
Line 487 sub show_table {
|
Line 631 sub show_table {
|
'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', |
'proctor' => 'List of proctors'); |
'proctor' => 'List of proctors'); |
my @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','proctor'); |
my @sel = |
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(%fields); |
: keys(%show_fields); |
my %sel = map { $_ => 1 } (@sel); |
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', |
|
'any' => 'Anytime', |
|
); |
|
my @when_order=('any','now','nextweek','lastweek','willopen','wereopen'); |
|
$when_fields{'select_form_order'} = \@when_order; |
|
my $when = (exists($env{'form.when'})) ? $env{'form.when'} |
|
: 'now'; |
|
|
|
my $hide_radio = |
|
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'hide'); |
|
my $show_radio = |
|
&Apache::lonhtmlcommon::radio('deleted',$env{'form.deleted'},'show'); |
|
|
$r->print('<form method="POST" action="/adm/slotrequest"> |
$r->print('<form method="POST" action="/adm/slotrequest"> |
<input type="hidden" name="command" value="showslots" /> |
<input type="hidden" name="command" value="showslots" />'); |
<input type="submit" name="start" value="'.&mt('Change').'" />'); |
$r->print('<div>'); |
$r->print('<table><tr><td>Show: '.&Apache::loncommon::multiple_select_form('show',\@sel,6,\%fields,\@order). |
$r->print('<table class="inline"> |
'</td></tr></table>'); |
<tr><th>'.&mt('Show').'</th> |
|
<th>'.&mt('Open').'</th> |
|
<th>'.&mt('Options').'</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> |
|
<td> |
|
<table> |
|
<tr> |
|
<td rowspan="2">Deleted slots:</td> |
|
<td><label>'.$show_radio.'Show</label></td> |
|
</tr> |
|
<tr> |
|
<td><label>'.$hide_radio.'Hide</label></td> |
|
</tr> |
|
</table> |
|
</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='; |
my $linkstart='<a href="/adm/slotrequest?command=showslots&order='; |
$r->print('<table border="1"> |
$r->print('<table class="thinborder"> |
<tr> |
<tr> |
<th></th>'); |
<th></th>'); |
foreach my $which (@order) { |
foreach my $which (@show_order) { |
if ($which ne 'proctor' && exists($sel{$which})) { |
if ($which ne 'proctor' && exists($show{$which})) { |
$r->print('<th>'.$linkstart.$which.'">'.$fields{$which}.'</a></th>'); |
$r->print('<th>'.$linkstart.$which.'">'.$show_fields{$which}.'</a></th>'); |
} |
} |
} |
} |
$r->print('<th>Scheduled Students</th></tr>'); |
$r->print('<th>Scheduled Students</th></tr>'); |
Line 539 sub show_table {
|
Line 723 sub show_table {
|
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
return $slots{$a}->{'starttime'} <=> $slots{$b}->{'starttime'}; |
}; |
}; |
foreach my $slot (sort $slotsort (keys(%slots))) { |
foreach my $slot (sort $slotsort (keys(%slots))) { |
|
if (!&to_show($slots{$slot},$when,$env{'form.deleted'})) { next; } |
if (defined($slots{$slot}->{'type'}) |
if (defined($slots{$slot}->{'type'}) |
&& $slots{$slot}->{'type'} ne 'schedulable_student') { |
&& $slots{$slot}->{'type'} ne 'schedulable_student') { |
#next; |
#next; |
Line 549 sub show_table {
|
Line 734 sub show_table {
|
my $ids; |
my $ids; |
foreach my $entry (sort(keys(%consumed))) { |
foreach my $entry (sort(keys(%consumed))) { |
my (undef,$id)=split("\0",$entry); |
my (undef,$id)=split("\0",$entry); |
$ids.= $id.'-> '.$consumed{$entry}->{'name'}.'<br />'; |
my ($uname,$udom) = split('@',$consumed{$entry}{'name'}); |
|
my $name = &Apache::loncommon::plainname($uname,$udom); |
|
$ids.= '<nobr>'.$name.&remove_link($slot,$entry,$uname,$udom, |
|
$consumed{$entry}{'symb'}) |
|
.'</nobr><br />'; |
} |
} |
|
|
my $start=($slots{$slot}->{'starttime'}? |
my $start=($slots{$slot}->{'starttime'}? |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'starttime'}):''); |
&Apache::lonlocal::locallocaltime($slots{$slot}->{'starttime'}):''); |
my $end=($slots{$slot}->{'endtime'}? |
my $end=($slots{$slot}->{'endtime'}? |
Line 563 sub show_table {
|
Line 753 sub show_table {
|
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','. |
$unique=localtime($slots{$slot}{'uniqueperiod'}[0]).','. |
localtime($slots{$slot}{'uniqueperiod'}[1]); |
localtime($slots{$slot}{'uniqueperiod'}[1]); |
} |
} |
|
|
my $title; |
my $title; |
if (exists($slots{$slot}{'symb'})) { |
if (exists($slots{$slot}{'symb'})) { |
my (undef,undef,$res)= |
my (undef,undef,$res)= |
Line 571 sub show_table {
|
Line 762 sub show_table {
|
$title = &Apache::lonnet::gettitle($slots{$slot}{'symb'}); |
$title = &Apache::lonnet::gettitle($slots{$slot}{'symb'}); |
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
$title='<a href="'.$res.'?symb='.$slots{$slot}{'symb'}.'">'.$title.'</a>'; |
} |
} |
|
|
my @proctors; |
my @proctors; |
my $rowspan=1; |
my $rowspan=1; |
my $colspan=1; |
my $colspan=1; |
if (exists($sel{'proctor'})) { |
if (exists($show{'proctor'})) { |
$rowspan=2; |
$rowspan=2; |
@proctors= map { |
@proctors= map { |
my ($uname,$udom)=split(/@/,$_); |
my ($uname,$udom)=split(/@/,$_); |
Line 590 sub show_table {
|
Line 782 sub show_table {
|
} |
} |
my $proctors=join(', ',@proctors); |
my $proctors=join(', ',@proctors); |
|
|
my $edit=(<<EDITFORM); |
my $edit=(<<"EDITLINK"); |
<form method="POST" action="/adm/helper/newslot.helper"> |
<a href="/adm/helper/newslot.helper?name=$slot">Edit</a> |
<input type="hidden" name="name" value="$slot" /> |
EDITLINK |
<input type="submit" name="Edit" value="Edit" /> |
|
</form> |
my $delete=(<<"DELETELINK"); |
EDITFORM |
<a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a> |
|
DELETELINK |
$r->print("<tr>\n<td rowspan=\"$rowspan\">$edit</td>\n"); |
if ($ids ne '') { undef($delete); } |
if (exists($sel{'name'})) { |
|
|
$r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n"); |
|
if (exists($show{'name'})) { |
$colspan++;$r->print("<td>$slot</td>"); |
$colspan++;$r->print("<td>$slot</td>"); |
} |
} |
if (exists($sel{'type'})) { |
if (exists($show{'description'})) { |
$colspan++;$r->print("<td>$slots{$slot}->{'type'}</td>\n"); |
|
} |
|
if (exists($sel{'description'})) { |
|
$colspan++;$r->print("<td>$description</td>\n"); |
$colspan++;$r->print("<td>$description</td>\n"); |
} |
} |
if (exists($sel{'starttime'})) { |
if (exists($show{'type'})) { |
|
$colspan++;$r->print("<td>$slots{$slot}->{'type'}</td>\n"); |
|
} |
|
if (exists($show{'starttime'})) { |
$colspan++;$r->print("<td>$start</td>\n"); |
$colspan++;$r->print("<td>$start</td>\n"); |
} |
} |
if (exists($sel{'endtime'})) { |
if (exists($show{'endtime'})) { |
$colspan++;$r->print("<td>$end</td>\n"); |
$colspan++;$r->print("<td>$end</td>\n"); |
} |
} |
if (exists($sel{'startreserve'})) { |
if (exists($show{'startreserve'})) { |
$colspan++;$r->print("<td>$start_reserve</td>\n"); |
$colspan++;$r->print("<td>$start_reserve</td>\n"); |
} |
} |
if (exists($sel{'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($sel{'maxspace'})) { |
if (exists($show{'maxspace'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'maxspace'}</td>\n"); |
} |
} |
if (exists($sel{'ip'})) { |
if (exists($show{'ip'})) { |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
$colspan++;$r->print("<td>$slots{$slot}{'ip'}</td>\n"); |
} |
} |
if (exists($sel{'symb'})) { |
if (exists($show{'symb'})) { |
$colspan++;$r->print("<td>$title</td>\n"); |
$colspan++;$r->print("<td>$title</td>\n"); |
} |
} |
if (exists($sel{'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"); |
$colspan++;$r->print("<td>$ids</td>\n</tr>\n"); |
if (exists($sel{'proctor'})) { |
if (exists($show{'proctor'})) { |
$r->print(<<STUFF); |
$r->print(<<STUFF); |
<tr> |
<tr> |
<td colspan="$colspan">$proctors</td> |
<td colspan="$colspan">$proctors</td> |
Line 825 sub csv_upload_assign {
|
Line 1019 sub csv_upload_assign {
|
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $countdone=0; |
my $countdone=0; |
|
my @errors; |
foreach my $slot (@slotdata) { |
foreach my $slot (@slotdata) { |
my %slot; |
my %slot; |
my %entries=&Apache::loncommon::record_sep($slot); |
my %entries=&Apache::loncommon::record_sep($slot); |
my $domain; |
my $domain; |
my $name=$entries{$fields{'name'}}; |
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'}}) { |
if ($entries{$fields{'type'}}) { |
$slot{'type'}=$entries{$fields{'type'}}; |
$slot{'type'}=$entries{$fields{'type'}}; |
} else { |
} else { |
$slot{'type'}='preassigned'; |
$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'}}) { |
if ($entries{$fields{'starttime'}}) { |
$slot{'starttime'}=&UnixDate($entries{$fields{'starttime'}},"%s"); |
$slot{'starttime'}=&UnixDate($entries{$fields{'starttime'}},"%s"); |
} |
} |
Line 863 sub csv_upload_assign {
|
Line 1075 sub csv_upload_assign {
|
$r->rflush(); |
$r->rflush(); |
$countdone++; |
$countdone++; |
} |
} |
$r->print("<br />Created $countdone slots\n"); |
$r->print("<p>Created $countdone slots\n</p>"); |
$r->print("<br />\n"); |
foreach my $error (@errors) { |
|
$r->print("<p>$error\n</p>"); |
|
} |
&show_table($r,$mgr); |
&show_table($r,$mgr); |
return ''; |
return ''; |
} |
} |
Line 872 sub csv_upload_assign {
|
Line 1086 sub csv_upload_assign {
|
sub handler { |
sub handler { |
my $r=shift; |
my $r=shift; |
|
|
|
&Apache::loncommon::content_type($r,'text/html'); |
|
&Apache::loncommon::no_cache($r); |
|
if ($r->header_only()) { |
|
$r->send_http_header(); |
|
return OK; |
|
} |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}); |
|
|
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
my $vgr=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}); |
Line 884 sub handler {
|
Line 1105 sub handler {
|
|
|
if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') { |
if ($env{'form.command'} eq 'showslots' && $vgr eq 'F') { |
&show_table($r,$mgr); |
&show_table($r,$mgr); |
|
} elsif ($env{'form.command'} eq 'remove_registration' && $mgr eq 'F') { |
|
&remove_registration($r); |
|
} elsif ($env{'form.command'} eq 'release' && $mgr eq 'F') { |
|
&release_slot($r,undef,undef,undef,$mgr); |
|
} elsif ($env{'form.command'} eq 'delete' && $mgr eq 'F') { |
|
&delete_slot($r); |
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'uploadstart' && $mgr eq 'F') { |
&upload_start($r); |
&upload_start($r); |
} elsif ($env{'form.command'} eq 'csvuploadmap' && $mgr eq 'F') { |
} elsif ($env{'form.command'} eq 'csvuploadmap' && $mgr eq 'F') { |
Line 902 sub handler {
|
Line 1129 sub handler {
|
} else { |
} else { |
my $symb=&Apache::lonnet::unescape($env{'form.symb'}); |
my $symb=&Apache::lonnet::unescape($env{'form.symb'}); |
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb); |
my (undef,undef,$res)=&Apache::lonnet::decode_symb($symb); |
if ($res !~ /\.task$/) { |
my $useslots = &Apache::lonnet::EXT("resource.0.useslots",$symb); |
|
if ($useslots ne 'resource') { |
&fail($r,'not_valid'); |
&fail($r,'not_valid'); |
return OK; |
return OK; |
} |
} |
$env{'request.symb'}=$symb; |
$env{'request.symb'}=$symb; |
my ($status) = &Apache::lonhomework::check_task_access('0'); |
my $type = ($res =~ /\.task$/) ? 'Task' |
|
: 'problem'; |
|
my ($status) = &Apache::lonhomework::check_slot_access('0',$type); |
if ($status eq 'CAN_ANSWER' || |
if ($status eq 'CAN_ANSWER' || |
$status eq 'NEEDS_CHECKIN' || |
$status eq 'NEEDS_CHECKIN' || |
$status eq 'WAITING_FOR_GRADE') { |
$status eq 'WAITING_FOR_GRADE') { |