From 9748030a8f5ae76e5c1af2b4e6d8d8ec6a488ed7 Mon Sep 17 00:00:00 2001
From: rkingdon <rkingdon>
Date: Tue, 20 Jan 2004 17:25:45 +0000
Subject: [PATCH] Fix bug in Analysis of Assessments

---
 mod/workshop/lib.php         | 1 +
 mod/workshop/submissions.php | 4 ++++
 mod/workshop/upload.php      | 5 ++---
 mod/workshop/view.php        | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index b8e7e8a1e4..f40dfe841f 100644
--- 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 1cdc641b02..82b43d1c13 100644
--- 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 a63a51ad60..badfb146d8 100644
--- 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 47c875acdd..da74d99e15 100644
--- 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);
 		}
-- 
2.39.5