[WWcvs] pg: Allow reduced scoring to be enabled or disabled for individual assignments.

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
Allow reduced scoring to be enabled or disabled for individual assignments. Default is disabled.

Modified Files:
--------------
    pg/macros:
        PGanswermacros.pl

Revision Data
-------------
Index: PGanswermacros.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/PGanswermacros.pl,v
retrieving revision 1.70
retrieving revision 1.71
diff -Lmacros/PGanswermacros.pl -Lmacros/PGanswermacros.pl -u -r1.70 -r1.71
--- macros/PGanswermacros.pl
+++ macros/PGanswermacros.pl
@@ -152,6 +152,8 @@
 my $reducedScoringPeriod;
 # ^variable my $reducedScoringValue
 my $reducedScoringValue;
+# ^variable my $enable_reduced_scoring
+my $enable_reduced_scoring;
 # ^variable my $dueDate
 my $dueDate;
 
@@ -165,6 +167,7 @@
 # ^uses $envir{useBaseTenLog}
 # ^uses $envir{reducedScoringPeriod}
 # ^uses $envir{reducedScoringValue}
+# ^uses $envir{enable_reduced_scoring}
 # ^uses $envir{dueDate}
 
 sub _PGanswermacros_init {
@@ -180,11 +183,10 @@
 	$useBaseTenLog      = PG_restricted_eval(q/$envir{useBaseTenLog}/);
 	$reducedScoringPeriod= PG_restricted_eval(q/$envir{reducedScoringPeriod}/);
 	$reducedScoringValue= PG_restricted_eval(q/$envir{reducedScoringValue}/);
+	$enable_reduced_scoring= PG_restricted_eval(q/$envir{enable_reduced_scoring}/);
 	$dueDate	    = PG_restricted_eval(q/$envir{dueDate}/);
 }
 
-
-
 =head1 MACROS
 
 =head2 Answer evaluator macros
@@ -1635,7 +1637,7 @@
 	# Determine if we are in the reduced scoring period and act accordingly
 
 	my $reducedScoringPeriodSec = $reducedScoringPeriod*60;   # $reducedScoringPeriod is in minutes
-	if (time() < ($dueDate - $reducedScoringPeriodSec)) {	# it is before the reduced scoring period
+	if (!$enable_reduced_scoring or time() < ($dueDate - $reducedScoringPeriodSec)) {	# the reduced scoring period is disabled or it is before the reduced scoring period
 		# increase recorded score if the current score is greater.
 		$problem_state{recorded_score} = $problem_result{score}	if $problem_result{score} > $problem_state{recorded_score};
 		# the sub_recored_score holds the recored_score before entering the reduced scoring period
@@ -1738,7 +1740,7 @@
 	# Determine if we are in the reduced scoring period and act accordingly
 
 	my $reducedScoringPeriodSec = $reducedScoringPeriod*60;   # $reducedScoringPeriod is in minutes
-	if (time() < ($dueDate - $reducedScoringPeriodSec)) {	# it is before the reduced scoring period
+	if (!$enable_reduced_scoring or time() < ($dueDate - $reducedScoringPeriodSec)) {	# the reduced scoring period is disabled or it is before the reduced scoring period
 		# increase recorded score if the current score is greater.
 		$problem_state{recorded_score} = $problem_result{score}	if $problem_result{score} > $problem_state{recorded_score};
 		# the sub_recored_score holds the recored_score before entering the reduced scoring period
@@ -1829,10 +1831,11 @@
 	$problem_state{num_of_correct_ans}++ if	$total == $count;
 	$problem_state{num_of_incorrect_ans}++ if $total < $count;
 
-	# Determine if we are in the reduced scoring period and act accordingly
-
+	# Determine if we are in the reduced scoring period and if the reduced scoring period is enabled and act accordingly
+#warn("enable_reduced_scoring is $enable_reduced_scoring");
+# warn("dueDate is $dueDate");
 	my $reducedScoringPeriodSec = $reducedScoringPeriod*60;   # $reducedScoringPeriod is in minutes
-	if (time() < ($dueDate - $reducedScoringPeriodSec)) {	# it is before the reduced scoring period
+	if (!$enable_reduced_scoring or time() < ($dueDate - $reducedScoringPeriodSec)) {	# the reduced scoring period is disabled or it is before the reduced scoring period
 		# increase recorded score if the current score is greater.
 		$problem_state{recorded_score} = $problem_result{score}	if $problem_result{score} > $problem_state{recorded_score};
 		# the sub_recored_score holds the recored_score before entering the reduced scoring period