version 1.20, 2005/05/10 16:03:44
|
version 1.29, 2005/05/20 21:23:42
|
Line 59 sub initialize_bridgetask {
|
Line 59 sub initialize_bridgetask {
|
} |
} |
|
|
sub proctor_check_auth { |
sub proctor_check_auth { |
my ($slot)=@_; |
my ($slot_name,$slot)=@_; |
my $user=$env{'form.proctorname'}; |
my $user=$env{'form.proctorname'}; |
my $domain=$env{'form.proctordomain'}; |
my $domain=$env{'form.proctordomain'}; |
|
|
Line 69 sub proctor_check_auth {
|
Line 69 sub proctor_check_auth {
|
if ($puser eq $user && $pdom eq $domain) { |
if ($puser eq $user && $pdom eq $domain) { |
my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); |
my $authhost=&Apache::lonnet::authenticate($puser,$env{'form.proctorpassword'},$pdom); |
if ($authhost ne 'no_host') { |
if ($authhost ne 'no_host') { |
$Apache::lonhomework::results{'resource.checkedin'}= |
my $version= |
|
$Apache::lonhomework::results{'resource.version'}= |
|
++$Apache::lonhomework::history{'resource.version'}; |
|
$Apache::lonhomework::results{"resource.$version.checkedin"}= |
$user.'@'.$domain; |
$user.'@'.$domain; |
|
$Apache::lonhomework::results{"resource.$version.checkedin.slot"}= |
|
$slot_name; |
|
foreach my $key (keys(%Apache::lonhomework::history)) { |
|
if ($key=~/^resource\.0\./) { |
|
$Apache::lonhomework::results{$key}=''; |
|
} |
|
} |
return 1; |
return 1; |
} |
} |
} |
} |
Line 78 sub proctor_check_auth {
|
Line 88 sub proctor_check_auth {
|
return 0; |
return 0; |
} |
} |
|
|
|
sub get_version { |
|
my ($version,$previous); |
|
if ($env{'form.previousversion'} && |
|
defined($Apache::lonhomework::history{'resource.'.$env{'form.previousversion'}.'.status'})) { |
|
$version=$env{'form.previousversion'}; |
|
$previous=1; |
|
} else { |
|
$version=$Apache::lonhomework::history{'resource.version'}; |
|
$previous=0; |
|
} |
|
if (wantarray) { |
|
return ($version,$previous); |
|
} |
|
return $version; |
|
} |
|
|
sub add_previous_version_button { |
sub add_previous_version_button { |
|
my ($status)=@_; |
my $result; |
my $result; |
$result.=&mt(' Show a previously done version: [_1]','<select name="previousversion"> |
if ($Apache::lonhomework::history{'resource.version'} eq '') { |
<option>Pick one</option> |
return ''; |
</select>'); |
} |
|
if ($Apache::lonhomework::history{'resource.version'} < 2 && |
|
$status ne 'NEEDS_CHECKIN') { |
|
return ''; |
|
} |
|
my $version=&get_version(); |
|
if ($env{'form.previousversion'} ne '' && |
|
$env{'form.previousversion'} eq $version) { |
|
$result.="<h3>".&mt("Showing previous version [_1]",$version). |
|
"</h3>\n"; |
|
} |
|
my @to_show; |
|
foreach my $test_version (1..$Apache::lonhomework::history{'resource.version'}) { |
|
if (defined($Apache::lonhomework::history{'resource.'.$test_version.'.status'})) { |
|
push(@to_show,$test_version); |
|
} |
|
} |
|
my $list='<option>'. |
|
join("</option>\n<option>",@to_show). |
|
"</option>\n"; |
|
$result.='<form name="getprevious" method="POST" action="'; |
|
my $uri=$env{'request.uri'}; |
|
if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); } |
|
$result.=$uri.'">'. |
|
&mt(' Show a previously done version: [_1]','<select onchange="this.form.submit()" name="previousversion"> |
|
<option>'.&mt('Pick one').'</option> |
|
'.$list.' |
|
</select>')."</form>"; |
return $result; |
return $result; |
} |
} |
|
|
sub add_grading_button { |
sub add_grading_button { |
my $result; |
my $result=' <input type="submit" name="gradeasubmission" value="'. |
$result.=' <input type="submit" name="gradeasubmission" value="'. |
|
&mt("Get a submission to grade").'" />'; |
&mt("Get a submission to grade").'" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
$result.='<input type="hidden" name="grade_target" value="webgrade" />'; |
return $result; |
return $result; |
} |
} |
|
|
|
sub add_request_another_attempt_button { |
|
my $result; |
|
$result.=' <input type="submit" name="requestattempt" value="'. |
|
&mt("Request another attempt").'" />'; |
|
return $result; |
|
} |
|
|
sub start_Task { |
sub start_Task { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
|
Line 109 sub start_Task {
|
Line 169 sub start_Task {
|
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
&Apache::structuretags::page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); |
|
|
if ($target eq 'web') { |
if ($target eq 'web') { |
$body_tag_start.=&add_previous_version_button(); |
|
if ($Apache::lonhomework::modifygrades) { |
if ($Apache::lonhomework::modifygrades) { |
$body_tag_start.='<form name="gradesubmission" method="POST" action="'; |
$body_tag_start.='<form name="gradesubmission" method="POST" action="'; |
my $uri=$env{'request.uri'}; |
my $uri=$env{'request.uri'}; |
Line 117 sub start_Task {
|
Line 176 sub start_Task {
|
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>"; |
$body_tag_start.=$uri.'">'.&add_grading_button()."</form>"; |
} |
} |
} |
} |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
if ($target eq 'web' || ($target eq 'grade' && !$env{'form.webgrade'}) || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
|
my ($version,$previous)=&get_version(); |
($status,$accessmsg,my $slot_name,$slot) = |
($status,$accessmsg,my $slot_name,$slot) = |
&Apache::lonhomework::check_task_access('0'); |
&Apache::lonhomework::check_task_access('0'); |
push(@Apache::inputtags::status,$status); |
push(@Apache::inputtags::status,$status); |
$Apache::inputtags::slot_name=$slot_name; |
$Apache::inputtags::slot_name=$slot_name; |
my $expression='$external::datestatus="'.$status.'";'; |
my $expression='$external::datestatus="'.$status.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";'; |
$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$version.solved"}.'";'; |
&Apache::run::run($expression,$safeeval); |
&Apache::run::run($expression,$safeeval); |
&Apache::lonxml::debug("Got $status"); |
&Apache::lonxml::debug("Got $status"); |
if (( $status eq 'CLOSED' ) || |
$body_tag_start.=&add_previous_version_button($status); |
( $status eq 'BANNED') || |
if (!$previous && ( |
( $status eq 'UNAVAILABLE') || |
( $status eq 'CLOSED' ) || |
( $status eq 'NOT_IN_A_SLOT') || |
( $status eq 'BANNED') || |
( $status eq 'NEEDS_CHECKIN') || |
( $status eq 'UNAVAILABLE') || |
( $status eq 'INVALID_ACCESS')) { |
( $status eq 'NOT_IN_A_SLOT') || |
|
( $status eq 'NEEDS_CHECKIN') || |
|
( $status eq 'WAITING_FOR_GRADE') || |
|
( $status eq 'INVALID_ACCESS') )) { |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
if ( $target eq "web" ) { |
if ( $target eq "web" ) { |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
$result.= $head_tag_start.'</head>'.$body_tag_start; |
Line 144 sub start_Task {
|
Line 207 sub start_Task {
|
} elsif ($status eq 'NEEDS_CHECKIN') { |
} elsif ($status eq 'NEEDS_CHECKIN') { |
$msg.='<h1>'.&mt('You need the Proctor to validate you.'). |
$msg.='<h1>'.&mt('You need the Proctor to validate you.'). |
'</h1>'.&proctor_validation_screen($slot); |
'</h1>'.&proctor_validation_screen($slot); |
|
} elsif ($status eq 'WAITING_FOR_GRADE') { |
|
$msg.='<h1>'.&mt('Your submission is in the grading queue.').'</h1>'; |
} elsif ($status ne 'NOT_YET_VIEWED') { |
} elsif ($status ne 'NOT_YET_VIEWED') { |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
$msg.='<h1>'.&mt('Not open to be viewed').'</h1>'; |
} |
} |
Line 158 sub start_Task {
|
Line 223 sub start_Task {
|
} else { |
} else { |
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
$result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm "; |
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade' && !$env{'form.webgrade'}) { |
if ($status eq 'NEEDS_CHECKIN') { |
if ($status eq 'NEEDS_CHECKIN') { |
if (&proctor_check_auth($slot)) { |
if (&proctor_check_auth($slot_name,$slot)) { |
#FIXME immeadiatly add this to the grading queue |
#FIXME immeadiatly add this to the grading queue |
# with slot->{'endtime'} for when grading can |
# with slot->{'endtime'} for when grading can |
# begin on this resource |
# begin on this resource |
|
# FIXME I think the above is done by default, |
|
# need to check that |
|
# failure doesn't do this. |
} |
} |
} |
} |
} |
} |
Line 179 sub start_Task {
|
Line 247 sub start_Task {
|
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
'" value="'.$env{"form.grade_$field"}.'" />'."\n"; |
} |
} |
} |
} |
|
my ($version,$previous)=&get_version(); |
|
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
|
$result.='<h1><font color="red">'.&mt('Did not pass').'</font></h1>'; |
|
if (!$previous) { |
|
$result.=&add_request_another_attempt_button(); |
|
} |
|
} |
|
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass') { |
|
$result.='<h1><font color="green">'.&mt('Passed').'</font></h1>'; |
|
} |
|
} |
|
} elsif ( ($target eq 'grade' && $env{'form.webgrade'}) || |
|
$target eq 'webgrade') { |
|
if ($target eq 'webgrade') { |
|
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
|
$result.='<input type="hidden" name="webgrade" value="yes" />'; |
|
$result.=&show_queue(); |
} |
} |
} elsif ($target eq 'webgrade') { |
|
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
|
$result.='<input type="hidden" name="webgrade" value="yes" />'; |
|
$result.=&show_queue(); |
|
my $todo=&get_from_queue(); |
my $todo=&get_from_queue(); |
if ($todo) { |
if ($todo) { |
&setup_env_for_other_user($todo,$safeeval); |
&setup_env_for_other_user($todo,$safeeval); |
Line 197 sub start_Task {
|
Line 278 sub start_Task {
|
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
$result.="\n".'<table width="100%" style="width:100%" border="1">'; |
$result.="\n".'<table width="100%" style="width:100%" border="1">'; |
} else { |
} else { |
$result.="\n". |
if ($target eq 'webgrade') { |
'<table><tr><td>No user to be graded.</td></tr></table>'; |
$result.="\n". |
|
'<table><tr><td>No user to be graded.</td></tr></table>'; |
|
} |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/task",$parser); |
} |
} |
|
|
} else { |
} else { |
# page_start returned a starting result, delete it if we don't need it |
# page_start returned a starting result, delete it if we don't need it |
$result = ''; |
$result = ''; |
Line 213 sub end_Task {
|
Line 295 sub end_Task {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result=''; |
my $result=''; |
my $status=$Apache::inputtags::status['-1']; |
my $status=$Apache::inputtags::status['-1']; |
|
my ($version,$previous)=&get_version(); |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || |
$target eq 'tex') { |
$target eq 'tex') { |
if ( |
if ( |
Line 220 sub end_Task {
|
Line 303 sub end_Task {
|
($target eq 'answer') || ($target eq 'tex') |
($target eq 'answer') || ($target eq 'tex') |
) { |
) { |
if ($target eq 'web') { |
if ($target eq 'web') { |
if ($status eq 'CAN_ANSWER') { |
if ($status eq 'CAN_ANSWER' && !$previous) { |
$result.="\n".'<table border="1">'. |
$result.="\n".'<table border="1">'. |
&Apache::inputtags::file_selector('0',"bridgetask","*", |
&Apache::inputtags::file_selector("$version.0", |
|
"bridgetask","*", |
'portfolioonly'). |
'portfolioonly'). |
"</table>"; |
"</table>"; |
$result.=&Apache::inputtags::gradestatus('0'); |
$result.=&Apache::inputtags::gradestatus('0'); |
Line 232 sub end_Task {
|
Line 316 sub end_Task {
|
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.=&Apache::lonxml::xmlend().'</html>'; |
} |
} |
} |
} |
if ($target eq 'grade' && !$env{'form.webgrade'}) { |
if ($target eq 'grade' && !$env{'form.webgrade'} && !$previous) { |
my $award='SUBMITTED'; |
my $award='SUBMITTED'; |
&Apache::essayresponse::file_submission('0','bridgetask', |
&Apache::essayresponse::file_submission("$version.0",'bridgetask', |
'portfiles',\$award); |
'portfiles',\$award); |
if ($award eq 'SUBMITTED' && |
if ($award eq 'SUBMITTED' && |
$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.$version.0.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.0.tries"}= |
$Apache::lonhomework::results{"resource.0.tries"}= |
1+$Apache::lonhomework::history{"resource.0.tries"}; |
$Apache::lonhomework::results{"resource.$version.0.tries"}= |
|
1+$Apache::lonhomework::history{"resource.$version.0.tries"}; |
|
|
|
$Apache::lonhomework::results{"resource.0.award"}= |
|
$Apache::lonhomework::results{"resource.$version.0.award"}= |
|
$award; |
} |
} |
$Apache::lonhomework::results{"resource.0.award"}=$award; |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
&Apache::structuretags::finalize_storage(); |
&Apache::structuretags::finalize_storage(); |
if ($award eq 'SUBMITTED') { |
if ($award eq 'SUBMITTED') { |
Line 256 sub end_Task {
|
Line 344 sub end_Task {
|
my $mandatory_failed=0; |
my $mandatory_failed=0; |
my $ungraded=0; |
my $ungraded=0; |
my $review=0; |
my $review=0; |
|
&Apache::lonhomework::showhash(%Apache::lonhomework::results); |
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
my $status= |
my $status= |
$Apache::lonhomeork::results{"resource.$dim_id.status"}; |
$Apache::lonhomework::results{"resource.$version.$dim_id.status"}; |
my $mandatory= |
my $mandatory= |
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); |
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); |
if ($status eq 'pass') { |
if ($status eq 'pass') { |
Line 274 sub end_Task {
|
Line 363 sub end_Task {
|
if ($optional_passed < $optional_required) { |
if ($optional_passed < $optional_required) { |
$mandatory_failed++; |
$mandatory_failed++; |
} |
} |
$Apache::lonhomeork::results{'resource.grader'}= |
&Apache::lonxml::debug("all dim ".join(':',@Apache::bridgetask::dimensionlist)."results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
|
$Apache::lonhomework::results{'resource.grader'}= |
$env{'user.name'}.'@'.$env{'user.domain'}; |
$env{'user.name'}.'@'.$env{'user.domain'}; |
if ($review) { |
if ($review) { |
$Apache::lonhomeork::results{'resource.status'}='review'; |
$Apache::lonhomework::results{"resource.$version.status"}='review'; |
&move_to_review_queue(); |
&move_to_review_queue(); |
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomeork::results{'resource.status'}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.status"}='ungraded'; |
&check_queue_unlock(); |
&check_queue_unlock(); |
} elsif ($mandatory_failed) { |
} elsif ($mandatory_failed) { |
$Apache::lonhomeork::results{'resource.status'}='fail'; |
$Apache::lonhomework::results{"resource.$version.status"}='fail'; |
$Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='incorrect_by_override'; |
|
$Apache::lonhomework::results{"resource.$version.0.award"}='INCORRECT'; |
|
$Apache::lonhomework::results{"resource.$version.0.awarded"}='0'; |
&remove_from_queue(); |
&remove_from_queue(); |
} else { |
} else { |
$Apache::lonhomeork::results{'resource.status'}='pass'; |
$Apache::lonhomework::results{"resource.$version.status"}='pass'; |
$Apache::lonhomework::results{"resource.0.award"}='INCORRECT'; |
$Apache::lonhomework::results{"resource.$version.0.solved"}='correct_by_override'; |
|
$Apache::lonhomework::results{"resource.$version.0.award"}='EXACT_ANS'; |
|
$Apache::lonhomework::results{"resource.$version.0.awarded"}='1'; |
&remove_from_queue(); |
&remove_from_queue(); |
} |
} |
|
$Apache::lonhomework::results{"resource.status"}= |
|
$Apache::lonhomework::results{"resource.$version.status"}; |
|
if (defined($Apache::lonhomework::results{"resource.$version.0.awarded"})) { |
|
$Apache::lonhomework::results{"resource.0.award"}= |
|
$Apache::lonhomework::results{"resource.$version.award"}; |
|
$Apache::lonhomework::results{"resource.0.awarded"}= |
|
$Apache::lonhomework::results{"resource.$version.awarded"}; |
|
$Apache::lonhomework::results{"resource.0.solved"}= |
|
$Apache::lonhomework::results{"resource.$version.solved"}; |
|
} |
|
&Apache::structuretags::finalize_storage(); |
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
$result.="</table>\n<hr />"; |
$result.="</table>\n<hr />"; |
Line 312 sub end_Task {
|
Line 417 sub end_Task {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub move_to_review_queue { |
|
&Apache::lonxml::debug("Want to move"); |
|
} |
|
|
|
sub check_queue_unlock { |
|
&Apache::lonxml::debug("Want to unlock?"); |
|
} |
|
|
|
sub remove_from_queue { |
|
my ($symb,$cid,$udom,$uname)=&Apache::lonxml::whichuser(); |
|
my $cnum=$env{'course.'.$cid.'.num'}; |
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
|
my $key="$symb\0queue\0$uname\@$udom"; |
|
my @keys=($key,"$key\0locked"); |
|
&Apache::lonnet::del('gradingqueue',\@keys,$cdom,$cnum); |
|
} |
|
|
sub setup_env_for_other_user { |
sub setup_env_for_other_user { |
my ($queue_key,$safeeval)=@_; |
my ($queue_key,$safeeval)=@_; |
my ($symb,$uname,$udom)=&decode_queue_key($queue_key); |
my ($symb,$uname,$udom)=&decode_queue_key($queue_key); |
Line 338 sub show_queue {
|
Line 460 sub show_queue {
|
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $cdom=$env{'course.'.$cid.'.domain'}; |
my $regexp="^$symb\0"; |
my $regexp="^$symb\0"; |
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
my %queue=&Apache::lonnet::dump('gradingqueue',$cdom,$cnum,$regexp); |
$result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>". |
$result.="\n<h3>Current Queue</h3><table border='1'><tr><th>resource</th>". |
"<th>user</th><th>type</th><th>data</th></tr>"; |
"<th>user</th><th>type</th><th>data</th></tr>"; |
foreach my $key (sort(keys(%queue))) { |
foreach my $key (sort(keys(%queue))) { |
if ($key=~/locked$/) { |
if ($key=~/locked$/) { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
$result.="<tr><td>$title</td><td>$uname</td>"; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
$result.='<td>lock</td><td>'.$queue{$key}.'</td></tr>'; |
} elsif ($key=~/timestamp$/) { |
} elsif ($key=~/timestamp$/) { |
my ($symb,undef) = split("\0",$key); |
my ($symb,undef) = split("\0",$key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td></td><td>"; |
$result.="<tr><td>$title</td><td></td>"; |
$result.='<td>last queue modification time</td><td>'. |
$result.='<td>last queue modification time</td><td>'. |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
&Apache::lonlocal::locallocaltime($queue{$key})."</td></tr>"; |
} else { |
} else { |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my ($symb,$uname,$udom) = &decode_queue_key($key); |
my $title=&Apache::lonnet::gettitle($symb); |
my $title=&Apache::lonnet::gettitle($symb); |
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
$result.="<tr><td>$title</td><td>$uname</td>"; |
my $slot=$queue{$key}->[0]; |
my $slot=$queue{$key}->[0]; |
my %slot_data=&Apache::lonnet::get_slot($slot); |
my %slot_data=&Apache::lonnet::get_slot($slot); |
$result.='<td>queue entry</td><td>End time: '. |
$result.='<td>queue entry</td><td>Slot: '.$slot.' End time: '. |
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}). |
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}). |
"</td></tr>"; |
"</td></tr>"; |
} |
} |
Line 546 sub get_instance {
|
Line 668 sub get_instance {
|
#then start repicking |
#then start repicking |
&Apache::response::pushrandomnumber(); |
&Apache::response::pushrandomnumber(); |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
my @order=&Math::Random::random_permutation(@{$dimension{'instances'}}); |
return $order[0]; |
my $num=@order; |
|
my $version=&get_version(); |
|
my $which=($version-1)%$num; |
|
return $order[$which]; |
} |
} |
|
|
{ |
{ |
Line 554 sub get_instance {
|
Line 679 sub get_instance {
|
sub end_Dimension { |
sub end_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $result; |
my $result; |
|
my $dim=&get_id($parstack,$safeeval); |
my $instance=&get_instance(); |
my $instance=&get_instance(); |
|
my $version=&get_version(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
|
if ($Apache::lonhomework::history{"resource.$version.status"} eq 'pass' || |
|
$Apache::lonhomework::history{"resource.$version.status"} eq 'fail') { |
|
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
|
my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; |
|
my $comment=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}; |
|
$result.='<table border="1"><tr><td>'; |
|
if ($status eq 'fail') { |
|
$result.='<font color="red">'.&mt('Did not pass').'</font>'; |
|
} elsif ($status eq 'pass') { |
|
$result.='<font color="green">'.&mt('Passed').'</font>'; |
|
} else { |
|
&Apache::lonxml::error("Student viewing a graded bridgetask was show a status of $status"); |
|
} |
|
$result.='</td></tr><tr><td>'; |
|
if ($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}) { |
|
$result.=&mt('Comment from grader: ').$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}.'</td></tr><tr><td>'; |
|
} |
|
$result.=$dimension{$instance.'.criteria.'.$id}. |
|
'</td></tr></table>'; |
|
} |
|
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $link='criteria_'.$instance.'_'.$id; |
my $link='criteria_'.$instance.'_'.$id; |
my $status=$Apache::lonhomeork::history{'resource.'.$instance.'.'.$id.'.status'}; |
my $status=$Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.status"}; |
$result.='<tr><td width="100%" valign="top">'. |
$result.='<tr><td width="100%" valign="top">'. |
'<a name="'.$link.'" />'. |
'<a name="'.$link.'" />'. |
'<a name="next_'.$last_link.'" />'. |
'<a name="next_'.$last_link.'" />'. |
Line 568 sub get_instance {
|
Line 716 sub get_instance {
|
#$dimension{$instance.'.criteria.'.$id}. |
#$dimension{$instance.'.criteria.'.$id}. |
'</td>'. |
'</td>'. |
'<td><nobr>Additional Comment for Student</nobr> <br />'. |
'<td><nobr>Additional Comment for Student</nobr> <br />'. |
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomeork::history{'resource.'.$instance.'.'.$id.'.comment'}).'</textarea>'. |
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'">'.&HTML::Entities::encode($Apache::lonhomework::history{"resource.$version.$dim.$instance.$id.comment"}).'</textarea>'. |
'</td>'. |
'</td>'. |
'<td>'. |
'<td>'. |
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'. |
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'. |
Line 582 sub get_instance {
|
Line 730 sub get_instance {
|
'<input type="submit" name="next" value="'. |
'<input type="submit" name="next" value="'. |
&mt('Done').'" /> '. |
&mt('Done').'" /> '. |
'</td></tr>'; |
'</td></tr>'; |
|
$result.='<tr><td colspan="4">'; |
|
my (undef,undef,$udom,$uname) = &Apache::lonxml::whichuser(); |
|
my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio'; |
|
foreach my $partial_file (split(',',$Apache::lonhomework::history{"resource.$version.bridgetask.portfiles"})) { |
|
my $file=$file_url.$partial_file; |
|
&Apache::lonnet::allowuploaded('/adm/bridgetask',$file); |
|
$result.='<a href="'.$file.'" target="lonGRDs"><img src="'. |
|
&Apache::loncommon::icon($file).'" border=0"> '.$file. |
|
'</a>'; |
|
} |
|
$result.='</td></tr>'; |
$last_link=$link; |
$last_link=$link; |
} |
} |
} elsif ($target eq 'grade') { |
} elsif ($target eq 'grade' && $env{'form.webgrade'}) { |
my $optional_passed=0; |
my $optional_passed=0; |
my $mandatory_failed=0; |
my $mandatory_failed=0; |
my $ungraded=0; |
my $ungraded=0; |
my $review=0; |
my $review=0; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $status=$Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; |
my $status=$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.status"}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; |
$Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_'.$instance.'_'.$id}; |
$Apache::lonhomework::results{"resource.$version.$dim.$instance.$id.comment"}=$env{'form.HWVAL_comment_criteria_'.$instance.'_'.$id}; |
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); |
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); |
if ($status eq 'pass') { |
if ($status eq 'pass') { |
if (!$mandatory) { $optional_passed++; } |
if (!$mandatory) { $optional_passed++; } |
} elsif ($status eq 'fail') { |
} elsif ($status eq 'fail') { |
if ($mandatory) { $mandatory_failed++; } |
if ($mandatory) { $mandatory_failed++; } |
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
|
} elsif ($status eq 'review') { |
} elsif ($status eq 'review') { |
$review++; |
$review++; |
|
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
|
} else { |
|
&Apache::lonxml::error("got weird status --$status--"); |
} |
} |
} |
} |
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { |
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { |
$mandatory_failed++; |
$mandatory_failed++; |
} |
} |
|
&Apache::lonxml::debug("all instance ".join(':',@{$dimension{$instance.'.criterias'}})." results -> m_f $mandatory_failed o_p $optional_passed u $ungraded r $review"); |
if ($review) { |
if ($review) { |
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='review'; |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
|
'review'; |
} elsif ($ungraded) { |
} elsif ($ungraded) { |
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='ungraded'; |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
|
'ungraded'; |
} elsif ($mandatory_failed) { |
} elsif ($mandatory_failed) { |
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='fail'; |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
|
'fail'; |
} else { |
} else { |
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='pass'; |
$Apache::lonhomework::results{"resource.$version.$dim.status"}= |
|
'pass'; |
} |
} |
} |
} |
return $result; |
return $result; |
Line 677 sub end_InstanceText {
|
Line 843 sub end_InstanceText {
|
|
|
sub start_Criteria { |
sub start_Criteria { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { |
&Apache::lonxml::startredirection(); |
&Apache::lonxml::startredirection(); |
} |
} |
return ''; |
return ''; |
Line 686 sub start_Criteria {
|
Line 852 sub start_Criteria {
|
sub end_Criteria { |
sub end_Criteria { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $instance_id=$Apache::bridgetask::instance[-1]; |
my $instance_id=$Apache::bridgetask::instance[-1]; |
if ($target eq 'web' || $target eq 'webgrade') { |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade') { |
my $criteria=&Apache::lonxml::endredirection(); |
my $criteria=&Apache::lonxml::endredirection(); |
my $id=&get_id($parstack,$safeeval); |
my $id=&get_id($parstack,$safeeval); |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |