Skip to content

Commit

Permalink
Rubrics: fix rubric data before the go live date visible in Historica…
Browse files Browse the repository at this point in the history
…l Data
  • Loading branch information
SKuipers committed Sep 27, 2021
1 parent 0ee6202 commit a1cd764
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ v23.0.00
System: fixed phone number format for numbers 10 digits or greater
Activities: fixed duplicate entries in Activity Choices by Student
Messenger: fixed duplicate student names when using Individual Naming
Rubrics: fixed rubric data before the go live date visible in Historical Data
School Admin: fixed phone numbers not formatting in Manage Facilities
System Admin: fixed PHP notice in importer when skipping serialized fields
Timetable: fixed timetable misalignment of times below transparent timetable blocks
Expand Down
6 changes: 6 additions & 0 deletions modules/Rubrics/moduleFunctions.php
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,13 @@ function rubricView($guid, $connection2, $gibbonRubricID, $mark, $gibbonPersonID
$resultContext = $pdo->executeQuery($dataContext, $sqlContext);

if ($resultContext->rowCount() > 0) {
$currentDate = date('Y-m-d');
while ($rowContext = $resultContext->fetch()) {
// Skip data for any column that has not met its complete date yet
if (!empty($rowContext['completeDate']) && $currentDate < $rowContext['completeDate']) {
continue;
}

$context = $rowContext['course'].'.'.$rowContext['class'].' - '.$rowContext[$contextDBTableNameField].' ('.Format::date($rowContext[$contextDBTableDateField]).')';
$cells[$rowContext['gibbonRubricRowID']][$rowContext['gibbonRubricColumnID']]['context'][] = $context;

Expand Down

0 comments on commit a1cd764

Please sign in to comment.