Diff for /loncom/homework/templates/examupload.problem between versions 1.13 and 1.15

version 1.13, 2010/05/27 16:56:20 version 1.15, 2011/05/21 14:50:40
Line 6 Line 6
 <parameter name="handgrade" description="Hand Grade" default="yes" type="string_yesno" />  <parameter name="handgrade" description="Hand Grade" default="yes" type="string_yesno" />
   
 <script type="loncapa/perl">  <script type="loncapa/perl">
 $weight=&EXT('resource.0.weight');  $weight=&parameter_setting('weight');
 if ((!defined($weight)) || ($weight eq '')) { $weight=1; }  if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
 $awarded=&EXT('user.resource.resource.0.awarded');  $awarded=&stored_data('awarded');
 if (!defined($awarded)) { $awarded=0; }  if (!defined($awarded)) { $awarded=0; }
 $scoreformat=&EXT('resource.0.scoreformat');  $scoreformat=&parameter_setting('scoreformat');
 if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }  if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
 $display='';  $display='';
 if (&EXT('resource.0.problemstatus')!~/^no/) {  if (&parameter_setting('problemstatus')!~/^no/) {
    if (!defined($awarded)) {     if (!defined($awarded)) {
       $display=$weight.' possible points.';        $display=$weight.' possible points.';
    } else {     } else {
Line 21  if (&EXT('resource.0.problemstatus')!~/^ Line 21  if (&EXT('resource.0.problemstatus')!~/^
             $weight.' possible points.';              $weight.' possible points.';
    }     }
 }  }
 $comment=&EXT('user.resource.resource.0.comment');  $comment=&stored_data('comment');
 if (!defined($comment) || $comment!~/\w/) {  if (!defined($comment) || $comment!~/\w/) {
    $comment='';     $comment='';
 } else {  } else {
    $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';     $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';
 }  }
 $gradeinfo=&EXT('user.resource.resource.0.gradeinfo');  $gradeinfo=&stored_data('gradeinfo');
 if (!defined($gradeinfo) || $gradeinfo!~/\w/) {  if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
    $gradeinfo='';     $gradeinfo='';
 } else {  } else {
Line 40  if (!defined($gradeinfo) || $gradeinfo!~ Line 40  if (!defined($gradeinfo) || $gradeinfo!~
 <startouttext />  <startouttext />
 $display  $display
 <instructorcomment><span style="color:red">  <instructorcomment><span style="color:red">
 <br />If non-integer points are used (e.g., 3.5), make sure to change the  <br />You can modify the rounding of the score display using the "scoreformat" setting.
 display format in "Modify parameter settings for this resource" (clock symbol), or the result will be displayed in rounded form.  
 You can upload comments and grade information with this resource when uploading CSV files. Feedback on grades can be controlled using the problemstatus parameter.  You can upload comments and grade information with this resource when uploading CSV files. Feedback on grades can be controlled using the problemstatus parameter.
 </span></instructorcomment>  </span></instructorcomment>
 $gradeinfo  $gradeinfo

Removed from v.1.13  
changed lines
  Added in v.1.15


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>