From 693f6eb5cfe6d0d2423eef8c78b10668e42394a4 Mon Sep 17 00:00:00 2001
From: rkingdon <rkingdon>
Date: Tue, 23 Nov 2004 20:52:54 +0000
Subject: [PATCH] Cron routine does not send "graded" emails until
 releasegrades date; grades are "not available" in index page until after the
 relaesegrades date; phasing of three phase workshop tidied up.

---
 mod/workshop/index.php | 3 +++
 mod/workshop/lib.php   | 3 ++-
 mod/workshop/view.php  | 8 ++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/mod/workshop/index.php b/mod/workshop/index.php
index 8fd57ed80e..9c2c4d013c 100644
--- a/mod/workshop/index.php
+++ b/mod/workshop/index.php
@@ -101,6 +101,9 @@
                      } else { // simple assignemnt, don't show grading grade 
                         $info = get_string("gradeforsubmission", "workshop").": $grade/$workshop->grade";
                     }
+                    if ($workshop->releasegrades > $timenow) {
+                        $info = get_string("notavailable", "workshop");
+                    }
                 }
                 if ($course->format == "weeks" or $course->format == "topics") {
                     $table->data[] = array ($workshop->section, $link, $info, $submitted, $due);
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index d1cd42a355..356fb3bcaf 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1360,7 +1360,8 @@ function workshop_get_unmailed_assessments($cutofftime) {
                               FROM {$CFG->prefix}workshop_assessments a, {$CFG->prefix}workshop g
                              WHERE a.mailed = 0 
                                AND a.timecreated < $cutofftime 
-                               AND g.id = a.workshopid");
+                               AND g.id = a.workshopid
+                               AND g.releasegrades < $cutoffime");
 }
 
 
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 23c37d91fb..445ecbd718 100644
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -387,7 +387,7 @@
                             "2. ".get_string("phase2", "workshop", $course->student), 
                             "3. ".get_string("phase5", "workshop"));
             $tabs->urls = array("view.php?id=$cm->id&amp;action=setupassignment", 
-                "view.php?id=$cm->id&amp;action=allowsubmissions",
+                "view.php?id=$cm->id&amp;action=allowboth",
                 "view.php?id=$cm->id&amp;action=makefinalgradesavailable");
         } else {
             $tabs->names = array("1. ".get_string("phase1", "workshop"), 
@@ -411,7 +411,11 @@
             }
         }
         if ($workshop->phase) { // phase 1 or more
-            $tabs->highlight = $workshop->phase - 1;
+            if ($workshop->wtype < 2) {
+                $tabs->highlight = ($workshop->phase - 1) / 2;
+            } else {
+                $tabs->highlight = $workshop->phase - 1;
+            }
         } else {
             $tabs->highlight = 0; // phase is zero
         }
-- 
2.39.5