From: rkingdon <rkingdon>
Date: Mon, 20 Sep 2004 14:59:41 +0000 (+0000)
Subject: Fixed bug #1952; fixed bug in upload form; and assessment form now
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=aa8f2d1ec165acc3f054b273854cd8976f0787b5;p=moodle.git

Fixed bug #1952; fixed bug in upload form; and assessment form now
displays the correct grade.
---

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 804b6eb9ba..90d5b47654 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1183,9 +1183,11 @@ function workshop_compare_assessments($workshop, $assessment1, $assessment2) {
 
 //////////////////////////////////////////////////////////////////////////////////////
 function workshop_count_ungraded_assessments($workshop) {
-    // function returns the number of ungraded assessments (ANY assessments)
+    // function returns the number of ungraded assessments (assessments must be warm or cold)
     
-    return count_records("workshop_assessments", "workshopid", $workshop->id, "timegraded", 0) ;
+    $timenow = time();
+    return count_records_select("workshop_assessments", "workshopid = $workshop->id AND 
+            timecreated < $timenow AND timegraded = 0") ;
     }
 
 
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 0e6f9d5077..7c18bf94c8 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -1819,7 +1819,8 @@ function workshop_print_assessment($workshop, $assessment = false, $allowchanges
             
         // only show the grade if grading strategy > 0 and the grade is positive
         if ($showgrades and $workshop->gradingstrategy and $assessment->grade >= 0) { 
-            echo "<center><b>".get_string("thegradeis", "workshop").": ".number_format($assessment->grade, 2)." (".
+            echo "<center><b>".get_string("thegradeis", "workshop").": ".
+                number_format($assessment->grade * $workshop->grade / 100, 2)." (".
                 get_string("maximumgrade")." ".number_format($workshop->grade, 0).")</b></center><br clear=\"all\" />\n";
             }
         }
@@ -2688,7 +2689,7 @@ function workshop_print_upload_form($workshop) {
     }
 
     echo "<div align=\"center\">";
-    echo "<form enctype=\"multipart/form-data\" method=\"POST\" action=\"upload\".php>";
+    echo "<form enctype=\"multipart/form-data\" method=\"POST\" action=\"upload.php\">";
     echo " <input type=\"hidden\" name=\"id\" value=\"$cm->id\" />";
     require_once($CFG->dirroot.'/lib/uploadlib.php');
     upload_print_form_fragment(1,array('newfile'),null,true,array('title'),$course->maxbytes,$workshop->maxbytes,false);
diff --git a/mod/workshop/mod.html b/mod/workshop/mod.html
index 6f00dd47fd..e03142e0ef 100644
--- a/mod/workshop/mod.html
+++ b/mod/workshop/mod.html
@@ -341,7 +341,6 @@
 <input type="submit" value="<?php  print_string("savechanges") ?>" />
 <input type="submit" name="cancel" value="<?php  print_string("cancel") ?>" />
 <p>
-<p><?php notify(get_string("noteonassessmentelements", "workshop")); ?>
 
 </center>
 </form>
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 7d30f27421..69fcfb8fc5 100644
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -56,7 +56,7 @@
 				$action = "teachersview";
 			}
 			else {
-    			redirect("assessments.php?action=editelements&amp;id=$cm->id");
+    			redirect("assessments.php?action=editelements&id=$cm->id");
 			}
 		}
 	}