Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/aut 3352 allow authors to edit score outcome declaration #385

Merged
merged 7 commits into from
Nov 22, 2023
Merged

Feature/aut 3352 allow authors to edit score outcome declaration #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4411564
fix: add handling of NONE template
Karol-Stelmaczonek Nov 7, 2023
2d22bcf
fix: add unit test
Karol-Stelmaczonek Nov 8, 2023
d710127
feature: add template NONE to other interactions
Karol-Stelmaczonek Nov 8, 2023
6929bd9
feat: update MAXSCORE with external SCORE value
viktar-dzmitryieu-tao Nov 8, 2023
01bddbf
feat: remove MAXSCORE and SCORE functionality
viktar-dzmitryieu-tao Nov 9, 2023
2d1a89e
fix: normal maximum for SCORE outcome
viktar-dzmitryieu-tao Nov 16, 2023
9d96b40
Merge pull request #386 from oat-sa/feature/AUT-3353/update-maxscore-…
viktar-dzmitryieu-tao Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 70 additions & 23 deletions src/qtiItem/helper/maxScore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ var pairExists = function pairExists(collection, pair) {
}
return collection[pair[0] + ' ' + pair[1]] || collection[pair[1] + ' ' + pair[0]];
};
const externalScoredValues = ['human', 'externalMachine'];

export default {
/**
Expand All @@ -48,9 +49,15 @@ export default {
scoreOutcome = item.getOutcomeDeclaration('SCORE');

//try setting the computed normal maximum only if the processing type is known, i.e. 'templateDriven'
if (scoreOutcome && item.responseProcessing && item.responseProcessing.processingType === 'templateDriven') {
if (
scoreOutcome &&
item.responseProcessing &&
item.responseProcessing.processingType === 'templateDriven' &&
!externalScoredValues.includes(scoreOutcome.attr('externalScored'))
) {
const interactions = item.getInteractions();
normalMaximum = _.reduce(
item.getInteractions(),
interactions,
function (acc, interaction) {
var interactionMaxScore = interaction.getNormalMaximum();
if (_.isNumber(interactionMaxScore)) {
Expand Down Expand Up @@ -83,28 +90,32 @@ export default {

//try setting the computed normal maximum only if the processing type is known, i.e. 'templateDriven'
if (scoreOutcome && item.responseProcessing && item.responseProcessing.processingType === 'templateDriven') {
maxScore = _.reduce(
item.getInteractions(),
function (acc, interaction) {
var interactionMaxScore = interaction.getNormalMaximum();
if (_.isNumber(interactionMaxScore)) {
return gamp.add(acc, interactionMaxScore);
} else {
hasInvalidInteraction = true;
return acc;
}
},
0
);

customOutcomes = _(item.getOutcomes()).filter(function (outcome) {
return outcome.id() !== 'SCORE' && outcome.id() !== 'MAXSCORE';
});
const interactions = item.getInteractions();
if (externalScoredValues.includes(scoreOutcome.attr('externalScored'))) {
maxScore = scoreOutcome.attr('normalMaximum') || 0;
} else {
maxScore = _.reduce(
interactions,
function (acc, interaction) {
var interactionMaxScore = interaction.getNormalMaximum();
if (_.isNumber(interactionMaxScore)) {
return gamp.add(acc, interactionMaxScore);
} else {
hasInvalidInteraction = true;
return acc;
}
},
0
);
customOutcomes = _(item.getOutcomes()).filter(function (outcome) {
return outcome.id() !== 'SCORE' && outcome.id() !== 'MAXSCORE';
});

if (customOutcomes.size()) {
maxScore = customOutcomes.reduce(function (acc, outcome) {
return gamp.add(acc, parseFloat(outcome.attr('normalMaximum') || 0));
}, maxScore);
if (customOutcomes.size()) {
maxScore = customOutcomes.reduce(function (acc, outcome) {
return gamp.add(acc, parseFloat(outcome.attr('normalMaximum') || 0));
}, maxScore);
}
}

maxScoreOutcome = item.getOutcomeDeclaration('MAXSCORE');
Expand Down Expand Up @@ -133,6 +144,18 @@ export default {
item.removeOutcome('MAXSCORE');
}
}

const isAllResponseProcessingRulesNone = !interactions.some(interaction => {
const responseDeclaration = interaction.getResponseDeclaration();
const template = responseHelper.getTemplateNameFromUri(responseDeclaration.template);
return template !== 'NONE';
});
// remove MAXSCORE and SCORE outcome variables when all interactions are configured with none response processing rule,
// and the externalScored property of the SCORE variable is set to None
if (!scoreOutcome.attr('externalScored') && isAllResponseProcessingRulesNone) {
item.removeOutcome('MAXSCORE');
item.removeOutcome('SCORE');
}
}
},

Expand Down Expand Up @@ -261,6 +284,9 @@ export default {
} else if (template === 'MAP_RESPONSE_POINT') {
//map point response processing does not work on choice based interaction
max = 0;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -302,6 +328,9 @@ export default {
} else if (template === 'MAP_RESPONSE' || template === 'MAP_RESPONSE_POINT') {
//map response processing does not work on order based interaction
max = 0;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -485,6 +514,9 @@ export default {
}
} else if (template === 'MAP_RESPONSE_POINT') {
max = 0;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -676,6 +708,9 @@ export default {
}
} else if (template === 'MAP_RESPONSE_POINT') {
max = false;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -724,6 +759,9 @@ export default {
if (responseDeclaration.mappingAttributes.upperBound) {
max = Math.min(max, parseFloat(responseDeclaration.mappingAttributes.upperBound || 0));
}
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -769,6 +807,9 @@ export default {
}
} else if (template === 'MAP_RESPONSE_POINT') {
max = 0;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -833,6 +874,9 @@ export default {
}
} else if (template === 'MAP_RESPONSE_POINT') {
max = 0;
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
}
return max;
},
Expand Down Expand Up @@ -867,6 +911,9 @@ export default {
if (responseDeclaration.mappingAttributes.upperBound) {
max = Math.min(max, parseFloat(responseDeclaration.mappingAttributes.upperBound || 0));
}
} else if (template === 'NONE') {
//get the normalMaximum from SCORE outcome because we don't have any choices selected
max = interaction.getRootElement().getOutcomeDeclaration('SCORE').getAttributes().normalMaximum;
} else {
max = 0;
}
Expand Down
Loading
Loading