[LON-CAPA-cvs] cvs: loncom /homework/templates DropBox.problem DropBox.problem.meta examupload.problem

[www]

www		Tue Apr 20 23:58:32 2010 EDT

  Modified files:              
    /loncom/homework/templates	DropBox.problem DropBox.problem.meta 
                              	examupload.problem 
  Log:
  More on Bug #6250
  
  
Index: loncom/homework/templates/DropBox.problem
diff -u loncom/homework/templates/DropBox.problem:1.14 loncom/homework/templates/DropBox.problem:1.15
--- loncom/homework/templates/DropBox.problem:1.14	Wed Feb 10 21:27:18 2010
+++ loncom/homework/templates/DropBox.problem	Tue Apr 20 23:58:31 2010
@@ -16,17 +16,34 @@
    $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 />
 <displaytitle />
 $display
-<instructorcomment><span style="color:red">
-<ul><li>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.</li>
-<li>To change the allowed file types for submissions, change the "uploadedfiletypes" parameter in PPRM.</li>
-<li>To change the maximum cumulative size for submitted files for this item, modify the "maxfilesize" parameter in PPRM (The default is 10 MB).</li>
-</ul></span>
-</instructorcomment>
+<instructorcomment><span style="color:red"><br />
+You should adjust this resource in "Modify parameter settings for this resource:"
+<ul><li>If non-integer points are used (e.g., 3.5), make sure to change the display format, or the result will be displayed in rounded form.</li>
+<li>To change the allowed file types for submissions, change the "uploadedfiletypes"</li>
+<li>To change the maximum cumulative size for submitted files for this item, modify the "maxfilesize" parameter (The default is 10 MB).</li>
+</ul>
+You can upload comments and grade information with this resource when uploading CSV files.
+</span></instructorcomment>
+$gradeinfo
+$comment
 <endouttext />
 
 <essayresponse id="upload">
Index: loncom/homework/templates/DropBox.problem.meta
diff -u loncom/homework/templates/DropBox.problem.meta:1.9 loncom/homework/templates/DropBox.problem.meta:1.10
--- loncom/homework/templates/DropBox.problem.meta:1.9	Wed Jun 10 13:29:26 2009
+++ loncom/homework/templates/DropBox.problem.meta	Tue Apr 20 23:58:31 2010
@@ -11,5 +11,7 @@
 <stores part="0" name="awarded" type="float" display="Partial Credit Factor [Part: 0]"></stores>
 <stores part="0" name="solved" type="string" display="Problem Status [Part: 0]"></stores>
 <stores part="0" name="tries" type="int_zeropos" display="Number of Attempts [Part: 0]"></stores>
+<stores part="0" name="comment" type="string" display="Comment [Part: 0]"></stores>
+<stores part="0" name="gradeinfo" type="string" display="Grade Info [Part: 0]"</stores>
 <title>Drop Box</title>
 <category>Handgraded Problems</category>
Index: loncom/homework/templates/examupload.problem
diff -u loncom/homework/templates/examupload.problem:1.11 loncom/homework/templates/examupload.problem:1.12
--- loncom/homework/templates/examupload.problem:1.11	Tue Apr 20 23:29:27 2010
+++ loncom/homework/templates/examupload.problem	Tue Apr 20 23:58:31 2010
@@ -22,7 +22,7 @@
 if (!defined($gradeinfo) || $gradeinfo!~/\w/) {
    $gradeinfo='';
 } else {
-   $gradeinfo='<br /><table><tr><td bgcolor="#DDDDFF">'.$gradeinfo.'</td></tr></table>';
+   $gradeinfo='<br /><table><tr><td bgcolor="#DDDDFF"><font size="+2">'.$gradeinfo.'</font></td></tr></table>';
 }
 
 
@@ -33,6 +33,7 @@
 <instructorcomment><span style="color:red">
 <br />If non-integer points are used (e.g., 3.5), make sure to change the
 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.
 </span></instructorcomment>
 $gradeinfo
 $comment