version 1.685, 2013/04/11 14:08:02
|
version 1.689, 2013/06/01 00:22:42
|
Line 3101 sub handback_files {
|
Line 3101 sub handback_files {
|
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
&Apache::lonnet::dirlist($portfolio_root.$portfolio_path, |
$domain,$stuname,$getpropath); |
$domain,$stuname,$getpropath); |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
my $version = &get_next_version($answer_name,$answer_ext,$dir_list); |
# fix file name |
# fix filename |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/); |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
my $result=&Apache::lonnet::finishuserfileupload($stuname,$domain, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
$newflg.'_'.$part_resp.'_returndoc'.$counter, |
Line 3120 sub handback_files {
|
Line 3120 sub handback_files {
|
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$$newrecord{"resource.$new_part.$resp_id.handback"} .= $save_file_name; |
$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />"; |
$file_msg.= '<span class="LC_filename"><a href="/uploaded/'."$domain/$stuname/".$save_file_name.'">'.$save_file_name."</a></span> <br />"; |
} |
} |
$request->print('<br />'.&mt('[_1] will be the uploaded file name [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
$request->print('<br />'.&mt('[_1] will be the uploaded filename [_2]','<span class="LC_info">'.$fname.'</span>','<span class="LC_filename">'.$env{'form.'.$newflg.'_'.$part_resp.'_origdoc'.$counter}.'</span>')); |
} |
} |
} |
} |
} |
} |
Line 7923 sub scantron_process_students {
|
Line 7923 sub scantron_process_students {
|
return ''; |
return ''; |
} |
} |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my $randomorder; |
my ($randomorder,$randompick); |
if (ref($map)) { |
if (ref($map)) { |
$randomorder = $map->randomorder(); |
$randomorder = $map->randomorder(); |
|
$randompick = $map->randompick(); |
} |
} |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered); |
my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered); |
Line 8034 SCANTRONFORM
|
Line 8035 SCANTRONFORM
|
} |
} |
|
|
my @mapresources = @resources; |
my @mapresources = @resources; |
if ($randomorder) { |
if ($randomorder || $randompick) { |
@mapresources = |
@mapresources = |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
\%symb_to_resource); |
\%symb_to_resource); |
Line 8214 sub users_order {
|
Line 8215 sub users_order {
|
my $actual_seq = |
my $actual_seq = |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
$master_seq, |
$master_seq, |
$user,$scancode); |
$user,$scancode,1); |
if (ref($actual_seq) eq 'ARRAY') { |
if (ref($actual_seq) eq 'ARRAY') { |
@{$ordered->{$scancode}} = |
@{$ordered->{$scancode}} = |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
Line 8225 sub users_order {
|
Line 8226 sub users_order {
|
my $actual_seq = |
my $actual_seq = |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
&Apache::lonprintout::master_seq_to_person_seq($mapurl, |
$master_seq, |
$master_seq, |
$user); |
$user,undef,1); |
if (ref($actual_seq) eq 'ARRAY') { |
if (ref($actual_seq) eq 'ARRAY') { |
@mapresources = |
@mapresources = |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
map { $symb_to_resource->{$_}; } @{$actual_seq}; |
Line 8489 sub scantron_download_scantron_data {
|
Line 8490 sub scantron_download_scantron_data {
|
if (! &valid_file($file)) { |
if (! &valid_file($file)) { |
$r->print(' |
$r->print(' |
<p> |
<p> |
'.&mt('The requested file name was invalid.').' |
'.&mt('The requested filename was invalid.').' |
</p> |
</p> |
'); |
'); |
return; |
return; |
Line 8539 sub checkscantron_results {
|
Line 8540 sub checkscantron_results {
|
return ''; |
return ''; |
} |
} |
my $map=$navmap->getResourceByUrl($sequence); |
my $map=$navmap->getResourceByUrl($sequence); |
my ($randomorder,@master_seq,%symb_to_resource); |
my ($randomorder,$randompick,@master_seq,%symb_to_resource); |
if (ref($map)) { |
if (ref($map)) { |
$randomorder=$map->randomorder(); |
$randomorder=$map->randomorder(); |
|
$randompick=$map->randompick(); |
} |
} |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0); |
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
Line 8619 sub checkscantron_results {
|
Line 8621 sub checkscantron_results {
|
} |
} |
|
|
my @mapresources = @resources; |
my @mapresources = @resources; |
if ($randomorder) { |
if ($randomorder || $randompick) { |
@mapresources = |
@mapresources = |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
&users_order($user,$scancode,$sequence,\@master_seq,\%ordered, |
\%symb_to_resource); |
\%symb_to_resource); |
Line 9757 sub handler {
|
Line 9759 sub handler {
|
} |
} |
} elsif (!%perm) { |
} elsif (!%perm) { |
$request->internal_redirect('/adm/quickgrades'); |
$request->internal_redirect('/adm/quickgrades'); |
|
return OK; |
} |
} |
&Apache::loncommon::content_type($request,'text/html'); |
&Apache::loncommon::content_type($request,'text/html'); |
$request->send_http_header; |
$request->send_http_header; |