Andal.LND/frontend-app-gradebook
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct poor choice of abbreviation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
src/data/actions/grades.js
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,
};

11
src/data/selectors/grades.js
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,
};