Fixing Bug #653.

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 49e62077e4baaebbe892ee75a2a1e9fe5d93e31f..5c85b77268aa2341a59cd02e71276bc0acc9f342 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1,4 +1,4 @@
-<?PHP  // $Id: lib.php,v 1.1 22 Aug 2003
+<?PHP  // $Id: lib.php,v 1.1 23 Aug 2003
 
 include_once("$CFG->dirroot/files/mimetypes.php");
 
@@ -254,15 +254,17 @@ function workshop_cron () {
                        // it's an assessment, tell the submission owner
                        $USER->lang = $submissionowner->lang;
                        $sendto = $submissionowner;
-                       $msg = "Your assignment \"$submission->title\" has been assessed.\n".
-                               "The comments and grade can be seen in ".
-                               "the workshop assignment '$workshop->name'\n\n";
+                       // "Your assignment \"$submission->title\" has been assessed."
+                       $msg = get_string("mail1", "workshop", $submission->title)."\n".
+                       // "The comments and grade can be seen in the workshop assignment '$workshop->name'
+                       $msg .= get_string("mail2", "workshop", $workshop->name)."\n\n";
        
                        $postsubject = "$course->shortname: $strworkshops: $workshop->name";
                        $posttext  = "$course->shortname -> $strworkshops -> $workshop->name\n";
                        $posttext .= "---------------------------------------------------------------------\n";
                        $posttext .= $msg;
-                       $posttext .= "You can see it in your workshop assignment:\n";
+                       // "You can see it in your workshop assignment
+                       $posttext .= get_string("mail3", "workshop").":\n";
                        $posttext .= "   $CFG->wwwroot/mod/workshop/view.php?a=$workshop->id\n";
                        $posttext .= "---------------------------------------------------------------------\n";
                        if ($sendto->mailformat == 1) {  // HTML
@@ -1583,7 +1585,31 @@ function workshop_list_submissions_for_admin($workshop, $order) {
     if (! $course = get_record("course", "id", $workshop->course)) {
         error("Course is misconfigured");
         }
-       
+    if (! $cm = get_coursemodule_from_instance("workshop", $workshop->id, $course->id)) {
+        error("Course Module ID was incorrect");
+    }
+
+       // print standard assignment "header"
+       $strdifference = format_time($workshop->deadline - time());
+       if (($workshop->deadline - time()) < 0) {
+               $strdifference = "<FONT COLOR=RED>$strdifference</FONT>";
+       }
+       $strduedate = userdate($workshop->deadline)." ($strdifference)";
+       print_simple_box_start("CENTER");
+       print_heading($workshop->name, "CENTER");
+       print_simple_box_start("CENTER");
+       echo "<B>".get_string("duedate", "assignment")."</B>: $strduedate<BR>";
+       echo "<B>".get_string("maximumgrade")."</B>: $workshop->grade<BR>";
+       echo "<B>".get_string("detailsofassessment", "workshop")."</B>: 
+               <A HREF=\"assessments.php?id=$cm->id&action=displaygradingform\">".
+               get_string("specimenassessmentform", "workshop")."</A><BR>";
+       print_simple_box_end();
+       echo "<BR>";
+       echo format_text($workshop->description, $workshop->format);
+       print_simple_box_end();
+       echo "<BR>";
+
+       // list any teacher submissions
        $table->head = array (get_string("title", "workshop"), get_string("submittedby", "workshop"), get_string("action", "workshop"));
        $table->align = array ("left", "left", "left");
        $table->size = array ("*", "*", "*");
@@ -1619,6 +1645,7 @@ function workshop_list_submissions_for_admin($workshop, $order) {
                                        get_string("delete", "workshop")."</a>";
                        $table->data[] = array(workshop_print_submission_title($workshop, $submission), $course->teacher, $action);
                        }
+               print_heading(get_string("studentsubmissions", "workshop", $course->teacher), "center");
                print_table($table);
                }
 
@@ -1663,11 +1690,12 @@ function workshop_list_submissions_for_admin($workshop, $order) {
                                $table->data[] = array("$user->firstname $user->lastname", $title, $action);
                                }
                        }
-               print_table($table);
+               if (isset($table->data)) {
+                       print_table($table);
+                       }
                }
 
        // now the sudent submissions
-       echo "<CENTER><P><B>".get_string("studentsubmissions", "workshop", $course->student)."</B></CENTER><BR>\n";
        unset($table);
        switch ($order) {
                case "title" :
@@ -1719,6 +1747,7 @@ function workshop_list_submissions_for_admin($workshop, $order) {
                                " ".workshop_print_submission_assessments($workshop, $submission, "teacher").
                                " ".workshop_print_submission_assessments($workshop, $submission, "student"), $action);
                        }
+               print_heading(get_string("studentsubmissions", "workshop", $course->student), "center");
                print_table($table);
                }
        }

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index ffc49c25237c2025f228be2355a13275e1a9b067..bcd0fbb4d8c78a637664b131a52169072a780ea7 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -168,7 +168,6 @@
                        $order = $_GET['order'];
                        }
                        
-               print_heading(get_string("listofallsubmissions", "workshop").":", "center");
                workshop_list_submissions_for_admin($workshop, $order);
                print_continue("view.php?id=$cm->id");
                

diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index 15ef25a399f6b6bed825050ed5799b6df033003f..1fc764de89fbe7a3ced2453fb27dc1d12cc2020f 100644 (file)
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -1,4 +1,4 @@
-<?PHP  // $Id: view.php, v1.1 22 Aug 2003
+<?PHP  // $Id: view.php, v1.1 23 Aug 2003
 
 /*************************************************
        ACTIONS handled are:
@@ -247,10 +247,15 @@
                        error("Only teachers can look at this page");
                        }
 
-               // move to phase 2
-               set_field("workshop", "phase", 2, "id", "$workshop->id");
-               redirect("view.php?id=$cm->id", get_string("movingtophase", "workshop", 2));
-               add_to_log($course->id, "workshop", "open", "view.php?a=$workshop->id", "$workshop->id");
+               // move to phase 2, check that teacher has made enough submissions
+               if (workshop_count_teacher_submissions($workshop) < $workshop->ntassessments) {
+                       redirect("view.php?id=$cm->id", get_string("notenoughexamplessubmitted", "workshop", $course->teacher));
+                       }
+               else {
+                       set_field("workshop", "phase", 2, "id", "$workshop->id");
+                       redirect("view.php?id=$cm->id", get_string("movingtophase", "workshop", 2));
+                       add_to_log($course->id, "workshop", "open", "view.php?a=$workshop->id", "$workshop->id");
+                       }
                }
 
 
@@ -369,15 +374,18 @@
                print_simple_box_end();
                echo "<BR>";
                
-               workshop_list_teacher_submissions($workshop, $USER);
-               echo "<HR SIZE=1 NOSHADE>";
-               echo "<BR>";
-               
-               workshop_list_student_submissions($workshop, $USER);
-               echo "<HR SIZE=1 NOSHADE>";
-               echo "<BR>";
-               
-               // list previous submissions
+               // only list teacher and (other) student submissions if it's a student
+               if (isstudent($course->id)) {
+                       workshop_list_teacher_submissions($workshop, $USER);
+                       echo "<HR SIZE=1 NOSHADE>";
+                       echo "<BR>";
+                       
+                       workshop_list_student_submissions($workshop, $USER);
+                       echo "<HR SIZE=1 NOSHADE>";
+                       echo "<BR>";
+                       }
+                       
+               // list previous submissions from this user (could be a teacher or a student)
                workshop_list_user_submissions($workshop, $USER);
        
                echo "<HR SIZE=1 NOSHADE>";