Andal.LND/frontend-app-authoring
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: make max attempts setting fallback to default

Browse Source 
The max attempts setting for a problem xblock should be set to null for
course default max attempt setting to take effect. This makes sure that
xblock setting is updated if course default is updated.
This commit is contained in:
Navin Karkera
2023-10-06 20:35:51 +05:30
parent 564d724d5b
commit c70679da54
7 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/editors/containers/ProblemEditor/data/ReactStateSettingsParser.js
View File

@@ -19,7 +19,7 @@ class ReactStateSettingsParser {
let settings = {};
const stateSettings = this.problem.settings;
settings = popuplateItem(settings, 'number', 'max_attempts', stateSettings.scoring.attempts);
settings = popuplateItem(settings, 'number', 'max_attempts', stateSettings.scoring.attempts, true);
settings = popuplateItem(settings, 'weight', 'weight', stateSettings.scoring);
settings = popuplateItem(settings, 'on', 'showanswer', stateSettings.showAnswer);
settings = popuplateItem(settings, 'afterAttempts', 'attempts_before_showanswer_button', stateSettings.showAnswer);

22
src/editors/containers/ProblemEditor/data/SettingsParser.js
View File

@@ -2,21 +2,31 @@ import _ from 'lodash-es';
import { ShowAnswerTypes, RandomizationTypesKeys } from '../../../data/constants/problem';
export const popuplateItem = (parentObject, itemName, statekey, metadata) => {
export const popuplateItem = (parentObject, itemName, statekey, metadata, allowNull=false) => {
let parent = parentObject;
const item = _.get(metadata, itemName, null);
if (!_.isNil(item)) {
if (!_.isNil(item) || allowNull) {
parent = { ...parentObject, [statekey]: item };
}
return parent;
};
export const parseScoringSettings = (metadata) => {
export const parseScoringSettings = (metadata, defaultSettings) => {
let scoring = {};
let attempts = popuplateItem({}, 'max_attempts', 'number', metadata);
if (_.isEmpty(attempts) || _.isNaN(attempts.number)) {
// TODO: impove below condition handling
if ((_.isEmpty(attempts) || _.isNaN(attempts.number)) && _.isNaN(defaultSettings.max_attempts)) {
attempts = { unlimited: true, number: '' };
} else if (!_.isEmpty(attempts) && !_.isNaN(attempts.number)) {
attempts.unlimited = false;
attempts.number = attempts.number;
if (attempts.number < 0) {
attempts.number = 0;
}
} else if (!_.isNaN(defaultSettings.max_attempts)) {
attempts.unlimited = false;
attempts.number = defaultSettings.max_attempts;
} else {
attempts.unlimited = false;
if (attempts.number < 0) {
@@ -43,14 +53,14 @@ export const parseShowAnswer = (metadata) => {
return showAnswer;
};
export const parseSettings = (metadata) => {
export const parseSettings = (metadata, defaultSettings) => {
let settings = {};
if (_.isNil(metadata) || _.isEmpty(metadata)) {
return settings;
}
const scoring = parseScoringSettings(metadata);
const scoring = parseScoringSettings(metadata, defaultSettings);
if (!_.isEmpty(scoring)) {
settings = { ...settings, scoring };
}