diff --git a/lms/static/scripts/frontend_apps/api-types.ts b/lms/static/scripts/frontend_apps/api-types.ts index 84488a12c9..748aeb574c 100644 --- a/lms/static/scripts/frontend_apps/api-types.ts +++ b/lms/static/scripts/frontend_apps/api-types.ts @@ -226,6 +226,9 @@ type AssignmentWithCourse = Assignment & { * - scaled: students may get a proportional grade based on the amount of * annotations. If requirement is 4, and they created 3, they'll * get a 75% + * + * @todo `scaled` is now referenced as `proportional` in user-facing texts. + * We should consolidate it eventually. */ export type GradingType = 'all_or_nothing' | 'scaled'; diff --git a/lms/static/scripts/frontend_apps/components/AutoGradingConfigurator.tsx b/lms/static/scripts/frontend_apps/components/AutoGradingConfigurator.tsx index d99500868f..682f03504d 100644 --- a/lms/static/scripts/frontend_apps/components/AutoGradingConfigurator.tsx +++ b/lms/static/scripts/frontend_apps/components/AutoGradingConfigurator.tsx @@ -122,16 +122,16 @@ export default function AutoGradingConfigurator({ } > Must meet minimum requirements.} + value="scaled" + subtitle={3 annotations out of 4 is 75%} > - All or nothing + Proportional Proportional to percent completed.} + value="all_or_nothing" + subtitle={3 annotations out of 4 is 0%} > - Scaled + All or nothing diff --git a/lms/static/scripts/frontend_apps/components/FilePickerApp.tsx b/lms/static/scripts/frontend_apps/components/FilePickerApp.tsx index 0986475b3f..8736bc723d 100644 --- a/lms/static/scripts/frontend_apps/components/FilePickerApp.tsx +++ b/lms/static/scripts/frontend_apps/components/FilePickerApp.tsx @@ -203,7 +203,7 @@ export default function FilePickerApp({ onSubmit }: FilePickerAppProps) { if (!assignmentAutoGradingConfig) { return { enabled: false, - grading_type: 'all_or_nothing', + grading_type: 'scaled', activity_calculation: 'cumulative', required_annotations: 1, }; diff --git a/lms/static/scripts/frontend_apps/components/dashboard/test/GradeIndicator-test.js b/lms/static/scripts/frontend_apps/components/dashboard/test/GradeIndicator-test.js index 6736b2477c..511ff4ed37 100644 --- a/lms/static/scripts/frontend_apps/components/dashboard/test/GradeIndicator-test.js +++ b/lms/static/scripts/frontend_apps/components/dashboard/test/GradeIndicator-test.js @@ -6,7 +6,7 @@ import GradeIndicator from '../GradeIndicator'; describe('GradeIndicator', () => { const defaultConfig = { - grading_type: 'all_or_nothing', + grading_type: 'scaled', activity_calculation: 'separate', required_annotations: 1, required_replies: 1, diff --git a/lms/static/scripts/frontend_apps/components/test/AutoGradingConfigurator-test.js b/lms/static/scripts/frontend_apps/components/test/AutoGradingConfigurator-test.js index c9efd4336d..583623c94b 100644 --- a/lms/static/scripts/frontend_apps/components/test/AutoGradingConfigurator-test.js +++ b/lms/static/scripts/frontend_apps/components/test/AutoGradingConfigurator-test.js @@ -10,7 +10,7 @@ describe('AutoGradingConfigurator', () => { beforeEach(() => { fakeAutoGradingConfig = { - grading_type: 'all_or_nothing', + grading_type: 'scaled', activity_calculation: 'cumulative', required_annotations: 1, }; @@ -80,7 +80,7 @@ describe('AutoGradingConfigurator', () => { assert.equal(inputs.length, activityCalculation === 'separate' ? 2 : 1); assert.equal( firstInput.text(), - `Annotations${activityCalculation === 'cumulative' ? ' and replies' : ''}Minimum`, + `Annotations${activityCalculation === 'cumulative' ? ' and replies' : ''}Goal`, ); }); });