Fixes to journal reporting

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index aec75592fd2acd2e514927a2da53844863e2d4cb..1b25dedd0d34ec90f3944472eae940425e6c53a8 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -158,7 +158,7 @@ function journal_get_users_done($course, $journal) {
                             ORDER BY j.modified DESC");
 }
 
-function journal_print_user_entry($course, $user, $entry, $teachers) {
+function journal_print_user_entry($course, $user, $entry, $teachers, $ratings) {
     global $THEME;
 
     echo "\n<TABLE BORDER=1 CELLSPACING=0 valign=top cellpadding=10>";
@@ -189,7 +189,7 @@ function journal_print_user_entry($course, $user, $entry, $teachers) {
         }
         print_user_picture($entry->teacher, $course->id, $teachers[$entry->teacher]->picture);
         echo "<TD BGCOLOR=\"$THEME->cellheading\">Teacher Feedback:";
-        choose_from_menu($RATING, "r$entry->id", $entry->rating, "Rate...");
+        choose_from_menu($ratings, "r$entry->id", $entry->rating, "Rate...");
         if ($entry->timemarked) {
             echo "&nbsp;&nbsp;<FONT SIZE=1>".userdate($entry->timemarked)."</FONT>";
         }

diff --git a/mod/journal/report.php b/mod/journal/report.php
index d1e5b7b2031d9896c064894bb58436639a4edb9c..9ff7db66d21593da3b7f6a2eae431ec2884b9cbc 100644 (file)
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -27,7 +27,7 @@
     if ( $eee = get_records_sql("SELECT * FROM journal_entries WHERE journal='$journal->id'")) {
         foreach ($eee as $ee) {
             $entrybyuser[$ee->user] = $ee;
-            $entrybyentry[$ee->id]     = $ee;
+            $entrybyentry[$ee->id]  = $ee;
         }
         
     } else {
@@ -60,17 +60,16 @@
             $entry = $entrybyentry[$num];
             // Only update entries where feedback has actually changed.
             if (($vals[r] <> $entry->rating) || ($vals[c] <> addslashes($entry->comment))) {
-                if (!$rs = $db->Execute("UPDATE journal_entries
-                                         SET rating='$vals[r]',   comment='$vals[c]',
-                                            teacher='$USER->id', timemarked='$timenow'
-                                         WHERE id = '$num'")) {
-                    error("Failed to update the journal feedback!");
-                }
-                $entrybyuser[$entry->user]->comment = $vals[c];
                 $entrybyuser[$entry->user]->rating = $vals[r];
-                $entrybyuser[$entry->user]->timemarked = $timenow;
+                $entrybyuser[$entry->user]->comment = $vals[c];
                 $entrybyuser[$entry->user]->teacher = $USER->id;
-                $count++;
+                $entrybyuser[$entry->user]->timemarked = $timenow;
+                $entrybyuser[$entry->user]->id = $num;
+                if (! update_record("journal_entries", $entrybyuser[$entry->user])) {
+                    error("Failed to update the journal feedback!");
+                } else {
+                    $count++;
+                }
             }
         }
         add_to_log($course->id, "journal", "update feedback", "report.php?id=$cm->id", "$count users");
@@ -90,14 +89,14 @@
         if ($usersdone = journal_get_users_done($course, $journal)) {
             foreach ($usersdone as $user) {
                 $entry = $entrybyuser[$user->id];
-                journal_print_user_entry($course, $user, $entry, $teachers);
+                journal_print_user_entry($course, $user, $entry, $teachers, $RATING);
             }
         }
 
         foreach ($users as $user) {
             if (! $usersdone[$user->id]) {
                 $entry = NULL;
-                journal_print_user_entry($course, $user, $entry, $teachers);
+                journal_print_user_entry($course, $user, $entry, $teachers, $RATING);
             }
         }
         echo "<CENTER>";