[WWcvs] webwork2: set closed message differentiates between sets that have not

[Sam H. v. a. <we...@ma...>]

Log Message:
-----------
set closed message differentiates between sets that have not yet opened 
and sets that used to be open. resolves bug #724.

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        Problem.pm

Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.170
retrieving revision 1.171
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.170 -r1.171
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -992,13 +992,21 @@
 	my $setClosedMessage;
 	if (before($set->open_date) or after($set->due_date)) {
 		$setClosed = 1;
-		$setClosedMessage = "This problem set is closed.";
-		if ($authz->hasPermissions($user, "view_answers")) {
-			$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
-		} else {
-			$setClosedMessage .= " Additional attempts will not be recorded.";
+		if (before($set->open_date)) {
+			$setClosedMessage = "This problem set is not yet open.";
+		} elsif (after($set->due_date)) {
+			$setClosedMessage = "This problem set is closed.";
 		}
 	}
+	#if (before($set->open_date) or after($set->due_date)) {
+	#	$setClosed = 1;
+	#	$setClosedMessage = "This problem set is closed.";
+	#	if ($authz->hasPermissions($user, "view_answers")) {
+	#		$setClosedMessage .= " However, since you are a privileged user, additional attempts will be recorded.";
+	#	} else {
+	#		$setClosedMessage .= " Additional attempts will not be recorded.";
+	#	}
+	#}
 	
 	my $notCountedMessage = ($problem->value) ? "" : "(This problem will not count towards your grade.)";
 	print CGI::p(