version 1.16, 2005/05/03 06:44:56
|
version 1.20, 2005/05/10 16:03:44
|
Line 48 sub initialize_bridgetask {
|
Line 48 sub initialize_bridgetask {
|
$Apache::bridgetask::dimension=''; |
$Apache::bridgetask::dimension=''; |
# list of all Dimension ids seen |
# list of all Dimension ids seen |
@Apache::bridgetask::dimensionlist=(); |
@Apache::bridgetask::dimensionlist=(); |
|
# mandatory attribute of all Dimensions seen |
|
%Apache::bridgetask::dimensionmandatory=(); |
# list of all current Instance ids |
# list of all current Instance ids |
@Apache::bridgetask::instance=(); |
@Apache::bridgetask::instance=(); |
# list of all Instance ids seen in this problem |
# list of all Instance ids seen in this problem |
Line 180 sub start_Task {
|
Line 182 sub start_Task {
|
} |
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
$result.=$head_tag_start.$body_tag_start.$form_tag_start; |
$result.= |
$result.='<input type="hidden" name="webgrade" value="yes" />'; |
'<input type="hidden" name="grade_target" value="webgrade" />'; |
|
$result.=&show_queue(); |
$result.=&show_queue(); |
my $todo=&get_from_queue(); |
my $todo=&get_from_queue(); |
if ($todo) { |
if ($todo) { |
Line 194 sub start_Task {
|
Line 195 sub start_Task {
|
$Apache::bridgetask::queue_key=$todo; |
$Apache::bridgetask::queue_key=$todo; |
&Apache::structuretags::initialize_storage(); |
&Apache::structuretags::initialize_storage(); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
&Apache::lonhomework::showhash(%Apache::lonhomework::history); |
|
$result.="\n".'<table width="100%" style="width:100%" border="1">'; |
} else { |
} else { |
$result.="\n". |
$result.="\n". |
'<table><tr><td>No user to be graded.</td></tr></table>'; |
'<table><tr><td>No user to be graded.</td></tr></table>'; |
Line 230 sub end_Task {
|
Line 232 sub end_Task {
|
$result.=&Apache::lonxml::xmlend().'</html>'; |
$result.=&Apache::lonxml::xmlend().'</html>'; |
} |
} |
} |
} |
if ($target eq 'grade') { |
if ($target eq 'grade' && !$env{'form.webgrade'}) { |
my $award='SUBMITTED'; |
my $award='SUBMITTED'; |
&Apache::essayresponse::file_submission('0','bridgetask','portfiles',\$award); |
&Apache::essayresponse::file_submission('0','bridgetask', |
|
'portfiles',\$award); |
if ($award eq 'SUBMITTED' && |
if ($award eq 'SUBMITTED' && |
$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.0.bridgetask.portfiles"}) { |
$Apache::lonhomework::results{"resource.0.tries"}= |
$Apache::lonhomework::results{"resource.0.tries"}= |
Line 245 sub end_Task {
|
Line 248 sub end_Task {
|
&add_to_queue(); |
&add_to_queue(); |
} |
} |
} |
} |
|
if ($target eq 'grade' && $env{'form.webgrade'}) { |
|
my $optional_required= |
|
&Apache::lonxml::get_param('OptionalRequired',$parstack, |
|
$safeeval); |
|
my $optional_passed=0; |
|
my $mandatory_failed=0; |
|
my $ungraded=0; |
|
my $review=0; |
|
foreach my $dim_id (@Apache::bridgetask::dimensionlist) { |
|
my $status= |
|
$Apache::lonhomeork::results{"resource.$dim_id.status"}; |
|
my $mandatory= |
|
($Apache::bridgetask::dimensionmandatory{$dim_id} ne 'N'); |
|
if ($status eq 'pass') { |
|
if (!$mandatory) { $optional_passed++; } |
|
} elsif ($status eq 'fail') { |
|
if ($mandatory) { $mandatory_failed++; } |
|
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
|
} elsif ($status eq 'review') { |
|
$review++; |
|
} |
|
} |
|
if ($optional_passed < $optional_required) { |
|
$mandatory_failed++; |
|
} |
|
$Apache::lonhomeork::results{'resource.grader'}= |
|
$env{'user.name'}.'@'.$env{'user.domain'}; |
|
if ($review) { |
|
$Apache::lonhomeork::results{'resource.status'}='review'; |
|
&move_to_review_queue(); |
|
} elsif ($ungraded) { |
|
$Apache::lonhomeork::results{'resource.status'}='ungraded'; |
|
&check_queue_unlock(); |
|
} elsif ($mandatory_failed) { |
|
$Apache::lonhomeork::results{'resource.status'}='fail'; |
|
$Apache::lonhomework::results{"resource.0.award"}='EXACT_ANS'; |
|
&remove_from_queue(); |
|
} else { |
|
$Apache::lonhomeork::results{'resource.status'}='pass'; |
|
$Apache::lonhomework::results{"resource.0.award"}='INCORRECT'; |
|
&remove_from_queue(); |
|
} |
|
} |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
$result.="\n<hr />"; |
$result.="</table>\n<hr />"; |
$result.='<input type="submit" name="next" value="'. |
#$result.='<input type="submit" name="next" value="'. |
&mt('Save & Next').'" /> '; |
# &mt('Save & Next').'" /> '; |
$result.='<input type="submit" name="end" value="'. |
#$result.='<input type="submit" name="end" value="'. |
&mt('Save & Stop Grading').'" /> '; |
# &mt('Save & Stop Grading').'" /> '; |
$result.='<input type="submit" name="end" value="'. |
#$result.='<input type="submit" name="throwaway" value="'. |
&mt('Throw Away & Stop Grading').'" /> '; |
# &mt('Throw Away & Stop Grading').'" /> '; |
|
#$result.='<input type="submit" name="save" value="'. |
|
# &mt('Save Partial Grade and Continue Grading').'" /> '; |
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>'; |
$result.='</form>'.&Apache::loncommon::endbodytag().'</html>'; |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
$result.='<parameter part="0" package="Task"></parameter>'."\n"; |
$result.='<parameter part="0" package="Task"></parameter>'."\n"; |
Line 289 sub show_queue {
|
Line 338 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><th>user</th><th>type</th><th>data</th></tr>"; |
$result.="\n<h3>Current Queue</h3><table><tr><th>resource</th>". |
|
"<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); |
Line 308 sub show_queue {
|
Line 358 sub show_queue {
|
$result.="<tr><td>$title</td><td>$uname</td><td>"; |
$result.="<tr><td>$title</td><td>$uname</td><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: '.&Apache::lonlocal::locallocaltime($slot_data{'endtime'})."</td></tr>"; |
$result.='<td>queue entry</td><td>End time: '. |
|
&Apache::lonlocal::locallocaltime($slot_data{'endtime'}). |
|
"</td></tr>"; |
} |
} |
} |
} |
$result.="</table><hr />\n"; |
$result.="</table><hr />\n"; |
Line 338 sub pick_from_queue_data {
|
Line 390 sub pick_from_queue_data {
|
my ($symb,$uname,$udom)=&decode_queue_key($key); |
my ($symb,$uname,$udom)=&decode_queue_key($key); |
if ($check_section) { |
if ($check_section) { |
my $section=&Apache::lonnet::getsection($uname,$udom); |
my $section=&Apache::lonnet::getsection($uname,$udom); |
if ($section ne $check_section) { |
if ($section eq $check_section) { |
&Apache::lonnet::logthis("not my sec"); |
&Apache::lonnet::logthis("my sec"); |
next; |
next; |
} |
} |
} |
} |
Line 468 sub end_ClosingParagraph {
|
Line 520 sub end_ClosingParagraph {
|
return $result; |
return $result; |
} |
} |
|
|
|
sub get_id { |
|
my ($parstack,$safeeval)=@_; |
|
my $id=&Apache::lonxml::get_param('id',$parstack,$safeeval); |
|
if (!$id) { $id=$Apache::lonxml::curdepth; } |
|
return $id; |
|
} |
|
|
my %dimension; |
my %dimension; |
sub start_Dimension { |
sub start_Dimension { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
undef(%dimension); |
undef(%dimension); |
my $dim_id=$Apache::lonxml::curdepth; |
my $dim_id=&get_id($parstack,$safeeval); |
$Apache::bridgetask::dimension=$dim_id; |
$Apache::bridgetask::dimension=$dim_id; |
push(@Apache::bridgetask::dimensionlist,$dim_id); |
push(@Apache::bridgetask::dimensionlist,$dim_id); |
undef(@Apache::bridgetask::instance); |
undef(@Apache::bridgetask::instance); |
|
$Apache::bridgetask::dimensionmandatory{$dim_id}= |
|
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
return ''; |
return ''; |
} |
} |
|
|
Line 488 sub get_instance {
|
Line 549 sub get_instance {
|
return $order[0]; |
return $order[0]; |
} |
} |
|
|
sub end_Dimension { |
{ |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my $last_link; |
my $result; |
sub end_Dimension { |
if ($target eq 'web') { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
|
my $result; |
my $instance=&get_instance(); |
my $instance=&get_instance(); |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
if ($target eq 'web') { |
} elsif ($target eq 'webgrade') { |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
my $instance=&get_instance(); |
} elsif ($target eq 'webgrade') { |
$result.="\n".'<table>'; |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $link='criteria_'.$instance.'_'.$id; |
$result.='<tr><td>'. |
my $status=$Apache::lonhomeork::history{'resource.'.$instance.'.'.$id.'.status'}; |
$dimension{$instance.'.criteria.'.$id}.'</td></tr>'; |
$result.='<tr><td width="100%" valign="top">'. |
|
'<a name="'.$link.'" />'. |
|
'<a name="next_'.$last_link.'" />'. |
|
'<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'. |
|
#$dimension{$instance.'.criteria.'.$id}. |
|
'</td>'. |
|
'<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>'. |
|
'</td>'. |
|
'<td>'. |
|
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" '.($status eq 'ungraded' || !$status ? 'checked="checked"':'').'/>Ungraded</label></nobr><br />'. |
|
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" '.($status eq 'pass' ? 'checked="checked"':'').' />Pass</label><br />'. |
|
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" '.($status eq 'fail' ? 'checked="checked"':'').' />Fail</label><br />'. |
|
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" '.($status eq 'review' ? 'checked="checked"':'').' />Review</label><br />'. |
|
'</td>'. |
|
'<td>'. |
|
'<a href="#'.$last_link.'">Prev</a><br />'. |
|
'<a href="#next_'.$link.'">Next</a><br /><br /><br />'. |
|
'<input type="submit" name="next" value="'. |
|
&mt('Done').'" /> '. |
|
'</td></tr>'; |
|
$last_link=$link; |
|
} |
|
} elsif ($target eq 'grade') { |
|
my $optional_passed=0; |
|
my $mandatory_failed=0; |
|
my $ungraded=0; |
|
my $review=0; |
|
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
|
my $status=$Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.status'}=$env{'form.HWVAL_criteria_'.$instance.'_'.$id}; |
|
$Apache::lonhomeork::results{'resource.'.$instance.'.'.$id.'.comment'}=$env{'form.HWVAL_comment_'.$instance.'_'.$id}; |
|
my $mandatory=($dimension{$instance.'.criteria.'.$id.'.mandatory'} ne 'N'); |
|
if ($status eq 'pass') { |
|
if (!$mandatory) { $optional_passed++; } |
|
} elsif ($status eq 'fail') { |
|
if ($mandatory) { $mandatory_failed++; } |
|
} elsif ($status eq 'ungraded') { |
|
$ungraded++; |
|
} elsif ($status eq 'review') { |
|
$review++; |
|
} |
|
} |
|
if ($optional_passed < $dimension{$instance.'.optionalrequired'}) { |
|
$mandatory_failed++; |
|
} |
|
if ($review) { |
|
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='review'; |
|
} elsif ($ungraded) { |
|
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='ungraded'; |
|
} elsif ($mandatory_failed) { |
|
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='fail'; |
|
} else { |
|
$Apache::lonhomeork::results{'resource.'.$instance.'.status'}='pass'; |
|
} |
} |
} |
$result.='</table>'; |
return $result; |
} |
} |
return $result; |
|
} |
} |
|
|
sub start_IntroParagraph { |
sub start_IntroParagraph { |
Line 530 sub end_IntroParagraph {
|
Line 644 sub end_IntroParagraph {
|
|
|
sub start_Instance { |
sub start_Instance { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
push(@{$dimension{'instances'}},$Apache::lonxml::curdepth); |
my $id=&get_id($parstack,$safeeval); |
push(@Apache::bridgetask::instance,$Apache::lonxml::curdepth); |
push(@{$dimension{'instances'}},$id); |
push(@Apache::bridgetask::instancelist,$Apache::lonxml::curdepth); |
push(@Apache::bridgetask::instance,$id); |
|
push(@Apache::bridgetask::instancelist,$id); |
|
$dimension{$id.'.optionalrequired'}= |
|
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
return ''; |
return ''; |
} |
} |
|
|
Line 571 sub end_Criteria {
|
Line 688 sub end_Criteria {
|
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') { |
my $criteria=&Apache::lonxml::endredirection(); |
my $criteria=&Apache::lonxml::endredirection(); |
my $id=$Apache::lonxml::curdepth; |
my $id=&get_id($parstack,$safeeval); |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |
$dimension{$instance_id.'.criteria.'.$id}=$criteria; |
|
$dimension{$instance_id.'.criteria.'.$id.'.mandatory'}= |
|
&Apache::lonxml::get_param('Mandatory',$parstack,$safeeval); |
push(@{$dimension{$instance_id.'.criterias'}},$id); |
push(@{$dimension{$instance_id.'.criterias'}},$id); |
} |
} |
return ''; |
return ''; |