From 4511133418722a84f8e3c2fc79f1ea69b805223f Mon Sep 17 00:00:00 2001
From: rkingdon <rkingdon>
Date: Fri, 29 Aug 2003 17:46:31 +0000
Subject: [PATCH] Fix bug when deleting a submission. Very recent assessments
 were not deleted. Now all assessments of the deleted submission are deleted
 including the "hot" ones.

---
 mod/workshop/lib.php         | 16 +++++++++++-----
 mod/workshop/submissions.php |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 8a62ac71ed..f4857fe2b6 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -1016,13 +1016,19 @@ function workshop_file_area_name($workshop, $submission) {
 }
 
 
-function workshop_get_assessments($submission) {
-	// Return all assessments for this submission provided they are after the editing time, ordered oldest first, newest last
+function workshop_get_assessments($submission, $all = '') {
+	// Return assessments for this submission ordered oldest first, newest last
+	// new assessments made withinthe editing time are NOT return unless the
+	// second argument is set to ALL
 	global $CFG;
 
-	$timenow = time();
-    return get_records_select("workshop_assessments", "(submissionid = $submission->id) AND 
-		(timecreated < $timenow - $CFG->maxeditingtime)", "timecreated DESC");
+	if ($all != 'ALL') {
+		$timenow = time();
+		return get_records_select("workshop_assessments", "(submissionid = $submission->id) AND 
+			(timecreated < $timenow - $CFG->maxeditingtime)", "timecreated DESC");
+	} else {
+		return get_records_select("workshop_assessments", "submissionid = $submission->id", "timecreated DESC");
+	}
 }
 
 
diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index bcd0fbb4d8..0c00346666 100644
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -136,7 +136,7 @@
 			}
 		print_string("deleting", "workshop");
 		// first get any assessments...
-		if ($assessments = workshop_get_assessments($submission)) {
+		if ($assessments = workshop_get_assessments($submission, 'ALL')) {
 			foreach($assessments as $assessment) {
 				// ...and all the associated records...
 				delete_records("workshop_comments", "assessmentid", $assessment->id);
@@ -893,7 +893,7 @@
 			}
 		print_string("deleting", "workshop");
 		// first get any assessments...
-		if ($assessments = workshop_get_assessments($submission)) {
+		if ($assessments = workshop_get_assessments($submission, 'ALL')) {
 			foreach($assessments as $assessment) {
 				// ...and all the associated records...
 				delete_records("workshop_comments", "assessmentid", $assessment->id);
-- 
2.39.5