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

[www]

www		Sun May  1 17:17:09 2011 EDT

  Modified files:              
    /loncom/homework/templates	DropBox.problem examupload.problem 
  Log:
  Better ".00" than a rounding surprise
  
  
Index: loncom/homework/templates/DropBox.problem
diff -u loncom/homework/templates/DropBox.problem:1.16 loncom/homework/templates/DropBox.problem:1.17
--- loncom/homework/templates/DropBox.problem:1.16	Thu May 27 16:56:20 2010
+++ loncom/homework/templates/DropBox.problem	Sun May  1 17:17:09 2011
@@ -9,7 +9,7 @@
 if ((!defined($weight)) || ($weight eq '')) { $weight=1; }
 $awarded=&EXT('user.resource.resource.0.awarded');
 $scoreformat=&EXT('resource.0.scoreformat');
-if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
 $display='';
 if (&EXT('resource.0.problemstatus')!~/^no/) {
    if (!defined($awarded)) {
@@ -39,7 +39,7 @@
 $display
 <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>
+<ul><li>You can modify the rounding of the score display using the "scoreformat" setting.</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>
 <li>Feedback on grades can be controlled using the "problemstatus" parameter.</li>
Index: loncom/homework/templates/examupload.problem
diff -u loncom/homework/templates/examupload.problem:1.13 loncom/homework/templates/examupload.problem:1.14
--- loncom/homework/templates/examupload.problem:1.13	Thu May 27 16:56:20 2010
+++ loncom/homework/templates/examupload.problem	Sun May  1 17:17:09 2011
@@ -11,7 +11,7 @@
 $awarded=&EXT('user.resource.resource.0.awarded');
 if (!defined($awarded)) { $awarded=0; }
 $scoreformat=&EXT('resource.0.scoreformat');
-if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="0f"; }
+if (!defined($scoreformat) || $scoreformat eq '') { $scoreformat="2f"; }
 $display='';
 if (&EXT('resource.0.problemstatus')!~/^no/) {
    if (!defined($awarded)) {
@@ -40,8 +40,7 @@
 <startouttext />
 $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 "Modify parameter settings for this resource" (clock symbol), or the result will be displayed in rounded form.
+<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