Log Message:
-----------
Replace "Reduced Scoring" by "Reduced Credit". Don't displat message after due date
Modified Files:
--------------
pg/macros:
PGanswermacros.pl
Revision Data
-------------
Index: PGanswermacros.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/PGanswermacros.pl,v
retrieving revision 1.71
retrieving revision 1.72
diff -Lmacros/PGanswermacros.pl -Lmacros/PGanswermacros.pl -u -r1.71 -r1.72
--- macros/PGanswermacros.pl
+++ macros/PGanswermacros.pl
@@ -1643,13 +1643,13 @@
# the sub_recored_score holds the recored_score before entering the reduced scoring period
$problem_state{sub_recorded_score} = $problem_state{recorded_score};
}
- else { # we are in the reduced scoring period. This doesn't get called after due date.
+ elsif (time() < $dueDate) { # we are in the reduced scoring period.
# student gets credit for all work done before the reduced scoring period plus a portion of work done during period
my $newScore = 0;
$newScore = $problem_state{sub_recorded_score} + $reducedScoringValue*($problem_result{score} - $problem_state{sub_recorded_score}) if ($problem_result{score} > $problem_state{sub_recorded_score});
$problem_state{recorded_score} = $newScore if $newScore > $problem_state{recorded_score};
my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
- $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Scoring Period: All additional work done counts $reducedScoringPerCent\% of the original.";
+ $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Credit Period: All additional work done counts $reducedScoringPerCent\% of the original.";
}
$problem_state{state_summary_msg} = ''; # an HTML formatted message printed at the bottom of the problem page
@@ -1746,13 +1746,13 @@
# the sub_recored_score holds the recored_score before entering the reduced scoring period
$problem_state{sub_recorded_score} = $problem_state{recorded_score};
}
- else { # we are in the reduced scoring period. This doesn't get called after due date.
+ elsif (time() < $dueDate) { # we are in the reduced scoring period.
# student gets credit for all work done before the reduced scoring period plus a portion of work done during period
my $newScore = 0;
$newScore = $problem_state{sub_recorded_score} + $reducedScoringValue*($problem_result{score} - $problem_state{sub_recorded_score}) if ($problem_result{score} > $problem_state{sub_recorded_score});
$problem_state{recorded_score} = $newScore if $newScore > $problem_state{recorded_score};
my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
- $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Scoring Period: All additional work done counts $reducedScoringPerCent\% of the original.";
+ $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Credit Period: All additional work done counts $reducedScoringPerCent\% of the original.";
}
# record attempt only if there have been no syntax errors.
@@ -1841,13 +1841,13 @@
# the sub_recored_score holds the recored_score before entering the reduced scoring period
$problem_state{sub_recorded_score} = $problem_state{recorded_score};
}
- else { # we are in the reduced scoring period. This doesn't get called after due date.
+elsif (time() < $dueDate) { # we are in the reduced scoring period.
# student gets credit for all work done before the reduced scoring period plus a portion of work done during period
my $newScore = 0;
$newScore = $problem_state{sub_recorded_score} + $reducedScoringValue*($problem_result{score} - $problem_state{sub_recorded_score}) if ($problem_result{score} > $problem_state{sub_recorded_score});
$problem_state{recorded_score} = $newScore if $newScore > $problem_state{recorded_score};
my $reducedScoringPerCent = int(100*$reducedScoringValue+.5);
- $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Scoring Period: All additional work done counts $reducedScoringPerCent\% of the original.";
+ $problem_result{msg} = $problem_result{msg}."<br />You are in the Reduced Credit Period: All additional work done counts $reducedScoringPerCent\% of the original.";
}
$problem_state{state_summary_msg} = ''; # an HTML formatted message printed at the bottom of the problem page
|
