Skip to content

Add the JAAL2.0 working player fixes to the JAAL2.0 branch #16

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

Open
Meratyn wants to merge 2 commits into
base: jaal2.0
Choose a base branch
from
Open

Add the JAAL2.0 working player fixes to the JAAL2.0 branch #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
353473f
Export gradable property from JSAV-min.js
Meratyn Aug 19, 2022
0905ffb
Initial working JAAL 2.0 version of player
Meratyn Sep 16, 2022
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
6 changes: 3 additions & 3 deletions player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function initializeAnimationView(submission, detailed) {
function initializeModelAnswerView(submission) {
const modelAnswer = submission.definitions.modelAnswer;
if (modelAnswer.length > 0) {
var initialStateHTML = getModelAnswerInitialHTML(modelAnswer);
var initialStateHTML = submission.initialState.modelSvg;
} else {
$('#model-answer-container').html('<h3>No model answer data</h3>');
return;
Expand Down Expand Up @@ -164,8 +164,8 @@ function getModelAnswerInitialHTML(modelAnswer) {
* @returns a list of the modelAnswer steps with type click.
*/
function getModelAnswerSteps(modelAnswer) {
// modelAnswer.shift();
return modelAnswer.filter(step => step.type === 'click');
modelAnswer = modelAnswer.flat();
return modelAnswer.filter(step => step.gradable === true);
}

/**
Expand Down
3 changes: 2 additions & 1 deletion testbench/OpenDSA/JSAV/build/JSAV-min.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,8 @@
var eventData = {
"type": action,
"currentStep": that.currentStep(),
"totalSteps": that.totalSteps()
"totalSteps": that.totalSteps(),
"gradable": that._undo[that._undo.length - 1].options.grade ?? false,
};
that.logEvent(eventData);
}
Expand Down