Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
AngelFQC committed Jun 11, 2024
2 parents 2cf10c5 + b70bf38 commit 41275ec
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 28 deletions.
4 changes: 3 additions & 1 deletion public/main/lp/ScormApi.php
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,9 @@ public static function switchItem($lpId, $user_id, $view_id, $current_item, $nex
// Encode JSON without escaping Unicode characters
$titleItemParents = json_encode($escapedParents, JSON_UNESCAPED_UNICODE | JSON_HEX_APOS | JSON_HEX_QUOT);
}
$return .= "olms.lms_lp_item_parents={$titleItemParents};";
if (!empty($titleItemParents)) {
$return .= "olms.lms_lp_item_parents={$titleItemParents};";
}

//$return .= 'updateGamificationValues(); ';
$mylp->set_error_msg('');
Expand Down
60 changes: 33 additions & 27 deletions public/main/template/default/exercise/submit.js.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -224,32 +224,38 @@ jsPlumb.ready(function () {
});
$(function () {
DraggableAnswer.init(
$(".exercise-draggable-answer"),
$(".droppable")
);
// if shuffle answers
if ('{{ shuffle_answers }}' == '1') {
$('.exercise-draggable-answer').each(function(){
// get current ul
var $ul = $(this);
// get array of list items in current ul
var $liArr = $ul.children('li');
// sort array of list items in current ul randomly
$liArr.sort(function(a,b){
// Get a random number between 0 and 10
var temp = parseInt( Math.random()*100 );
// Get 1 or 0, whether temp is odd or even
var isOddOrEven = temp%2;
// Get +1 or -1, whether temp greater or smaller than 5
var isPosOrNeg = temp>5 ? 1 : -1;
// Return -1, 0, or +1
return( isOddOrEven*isPosOrNeg );
})
// append list items to ul
.appendTo($ul);
});
}
DraggableAnswer.init(
$(".exercise-draggable-answer"),
$(".droppable")
);
// if shuffle answers
if ('{{ shuffle_answers }}' == '1') {
$('.exercise-draggable-answer').each(function() {
var $ul = $(this);
var $liArr = $ul.children('li').toArray();
function shuffle(array) {
for (let i = array.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1));
[array[i], array[j]] = [array[j], array[i]];
}
return array;
}
var previousOrder = $liArr.map(item => item.id).join();
var newOrder;
do {
shuffle($liArr);
newOrder = $liArr.map(item => item.id).join();
} while (newOrder === previousOrder);
// Detach and append list items to preserve event handlers
$.each($liArr, function(index, item) {
$ul.append($(item).detach());
});
});
}
});
</script>

0 comments on commit 41275ec

Please sign in to comment.