Fix bug in Analysis of Assessments

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index b8e7e8a1e412847af233ebcfaf201719f052fe03..f40dfe841fc5dfbf5ff9d080bb4ec0c45a1f0a1e 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -3400,6 +3400,7 @@ function workshop_print_league_table($workshop) {
                        }
                print_heading(get_string("leaguetable", "workshop"));
                print_table($table);
+        echo "<p>&lt; &gt; ".get_string("assessmentdropped", "workshop")."</p>\n";
                }
        }
        

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index 1cdc641b02733157d3b25644cfea11cacba9a0de..82b43d1c13fa204bf1daf32888c1caf4b2b1cc41 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -621,6 +621,10 @@
                             number_format($finalgrade, 2));
                     }
                     // save grades in submission record
+                    set_field("workshop_submissions", "teachergrade", intval($submissiongrade + 0.5), "id", 
+                            $submission->id);
+                    set_field("workshop_submissions", "peergrade", intval($submissiongrade + 0.5), "id", 
+                            $submission->id);
                     set_field("workshop_submissions", "finalgrade", intval($finalgrade + 0.5), "id", 
                             $submission->id);
                     set_field("workshop_submissions", "gradinggrade", intval($assessmentgrade + 0.5), "id", 

diff --git a/mod/workshop/upload.php b/mod/workshop/upload.php
index a63a51ad60be6753cdfd8c9ba40157bce41f5e5d..badfb146d88767976a2ba7e8cd0f16bc4868861f 100644 (file)
--- a/mod/workshop/upload.php
+++ b/mod/workshop/upload.php
@@ -21,8 +21,6 @@
 
     require_login($course->id);
 
-    add_to_log($course->id, "workshop", "submit", "view.php?id=$cm->id", "$workshop->id");
-
     if ($course->category) {
         $navigation = "<A HREF=\"../../course/view.php?id=$course->id\">$course->shortname</A> ->";
     }
@@ -98,7 +96,8 @@
                                        }
                                        if (move_uploaded_file($newfile['tmp_name'], "$dir/$newfile_name")) {
                                                print_heading(get_string("uploadsuccess", "assignment", $newfile_name) );
-                                       }
+                                           add_to_log($course->id, "workshop", "submit", "view.php?id=$cm->id", "$workshop->id");
+                    }
                                        else {
                                                notify(get_string("uploaderror", "assignment") );
                                        }

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 47c875acddb3421ba0cb7c3280646f33ba1a7309..da74d99e1545825c31efc1ec251dc42f336c3b1d 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -274,6 +274,7 @@
                        }
                }
                echo "</TABLE><BR CLEAR=ALL>\n";
+        echo "<p>&lt; &gt; ".get_string("assessmentdropped", "workshop")."</p>\n";
                if ($workshop->showleaguetable) {
                        workshop_print_league_table($workshop);
                }