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

Decoupled real time answer and correct answer info options #2622

Closed
wants to merge 3 commits into from
Closed

Decoupled real time answer and correct answer info options #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b1735c
Decoupled real time answer and correct answer info options
Mann47 Aug 16, 2024
1a81ba8
fixed sonar issue
Mann47 Aug 16, 2024
5936998
fixed sonar issue
Mann47 Aug 16, 2024
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
1 change: 0 additions & 1 deletion css/qsm-admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3358,7 +3358,6 @@ body .qsm_tab_content .qsm-small-input-field input[type="text"] {
padding-top: 4px;
}
fieldset#enable_quick_correct_answer_info {
margin-left: 25px;
margin-top: 4px;
}
.qsm-mb-1, .qsm_tab_content fieldset{
Expand Down
11 changes: 0 additions & 11 deletions js/qsm-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,6 @@ var QSMAdmin;
jQuery('.category_selection_random').parents("tr").hide();
}
});
show_hide_show_correct_answer();
$(document).on('change', '#enable_quick_result_mc-1', function (event) {
show_hide_show_correct_answer();
});
function show_hide_show_correct_answer() {
if (jQuery('#enable_quick_result_mc-1:checked').length > 0) {
jQuery('#enable_quick_correct_answer_info').css('opacity', '1');
} else {
jQuery('#enable_quick_correct_answer_info').css('opacity', '0.5');
}
}
jQuery(document).on('change', '#preferred-date-format-custom', function() {
let customValue = jQuery(this).val();
jQuery('#preferred_date_format label.qsm-option-label:last input[type="radio"]').val(customValue);
Expand Down
104 changes: 91 additions & 13 deletions js/qsm-quiz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1484,14 +1484,59 @@ jQuery(function () {
let value = jQuery(this).val();
let $this = jQuery(this).parents('.quiz_section');
let question_id = $i_this.attr('name').split('question')[1];
if (qmn_quiz_data[quizID].enable_quick_result_mc == 1) {
if (qmn_quiz_data[quizID].enable_quick_result_mc == 1 || qmn_quiz_data[quizID].enable_quick_correct_answer_info != 0) {
qsm_show_inline_result(quizID, question_id, value, $this, 'radio', $i_this)
}
jQuery(document).trigger('qsm_after_select_answer', [quizID, question_id, value, $this, 'radio']);
if (qmn_quiz_data[quizID].end_quiz_if_wrong > 0 && !jQuery(this).parents('.qsm-quiz-container').find('.mlw_next:visible').length ) {
qsm_submit_quiz_if_answer_wrong(question_id, value, $this, $quizForm);
}
});

jQuery(document).on('change', '.mlw_answer_number, .mlw_answer_open_text, .qmn_fill_blank, .mlw_answer_date', function (e) {
let $i_this = jQuery(this);
let quizID = jQuery(this).parents('.qsm-quiz-container').find('.qmn_quiz_id').val();
let $quizForm = QSM.getQuizForm(quizID);
let value = jQuery(this).val();
let $this = jQuery(this).parents('.quiz_section');
let question_id = $i_this.attr('name').split('question')[1];

if ($this.find('#mlw_code_captcha').length) {
return;
}

handleQuizLogic(quizID, question_id, value, $this, $i_this, $quizForm);
});

function handleQuizLogic(quizID, question_id, value, $this, $i_this, $quizForm) {
const quizData = qmn_quiz_data[quizID];

if (quizData.enable_quick_result_mc == 1) {
qsm_show_inline_result(quizID, question_id, value, $this, 'input', $i_this);
} else {
handleQuickCorrectAnswerInfo(quizData, question_id, value, $this);
}

jQuery(document).trigger('qsm_after_select_answer', [quizID, question_id, value, $this, 'input']);

if (quizData.end_quiz_if_wrong > 0 && !$this.parents('.qsm-quiz-container').find('.mlw_next:visible').length) {
qsm_submit_quiz_if_answer_wrong(question_id, value, $this, $quizForm);
}
}

function handleQuickCorrectAnswerInfo(quizData, question_id, value, $this) {
const enableQuickCorrectAnswerInfo = quizData.enable_quick_correct_answer_info;

if (enableQuickCorrectAnswerInfo != 0) {
let data = qsm_question_quick_result_js(question_id, value, 'input', enableQuickCorrectAnswerInfo, quizData.quiz_id);
$this.find('.quick-question-res-p, .qsm-inline-correct-info').remove();

if (value.length > 0) {
let message = qsm_check_shortcode(data.message);
$this.append(`<div class="qsm-inline-correct-info">${message}</div>`);
}
}
}
let qsm_inline_result_timer;
jQuery(document).on('keyup', '.mlw_answer_open_text, .mlw_answer_number, .qmn_fill_blank ', function (e) {
let $i_this = jQuery(this);
Expand All @@ -1507,13 +1552,15 @@ jQuery(function () {
} else {
value = $i_this.val();
}
if (!$this.find('#mlw_code_captcha').length) {
clearTimeout(qsm_inline_result_timer);
qsm_inline_result_timer = setTimeout(() => {
if (qmn_quiz_data[quizID].enable_quick_result_mc == 1) {
qsm_show_inline_result(quizID, question_id, value, $this, 'input', $i_this, $this.find('.qmn_fill_blank').index($i_this));
}
jQuery(document).trigger('qsm_after_select_answer', [quizID, question_id, value, $this, 'input', $this.find('.qmn_fill_blank').index($i_this)]);
}, 2000);
}
});

//inline result status function
Expand All @@ -1539,7 +1586,7 @@ jQuery(function () {
if (qmn_quiz_data[quizID].end_quiz_if_wrong > 0 && !jQuery(this).parents('.qsm-quiz-container').find('.mlw_next:visible').length ) {
qsm_submit_quiz_if_answer_wrong(question_id, checkedValues, $this, $quizForm, 'checkbox');
}
if (qmn_quiz_data[quizID].enable_quick_result_mc == 1) {
if (qmn_quiz_data[quizID].enable_quick_result_mc == 1 || qmn_quiz_data[quizID].enable_quick_correct_answer_info != 0) {
qsm_show_inline_result(quizID, question_id, checkedValues, $this, 'checkbox', $i_this)
}
jQuery(document).trigger('qsm_after_select_answer', [quizID, question_id, checkedValues, $this, 'checkbox']);
Expand Down Expand Up @@ -1795,24 +1842,55 @@ function qsm_check_shortcode(message = null) {

function qsm_show_inline_result(quizID, question_id, value, $this, answer_type, $i_this, index = null) {
jQuery('.qsm-spinner-loader').remove();
addSpinnerLoader($this,$i_this);
let data = qsm_question_quick_result_js(question_id, value, answer_type, qmn_quiz_data[quizID].enable_quick_correct_answer_info,quizID);
addSpinnerLoader($this, $i_this);

let data = qsm_question_quick_result_js(question_id, value, answer_type, qmn_quiz_data[quizID].enable_quick_correct_answer_info, quizID);

$this.find('.quick-question-res-p, .qsm-inline-correct-info').remove();
$this.find('.qmn_radio_answers').children().removeClass('data-correct-answer');
if ( 0 < value.length && data.success == 'correct') {
$this.append('<div style="color: green" class="quick-question-res-p qsm-correct-answer-info">' + qmn_quiz_data[quizID].quick_result_correct_answer_text + '</div>')
$this.append('<div class="qsm-inline-correct-info">' + qsm_check_shortcode(data.message) + '</div>');
} else if (0 < value.length && data.success == 'incorrect') {
$this.find('.qmn_radio_answers input[value="' + data.correct_index + '"]').parent().addClass('data-correct-answer');
$this.append('<div style="color: red" class="quick-question-res-p qsm-incorrect-answer-info">' + qmn_quiz_data[quizID].quick_result_wrong_answer_text + '</div>')
$this.append('<div class="qsm-inline-correct-info">' + qsm_check_shortcode(data.message) + '</div>');
}

displayInlineInfo(quizID, $this, value, data);

if (1 != qmn_quiz_data[quizID].disable_mathjax) {
MathJax.typesetPromise();
}

jQuery('.qsm-spinner-loader').remove();
jQuery(document).trigger('qsm_show_inline_result_after', [quizID, question_id, value, $this, answer_type, $i_this, index]);
}

function displayInlineInfo(quizID, $this, value, data) {
const { enable_quick_correct_answer_info, enable_quick_result_mc } = qmn_quiz_data[quizID];

if (value.length === 0) return;

if (enable_quick_correct_answer_info == 2 && enable_quick_result_mc == 0) {
if (data.success === 'correct' || data.success === 'incorrect') {
appendInlineInfo($this, data.message);
}
} else if (enable_quick_correct_answer_info == 1 && enable_quick_result_mc == 0) {
if (data.success === 'correct') {
appendInlineInfo($this, data.message);
}
} else if (enable_quick_result_mc == 1) {
handleQuickResultMC(quizID, $this, data);
}
}

function appendInlineInfo($this, message) {
$this.append('<div class="qsm-inline-correct-info">' + qsm_check_shortcode(message) + '</div>');
}

function handleQuickResultMC(quizID, $this, data) {
if (data.success === 'correct') {
$this.append('<div style="color: green" class="quick-question-res-p qsm-correct-answer-info">' + qmn_quiz_data[quizID].quick_result_correct_answer_text + '</div>');
appendInlineInfo($this, data.message);
} else if (data.success === 'incorrect') {
$this.find('.qmn_radio_answers input[value="' + data.correct_index + '"]').parent().addClass('data-correct-answer');
$this.append('<div style="color: red" class="quick-question-res-p qsm-incorrect-answer-info">' + qmn_quiz_data[quizID].quick_result_wrong_answer_text + '</div>');
appendInlineInfo($this, data.message);
}
}
function addSpinnerLoader($this,$i_this) {
if ($this.find('.mlw_answer_open_text').length) {
$this.find('.mlw_answer_open_text').after('<div class="qsm-spinner-loader" style="font-size: 2.5px;margin-left:10px;"></div>');
Expand Down Expand Up @@ -1895,7 +1973,7 @@ function qsm_question_quick_result_js(question_id, answer, answer_type = '', sho

if ('input' === answer_type) {
if (!settings['case_sensitive']) {
answer = answer.toUpperCase();
answer = answer.toString().toUpperCase();
value[0] = value[0].toUpperCase();
}

Expand Down
2 changes: 1 addition & 1 deletion php/classes/class-qmn-quiz-manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ public function display_shortcode( $atts ) {
$encryption[ $question['question_id'] ]['correct_info_text'] = isset( $question['question_answer_info'] ) ? html_entity_decode( $question['question_answer_info'] ) : '';
$encryption[ $question['question_id'] ]['correct_info_text'] = $mlwQuizMasterNext->pluginHelper->qsm_language_support( $encryption[ $question['question_id'] ]['correct_info_text'], "correctanswerinfo-{$question['question_id']}" );
}
if ( ( isset($qmn_json_data['end_quiz_if_wrong']) && 0 < $qmn_json_data['end_quiz_if_wrong'] ) || ( ! empty( $qmn_json_data['enable_quick_result_mc'] ) && 1 == $qmn_json_data['enable_quick_result_mc'] ) || ( ! empty( $qmn_json_data['ajax_show_correct'] ) && 1 == $qmn_json_data['ajax_show_correct'] ) ) {
if ( ( isset($qmn_json_data['end_quiz_if_wrong']) && 0 < $qmn_json_data['end_quiz_if_wrong'] ) || ( ! empty( $qmn_json_data['enable_quick_result_mc'] ) && 1 == $qmn_json_data['enable_quick_result_mc'] ) || ( ! empty( $qmn_json_data['enable_quick_correct_answer_info'] ) && 0 != $qmn_json_data['enable_quick_correct_answer_info'] ) || ( ! empty( $qmn_json_data['ajax_show_correct'] ) && 1 == $qmn_json_data['ajax_show_correct'] ) ) {
$quiz_id = $qmn_json_data['quiz_id'];
$qsm_inline_encrypt_js = '
if (encryptionKey === undefined) {
Expand Down