Merge pull request #103 from edx/andytr1/gradebook-remove-edit-by-name

removed username and fake max score

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 {
                       <div>
                         <div className="grade-history-header grade-history-assignment">Assignment: </div> <div>{this.state.modalAssignmentName}</div>
                         <div className="grade-history-header grade-history-student">Student: </div> <div>{this.state.updateUserName}</div>
-                        <div className="grade-history-header grade-history-original-grade">Original Grade: </div> <div>{this.state.originalGrade}</div>
+                        <div className="grade-history-header grade-history-original-grade">Original Grade: </div> <div>{this.props.gradeOriginalEarnedGraded}</div>
                         <div className="grade-history-header grade-history-current-grade">Current Grade: </div> <div>{this.props.gradeOverrideCurrentEarnedGradedOverride}</div>
                       </div>
                       <StatusAlert
@@ -555,6 +554,7 @@ Gradebook.defaultProps = {
   grades: [],
   gradeOverrides: [],
   gradeOverrideCurrentEarnedGradedOverride: null,
+  gradeOriginalEarnedGraded: null,
   location: {
     search: '',
   },
@@ -602,6 +602,7 @@ Gradebook.propTypes = {
     adjustedGrade: PropTypes.number,
   })),
   gradeOverrideCurrentEarnedGradedOverride: PropTypes.number,
+  gradeOriginalEarnedGraded: PropTypes.number,
   headings: PropTypes.arrayOf(PropTypes.string).isRequired,
   history: PropTypes.shape({
     push: PropTypes.func,

src/containers/GradebookPage/index.jsx

@@ -39,6 +39,7 @@ const mapStateToProps = (state, ownProps) => (
     gradeOverrideCurrentEarnedGradedOverride: state.grades.gradeOverrideCurrentEarnedGradedOverride,
     gradeOverrideCurrentPossibleGradedOverride:
       state.grades.gradeOverrideCurrentPossibleGradedOverride,
+    gradeOriginalEarnedGraded: state.grades.gradeOriginalEarnedGraded,
     headings: state.grades.headings,
     tracks: state.tracks.results,
     cohorts: state.cohorts.results,

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(() => {

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,
       };