diff --git a/src/components/Gradebook/index.jsx b/src/components/Gradebook/index.jsx
index 31e1463..a6b1bad 100644
--- a/src/components/Gradebook/index.jsx
+++ b/src/components/Gradebook/index.jsx
@@ -64,7 +64,6 @@ export default class Gradebook extends React.Component {
updateUserId: userEntry.user_id,
updateUserName: userEntry.username,
todaysDate: formatDateForDisplay(new Date()),
- originalGrade: subsection.score_earned,
adjustedGradePossible,
reasonForChange: '',
adjustedGradeValue: '',
@@ -447,7 +446,7 @@ export default class Gradebook extends React.Component {
Assignment:
{this.state.modalAssignmentName}
Student:
{this.state.updateUserName}
-
Original Grade:
{this.state.originalGrade}
+
Original Grade:
{this.props.gradeOriginalEarnedGraded}
Current Grade:
{this.props.gradeOverrideCurrentEarnedGradedOverride}
(
gradeOverrideCurrentEarnedGradedOverride: state.grades.gradeOverrideCurrentEarnedGradedOverride,
gradeOverrideCurrentPossibleGradedOverride:
state.grades.gradeOverrideCurrentPossibleGradedOverride,
+ gradeOriginalEarnedGraded: state.grades.gradeOriginalEarnedGraded,
headings: state.grades.headings,
tracks: state.tracks.results,
cohorts: state.cohorts.results,
diff --git a/src/data/actions/grades.js b/src/data/actions/grades.js
index fed6170..8ac6e66 100644
--- a/src/data/actions/grades.js
+++ b/src/data/actions/grades.js
@@ -49,6 +49,8 @@ const gotGrades = (grades, cohort, track, assignmentType, headings, prev, next,
const gotGradeOverrideHistory = ({
overrideHistory, currentEarnedAllOverride, currentPossibleAllOverride,
currentEarnedGradedOverride, currentPossibleGradedOverride,
+ originalGradeEarnedAll, originalGradePossibleAll, originalGradeEarnedGraded,
+ originalGradePossibleGraded,
}) => ({
type: GOT_GRADE_OVERRIDE_HISTORY,
overrideHistory,
@@ -56,6 +58,10 @@ const gotGradeOverrideHistory = ({
currentPossibleAllOverride,
currentEarnedGradedOverride,
currentPossibleGradedOverride,
+ originalGradeEarnedAll,
+ originalGradePossibleAll,
+ originalGradeEarnedGraded,
+ originalGradePossibleGraded,
});
const gradeUpdateRequest = () => ({ type: GRADE_UPDATE_REQUEST });
@@ -135,6 +141,11 @@ const fetchGradeOverrideHistory = (subsectionId, userId) => (
currentEarnedGradedOverride: data.override ? data.override.earned_graded_override : null,
currentPossibleGradedOverride: data.override ?
data.override.possible_graded_override : null,
+ originalGradeEarnedAll: data.original_grade ? data.original_grade.earned_all : null,
+ originalGradePossibleAll: data.original_grade ? data.original_grade.possible_all : null,
+ originalGradeEarnedGraded: data.original_grade ? data.original_grade.earned_graded : null,
+ originalGradePossibleGraded: data.original_grade ?
+ data.original_grade.possible_graded : null,
}));
})
.catch(() => {
diff --git a/src/data/reducers/grades.js b/src/data/reducers/grades.js
index f44d158..3aad8d6 100644
--- a/src/data/reducers/grades.js
+++ b/src/data/reducers/grades.js
@@ -21,6 +21,10 @@ const initialState = {
gradeOverrideCurrentPossibleAllOverride: null,
gradeOverrideCurrentEarnedGradedOverride: null,
gradeOverrideCurrentPossibleGradedOverride: null,
+ gradeOriginalEarnedAll: null,
+ gradeOriginalPossibleAll: null,
+ gradeOriginalEarnedGraded: null,
+ gradeOriginalPossibleGraded: null,
headings: [],
startedFetching: false,
finishedFetching: false,
@@ -58,6 +62,10 @@ const grades = (state = initialState, action) => {
gradeOverrideCurrentPossibleAllOverride: action.currentPossibleAllOverride,
gradeOverrideCurrentEarnedGradedOverride: action.currentEarnedGradedOverride,
gradeOverrideCurrentPossibleGradedOverride: action.currentPossibleGradedOverride,
+ gradeOriginalEarnedAll: action.originalGradeEarnedAll,
+ gradeOriginalPossibleAll: action.originalGradePossibleAll,
+ gradeOriginalEarnedGraded: action.originalGradeEarnedGraded,
+ gradeOriginalPossibleGraded: action.originalGradePossibleGraded,
errorFetchingOverrideHistory: false,
};