|
version 1.125.2.3.2.1, 2017/11/01 02:49:13
|
version 1.125.2.5, 2018/09/02 02:22:09
|
|
Line 744 sub release_reservation {
|
Line 744 sub release_reservation {
|
| action => 'release', |
action => 'release', |
| context => $env{'form.context'}, |
context => $env{'form.context'}, |
| ); |
); |
| &Apache::lonnet::write_log('slotreservationslog',\%storehash, |
&Apache::lonnet::write_log('course','slotreservationslog', |
| 1,$uname,$udom,$cnum,$cdom); |
\%storehash,1,$uname,$udom,$cnum,$cdom); |
| &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash, |
&Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog', |
| 1,$uname,$udom,$uname,$udom); |
\%storehash,1,$uname,$udom,$uname,$udom); |
| } |
} |
| } |
} |
| |
|
|
Line 841 sub get_slot {
|
Line 841 sub get_slot {
|
| if ($slot_name && $slot_name ne $conflictable_slot) { |
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); |
| |
my $slottype1=$slot{'type'}; |
| %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
%slot=&Apache::lonnet::get_slot($env{'form.slotname'}); |
| my $description2=&get_description($env{'form.slotname'},\%slot); |
my $description2=&get_description($env{'form.slotname'},\%slot); |
| if ($slot_name ne $env{'form.slotname'}) { |
if ($slottype1 eq 'preassigned') { |
| |
$r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.', |
| |
$description1).'</p>'. |
| |
'<p>'.&mt('Your instructor must unassign it before you can make a new reservation.'). |
| |
'</p>'); |
| |
} elsif ($slot_name ne $env{'form.slotname'}) { |
| $r->print(<<STUFF); |
$r->print(<<STUFF); |
| <form method="post" action="/adm/slotrequest"> |
<form method="post" action="/adm/slotrequest"> |
| <input type="hidden" name="symb" value="$env{'form.symb'}" /> |
<input type="hidden" name="symb" value="$env{'form.symb'}" /> |
|
Line 2666 sub csv_upload_map {
|
Line 2672 sub csv_upload_map {
|
| if (!$env{'form.datatoken'}) { |
if (!$env{'form.datatoken'}) { |
| $datatoken=&Apache::loncommon::upfile_store($r); |
$datatoken=&Apache::loncommon::upfile_store($r); |
| } else { |
} else { |
| $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
$datatoken=$env{'form.datatoken'}; |
| if ($datatoken ne '') { |
&Apache::loncommon::load_tmp_file($r); |
| &Apache::loncommon::load_tmp_file($r,$datatoken); |
|
| } |
|
| } |
} |
| my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
| if ($env{'form.noFirstLine'}) { shift(@records); } |
if ($env{'form.noFirstLine'}) { shift(@records); } |
|
Line 2719 sub csvupload_fields {
|
Line 2723 sub csvupload_fields {
|
| |
|
| sub csv_upload_assign { |
sub csv_upload_assign { |
| my ($r,$mgr)= @_; |
my ($r,$mgr)= @_; |
| my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'}); |
&Apache::loncommon::load_tmp_file($r); |
| if ($datatoken ne '') { |
|
| &Apache::loncommon::load_tmp_file($r,$datatoken); |
|
| } |
|
| my @slotdata = &Apache::loncommon::upfile_record_sep(); |
my @slotdata = &Apache::loncommon::upfile_record_sep(); |
| if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
if ($env{'form.noFirstLine'}) { shift(@slotdata); } |
| my %fields=&Apache::grades::get_fields(); |
my %fields=&Apache::grades::get_fields(); |
![[BACK]](/icons/back.gif){kind=icon}
Return to slotrequest.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface