--- loncom/homework/templates/examupload.problem	2007/03/12 20:39:23	1.8
+++ loncom/homework/templates/examupload.problem	2011/05/21 14:50:40	1.15
@@ -1,23 +1,52 @@
 <problem>
+
 <displaytitle />
+
 <parameter name="scoreformat" description="Format for display of score" type="string" />
 <parameter name="handgrade" description="Hand Grade" default="yes" type="string_yesno" />
+
 <script type="loncapa/perl">
-$weight=&EXT('resource.0.weight');
+$weight=&parameter_setting('weight');
 if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
-$awarded=&EXT('user.resource.resource.0.awarded');
+$awarded=&stored_data('awarded');
 if (!defined($awarded)) { $awarded=0; }
-$scoreformat=&EXT('resource.0.scoreformat');
-if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }
+$scoreformat=&parameter_setting('scoreformat');
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
+$display='';
+if (&parameter_setting('problemstatus')!~/^no/) {
+   if (!defined($awarded)) {
+      $display=$weight.' possible points.';
+   } else {
+      $display='You have '.&format($awarded*$weight,$scoreformat).' out of '.
+            $weight.' possible points.';
+   }
+}
+$comment=&stored_data('comment');
+if (!defined($comment) || $comment!~/\w/) {
+   $comment='';
+} else {
+   $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';
+}
+$gradeinfo=&stored_data('gradeinfo');
+if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
+   $gradeinfo='';
+} else {
+   $gradeinfo='<br /><table><tr><td bgcolor="#DDDDFF"><font size="+2">'.$gradeinfo.'</font></td></tr></table>';
+}
+
+
 </script>
+
 <startouttext />
-You have <display>&format($awarded*$weight,$scoreformat)</display> out of $weight possible points.
-<instructorcomment>
-<font color="red">
-<br />If non-integer points are used (e.g., 3.5), make sure to change the
-display format in PPRM, or the result will be displayed in rounded form.
-</font>
-</instructorcomment>
+$display
+<instructorcomment><span style="color:red">
+<br />You can modify the rounding of the score display using the "scoreformat" setting.
+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>
+$gradeinfo
+$comment
 <endouttext />
-<block condition="0"><numericalresponse id='score' /></block>
+
+<block condition="0"><numericalresponse id="score" /></block>
+
 </problem>