version 1.363, 2006/06/12 22:14:29
|
version 1.364, 2006/06/21 20:18:43
|
Line 2330 sub saveHandGrade {
|
Line 2330 sub saveHandGrade {
|
if (exists($record{'resource.'.$new_part.'.awarded'})) { |
if (exists($record{'resource.'.$new_part.'.awarded'})) { |
$newrecord{'resource.'.$new_part.'.awarded'} = ''; |
$newrecord{'resource.'.$new_part.'.awarded'} = ''; |
} |
} |
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}"; |
$newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}"; |
} |
} |
} elsif ($dropMenu eq 'reset status' |
} elsif ($dropMenu eq 'reset status' |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
&& exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts |
Line 2405 sub saveHandGrade {
|
Line 2405 sub saveHandGrade {
|
|
|
if (%newrecord) { |
if (%newrecord) { |
if (@version_parts) { |
if (@version_parts) { |
my @changed_keys = &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts); |
my @changed_keys = &version_portfiles(\%record, \@parts_graded, |
|
$env{'request.course.id'}, $symb, $domain, $stuname, \@version_parts); |
@newrecord{@changed_keys} = @record{@changed_keys}; |
@newrecord{@changed_keys} = @record{@changed_keys}; |
} |
} |
&Apache::lonnet::cstore(\%newrecord,$symb, |
&Apache::lonnet::cstore(\%newrecord,$symb, |
Line 2447 sub handback_files {
|
Line 2448 sub handback_files {
|
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/); |
my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root); |
my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root); |
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
my $version = &get_next_version($answer_name, $answer_ext, \@dir_list); |
my $new_answer = &version_selected_portfile($domain, $stuname, $portfolio_path, $answer_file, $version); |
|
$$newrecord{"resource.$new_part.$resp_id.handback"} = $new_answer; |
|
$version++; |
|
# fix file name |
# fix file name |
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, |
Line 2463 sub handback_files {
|
Line 2461 sub handback_files {
|
my @files = ($save_file_name); |
my @files = ($save_file_name); |
my @what = ($symb,'handback'); |
my @what = ($symb,'handback'); |
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what); |
&Apache::lonnet::mark_as_readonly($domain,$stuname,\@files,\@what); |
|
$$newrecord{"resource.$new_part.$resp_id.handback"} = $save_file_name; |
my $subject = "File Handed Back by Instructor "; |
my $subject = "File Handed Back by Instructor "; |
my $message = "A file has been returned that was originally submitted in reponse to: <br />"; |
my $message = "A file has been returned that was originally submitted in reponse to: <br />"; |
$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />"; |
$message .= "<strong>".&Apache::lonnet::gettitle($symb)."</strong><br />"; |
$message .= " The returned file is named: <br /><strong>".$save_file_name."</strong><br />"; |
$message .= " The returned file is named: <br /><strong>".$save_file_name."</strong><br />"; |
$message .= " and can be found in your portfolio space."; |
$message .= " and can be found in your portfolio space."; |
&Apache::lonnet::logthis($message); |
|
my $url = (&Apache::lonnet::decode_symb($symb))[2]; |
my $url = (&Apache::lonnet::decode_symb($symb))[2]; |
$url = &Apache::lonnet::declutter($url); |
$url = &Apache::lonnet::declutter($url); |
my $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain, |
my $msgstatus = &Apache::lonmsg::user_normal_msg($stuname,$domain, |