--- loncom/homework/templates/examupload.problem	2005/05/30 20:02:11	1.6
+++ loncom/homework/templates/examupload.problem	2010/05/27 16:56:20	1.13
@@ -1,22 +1,53 @@
 <problem>
+
 <displaytitle />
-<parameter name="scoreformat" description="Format for display of score" default="0f" type="string" />
+
+<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');
 if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
 $awarded=&EXT('user.resource.resource.0.awarded');
 if (!defined($awarded)) { $awarded=0; }
 $scoreformat=&EXT('resource.0.scoreformat');
-if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }
+$display='';
+if (&EXT('resource.0.problemstatus')!~/^no/) {
+   if (!defined($awarded)) {
+      $display=$weight.' possible points.';
+   } else {
+      $display='You have '.&format($awarded*$weight,$scoreformat).' out of '.
+            $weight.' possible points.';
+   }
+}
+$comment=&EXT('user.resource.resource.0.comment');
+if (!defined($comment) || $comment!~/\w/) {
+   $comment='';
+} else {
+   $comment='<br /><table><tr><td bgcolor="#FFFFDD">'.$comment.'</td></tr></table>';
+}
+$gradeinfo=&EXT('user.resource.resource.0.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">
+$display
+<instructorcomment><span style="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 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.
+</span></instructorcomment>
+$gradeinfo
+$comment
 <endouttext />
-<block condition="0"><numericalresponse id='score' /></block>
+
+<block condition="0"><numericalresponse id="score" /></block>
+
 </problem>