version 1.18, 2005/05/06 20:26:35
|
version 1.19, 2005/05/09 21:55:01
|
Line 469 sub end_ClosingParagraph {
|
Line 469 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); |
Line 494 sub get_instance {
|
Line 501 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 $instance=&get_instance(); |
if ($target eq 'web') { |
if ($target eq 'web') { |
my $instance=&get_instance(); |
|
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
$result=$dimension{'intro'}.$dimension{$instance.'.text'}; |
} elsif ($target eq 'webgrade') { |
} elsif ($target eq 'webgrade') { |
my $instance=&get_instance(); |
|
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
my $link='criteria_'.$instance.'_'.$id; |
my $link='criteria_'.$instance.'_'.$id; |
$result.='<tr><td 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.'" />'. |
'<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'. |
'<br /><textarea enabled="false" style="width:100%" rows="8" width="25" wrap="hard">'.$dimension{$instance.'.criteria.'.$id}.'</textarea>'. |
#$dimension{$instance.'.criteria.'.$id}. |
#$dimension{$instance.'.criteria.'.$id}. |
'</td>'. |
'</td>'. |
'<td>Additional Comment for Student <br />'. |
'<td><nobr>Additional Comment for Student</nobr> <br />'. |
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'. |
'<textarea style="width:100%" rows="8" width="25" wrap="hard" name="HWVAL_comment_'.$link.'"></textarea>'. |
'</td>'. |
'</td>'. |
'<td>'. |
'<td>'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label><br />'. |
'<nobr><label><input type="radio" name="HWVAL_'.$link.'" value="ungraded" />Ungraded</label></nobr><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="pass" />Pass</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="fail" />Fail</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'. |
'<label><input type="radio" name="HWVAL_'.$link.'" value="review" />Review</label><br />'. |
Line 522 sub get_instance {
|
Line 528 sub get_instance {
|
'</td></tr>'; |
'</td></tr>'; |
$last_link=$link; |
$last_link=$link; |
} |
} |
|
} elsif ($target eq 'grade') { |
|
my $optional_passed=0; |
|
foreach my $id (@{$dimension{$instance.'.criterias'}}) { |
|
if ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'pass') { |
|
} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'fail') { |
|
} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'ungraded') { |
|
} elsif ($env{'form.HWVAL_criteria_'.$instance.'_'.$id} eq 'review') { |
|
} |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 551 sub end_IntroParagraph {
|
Line 566 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{$instance_id.'.optionalrequired'}= |
|
&Apache::lonxml::get_param('OptionalRequired',$parstack,$safeeval); |
return ''; |
return ''; |
} |
} |
|
|
Line 592 sub end_Criteria {
|
Line 610 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 ''; |