Skip to content
This repository was archived by the owner on Jun 7, 2023. It is now read-only.

Changes to adaptive Parsons problems #406

Merged
bnmnetp merged 3 commits into from
Jun 29, 2017
Merged

Changes to adaptive Parsons problems #406

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8bf3bf
Merge remote-tracking branch 'RunestoneInteractive/master'
ericsonga May 2, 2017
60e458e
Changes to the adaptive Parsons problems
ericsonga Jun 28, 2017
1e97083
Merge remote-tracking branch 'RunestoneInteractive/master'
ericsonga Jun 29, 2017
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
80 changes: 52 additions & 28 deletions runestone/parsons/js/parsons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
======== parsons.py script and the RST file.
==== CONTRIBUTORS ======================================================
======== Isaiah Mayerchak
======== Barbara Ericson
======== Jeff Rick
======== Barbara Ericson
==== Adapted form the original JS Parsons by ===========================
======== Ville Karavirta
======== Petri Ihantola
Expand Down Expand Up @@ -126,7 +126,7 @@ LineBasedGrader.prototype.grade = function() {
feedbackArea.html("Perfect! It took you only one try to solve this. Great job!");
}
correct = true;
problem.helpButton.disabled = true;
problem.helpButton.disabled = false; // bje
} else {
// Incorrect Indention
state = "incorrectIndent";
Expand Down Expand Up @@ -1058,6 +1058,7 @@ Parsons.prototype.init = function (opts) {
var content = temp[1];
this.blockIndex = 0;
this.checkCount = 0;
this.numDistinct = 0;
this.hasSolved = false;
this.initializeLines(content);
this.initializeView();
Expand Down Expand Up @@ -1208,7 +1209,6 @@ Parsons.prototype.initializeView = function () {
event.preventDefault();
that.clearFeedback();
that.resetView();
//that.helpMe();
that.logMove("reset");
that.setLocalStorage();
});
Expand All @@ -1217,7 +1217,7 @@ Parsons.prototype.initializeView = function () {
$(this.helpButton).attr("class", "btn btn-primary");
this.helpButton.textContent = "Help Me";
this.helpButton.id = this.counterId + "-help";
this.helpButton.disabled = true;
this.helpButton.disabled = false; // bje
this.parsonsControlDiv.appendChild(this.helpButton);
this.helpButton.addEventListener('click', function(event) {
event.preventDefault();
Expand Down Expand Up @@ -2061,8 +2061,9 @@ Parsons.prototype.solutionIndent = function() {
Parsons.prototype.checkMe = function() {
if (!this.hasSolved)
{

this.checkCount++;
this.clearFeedback();
this.checkCount++;
if (this.options.adaptive) {
localStorage.setItem(this.adaptiveId + "Count", this.checkCount);
}
Expand All @@ -2078,29 +2079,30 @@ Parsons.prototype.checkMe = function() {
this.logAnswer(grade);
this.setLocalStorage();

// if not solved then check if should provide help
if (!this.hasSolved)
// if not solved and not too short then check if should provide help
if (!this.hasSolved && grade !== "incorrectTooShort")
{
if (this.canHelp) {
// only count the attempt if the answer is different (to prevent gaming)
var answerHash = this.answerHash();
if (this.lastAnswerHash !== answerHash) {
this.helpCount++;
this.numDistinct++;
this.lastAnswerHash = answerHash;
}

// if time to offer help
if (this.helpCount == 0) {
if (this.numDistinct == 3 && !this.gotHelp) {
// activate the help button and wiggle it
this.helpButton.disabled = false;
$(this.helpButton).css("position","relative");
for (var x = 1; x <= 3; x++) {
$(this.helpButton)
.animate({ left : -5 }, 60)
.animate({ left : 5 }, 120)
.animate({ left : 0 }, 60);
} // end for
} // end if helpCount = 0
//this.helpButton.disabled = false;
//$(this.helpButton).css("position","relative");
//for (var x = 1; x <= 3; x++) {
// $(this.helpButton)
// .animate({ left : -5 }, 60)
// .animate({ left : 5 }, 120)
// .animate({ left : 0 }, 60);
alert("Click on the Help Me button if you want to make the problem easier");
//} // end for
} // end if
} // end if can help
} // end if not solved
} // end outer if not solved
Expand All @@ -2123,8 +2125,10 @@ Parsons.prototype.initializeAdaptive = function() {
this.adaptiveId = this.adaptiveId + "-parsons";
}
this.canHelp = true;
this.helpCount = -3; // Number of checks before help is offered
//this.helpCount = -3; // Number of checks before help is offered
this.checkCount = 0;
this.numDistinct = 0; // number of distinct solution attempts (different from previous)
this.gotHelp = false;
// Initialize the userRating
var storageProblem = localStorage.getItem(this.adaptiveId + "Problem");
if (storageProblem == this.divid) {
Expand Down Expand Up @@ -2555,33 +2559,52 @@ Parsons.prototype.combineBlocks = function() {
Parsons.prototype.makeEasier = function() {
var distractorToRemove = this.distractorToRemove();
if (distractorToRemove !== undefined) {
alert("Will remove an incorrect code block");
this.removeDistractor(distractorToRemove);
this.logMove("removedDistractor-" + distractorToRemove.hash());
} else if (this.usesIndentation()) {
alert("Will provide indentation");
this.removeIndentation();
this.logMove("removedIndentation");
} else {
var numberOfBlocks = this.numberOfBlocks();
if (this.numberOfBlocks() > 3) {
alert("Will combine two blocks");
this.combineBlocks();
this.logMove("combinedBlocks");
}
if (numberOfBlocks < 5) {
else {
alert("There are only 3 blocks left. You should be able to put them in order");
this.canHelp = false;
this.helpButton.disabled = true;
}
//if (numberOfBlocks < 5) {
// this.canHelp = false;
// this.helpButton.disabled = true;
//}
}
};

// The "Help Me" button was pressed and the problem should be simplified
Parsons.prototype.helpMe = function() {
this.clearFeedback();
this.helpCount = -1; // amount to allow for multiple helps in a row
if (this.helpCount < 0) {
this.helpCount = Math.max(this.helpCount, -1); // min 1 attempt before more help
this.helpButton.disabled = true;

//this.helpCount = -1; // amount to allow for multiple helps in a row
//if (this.helpCount < 0) {
// this.helpCount = Math.max(this.helpCount, -1); // min 1 attempt before more help
//this.helpButton.disabled = true;
//}

// if less than 3 attempts
if (this.numDistinct < 3)
{
alert("You must make at least three distinct full attempts at a solution before you can get help");
}
// otherwise give help
else
{
this.gotHelp = true;
this.makeEasier();
}
this.makeEasier();
};

/* =====================================================================
Expand Down Expand Up @@ -2963,11 +2986,12 @@ Parsons.prototype.resetView = function() {
this.noindent = this.options.noindent;
// Reinitialize
this.checkCount = 0;
this.numDistinct = 0;
this.hasSolved = false;
if (this.options.adaptive) {
this.canHelp = true;
this.helpCount = -3; // enable after 3 failed attempts
this.helpButton.disabled = true;
//this.helpCount = -3; // enable after 3 failed attempts
//this.helpButton.disabled = true;
localStorage.setItem(this.adaptiveId + "Problem", this.divid);
localStorage.setItem(this.adaptiveId + "Count", this.checkCount);
localStorage.setItem(this.adaptiveId + "Solved", false);
Expand Down