correct poor choice of abbreviation

This commit is contained in:
Matt Hughes
2019-08-13 10:52:02 -04:00
parent e787d3a697
commit f46fe3f8ee
4 changed files with 26 additions and 21 deletions

View File

@@ -138,7 +138,7 @@ export default class Gradebook extends React.Component {
const typedValue = { label: assignment, type, id };
this.props.updateAssignmentFilter(typedValue);
this.updateQueryParams({ assignment: id });
this.props.updateGradesIfAssigGradeFiltersSet(
this.props.updateGradesIfAssignmentGradeFiltersSet(
this.props.courseId,
this.props.selectedCohort,
this.props.selectedTrack,
@@ -862,5 +862,5 @@ Gradebook.propTypes = {
filteredUsersCount: PropTypes.number,
showDownloadButtons: PropTypes.bool,
initializeFilters: PropTypes.func.isRequired,
updateGradesIfAssigGradeFiltersSet: PropTypes.func.isRequired,
updateGradesIfAssignmentGradeFiltersSet: PropTypes.func.isRequired,
};

View File

@@ -11,13 +11,13 @@ import {
submitFileUploadFormData,
toggleGradeFormat,
updateGrades,
updateGradesIfAssigGradeFiltersSet,
updateGradesIfAssignmentGradeFiltersSet,
} from '../../data/actions/grades';
import { fetchCohorts } from '../../data/actions/cohorts';
import { fetchTracks } from '../../data/actions/tracks';
import { initializeFilters, updateAssignmentFilter, updateAssignmentLimits } from '../../data/actions/filters';
import stateHasMastersTrack from '../../data/selectors/tracks';
import { getBulkManagementHistory, getHeadings, formatMinAssigGrade, formatMaxAssigGrade } from '../../data/selectors/grades';
import { getBulkManagementHistory, getHeadings, formatMinAssignmentGrade, formatMaxAssignmentGrade } from '../../data/selectors/grades';
import { selectableAssignmentLabels } from '../../data/selectors/filters';
import { getCohortNameById } from '../../data/selectors/cohorts';
import { fetchAssignmentTypes } from '../../data/actions/assignmentTypes';
@@ -51,8 +51,8 @@ const mapStateToProps = (state, ownProps) => (
selectedCohort: state.filters.cohort,
selectedAssignmentType: state.filters.assignmentType,
selectedAssignment: (state.filters.assignment || {}).label,
selectedMinAssigGrade: state.filters.assignmentGradeMin || 0,
selectedMaxAssigGrade: state.filters.assignmentGradeMax || 100,
selectedMinAssignmentGrade: state.filters.assignmentGradeMin || 0,
selectedMaxAssignmentGrade: state.filters.assignmentGradeMax || 100,
format: state.grades.gradeFormat,
showSuccess: state.grades.showSuccess,
errorFetchingGradeOverrideHistory: state.grades.errorFetchingOverrideHistory,
@@ -68,12 +68,12 @@ const mapStateToProps = (state, ownProps) => (
track: state.filters.track,
assignment: (state.filters.assignment || {}).id,
assignmentType: state.filters.assignmentType,
assignmentGradeMin: formatMinAssigGrade(
assignmentGradeMin: formatMinAssignmentGrade(
state,
(state.filters.assignment || {}).id,
state.filters.assignmentGradeMin,
),
assignmentGradeMax: formatMaxAssigGrade(
assignmentGradeMax: formatMaxAssignmentGrade(
state,
(state.filters.assignment || {}).id,
state.filters.assignmentGradeMax,
@@ -112,7 +112,7 @@ const mapDispatchToProps = {
initializeFilters,
updateAssignmentFilter,
updateAssignmentLimits,
updateGradesIfAssigGradeFiltersSet,
updateGradesIfAssignmentGradeFiltersSet,
};
const GradebookPage = connect(

View File

@@ -20,7 +20,7 @@ import {
} from '../constants/actionTypes/grades';
import LmsApiService from '../services/LmsApiService';
import { sortAlphaAsc, formatDateForDisplay } from './utils';
import { formatMaxAssigGrade, formatMinAssigGrade } from '../selectors/grades';
import { formatMaxAssignmentGrade, formatMinAssignmentGrade } from '../selectors/grades';
import { getFilters } from '../selectors/filters';
import apiClient from '../apiClient';
@@ -108,12 +108,12 @@ const fetchGrades = (
dispatch(startedFetchingGrades());
const {
assignment,
assignmentGradeMax: assigMax,
assignmentGradeMin: assigMin,
assignmentGradeMax: assignmentMax,
assignmentGradeMin: assignmentMin,
} = getFilters(getState());
const { id: assignmentId } = assignment || {};
const assignmentGradeMax = formatMaxAssigGrade(getState(), assignmentId, assigMax);
const assignmentGradeMin = formatMinAssigGrade(getState(), assignmentId, assigMin);
const assignmentGradeMax = formatMaxAssignmentGrade(getState(), assignmentId, assignmentMax);
const assignmentGradeMin = formatMinAssignmentGrade(getState(), assignmentId, assignmentMin);
return LmsApiService.fetchGradebookData(
courseId,
options.searchText || null,
@@ -264,15 +264,15 @@ const fetchBulkUpgradeHistory = courseId => (
}).catch(() => dispatch(bulkHistoryError()))
);
const updateGradesIfAssigGradeFiltersSet = (
const updateGradesIfAssignmentGradeFiltersSet = (
courseId,
cohort,
track,
assignmentType,
) => (dispatch, getState) => {
const { filters } = getState();
const hasAssigGradeFiltersSet = filters.assignmentGradeMax || filters.assignmentGradeMin;
if (hasAssigGradeFiltersSet) {
const hasAssignmentGradeFiltersSet = filters.assignmentGradeMax || filters.assignmentGradeMin;
if (hasAssignmentGradeFiltersSet) {
dispatch(fetchGrades(
courseId,
cohort,
@@ -300,5 +300,5 @@ export {
submitFileUploadFormData,
fetchBulkUpgradeHistory,
fetchGradeOverrideHistory,
updateGradesIfAssigGradeFiltersSet,
updateGradesIfAssignmentGradeFiltersSet,
};

View File

@@ -82,17 +82,22 @@ const getHeadings = (state) => {
return headingMapper(type, assignment)(assignments);
};
const formatMaxAssigGrade = (state, assignmentId, percentGrade) => {
const formatMaxAssignmentGrade = (state, assignmentId, percentGrade) => {
if (percentGrade === '100') {
return null;
}
return percentGrade;
};
const formatMinAssigGrade = (state, assignmentId, percentGrade) => {
const formatMinAssignmentGrade = (state, assignmentId, percentGrade) => {
if (percentGrade === '0') {
return null;
}
return percentGrade;
};
export { getBulkManagementHistory, getHeadings, formatMinAssigGrade, formatMaxAssigGrade };
export {
getBulkManagementHistory,
getHeadings,
formatMinAssignmentGrade,
formatMaxAssignmentGrade,
};