diff --git a/css/qsm-admin-question.css b/css/qsm-admin-question.css index 76ba60d12..ca2d8b7ca 100644 --- a/css/qsm-admin-question.css +++ b/css/qsm-admin-question.css @@ -288,8 +288,12 @@ } .answers-single>div.answer-correct-div { min-width: auto; - width: 70px; + width: 80px; + height: 26px; padding: 5px 0; + background: #fff; + border: 1px solid #bdbdbd7a; + border-radius: 4px; } .answers-single>div.answer-text-div { width: 560px; diff --git a/css/qsm-admin.css b/css/qsm-admin.css index 76184df02..697f16c11 100644 --- a/css/qsm-admin.css +++ b/css/qsm-admin.css @@ -467,7 +467,7 @@ span.qsm-quiz-name { align-items: center; justify-content: flex-end; background-color: #fff; - padding: 10px 35px; + padding: 10px; border-bottom: 1px solid #dfd4d4; } #qsm_emails .delete-email-button { @@ -477,6 +477,11 @@ span.qsm-quiz-name { cursor: pointer; transition-duration: 200ms; } +.delete-page-button { + border: none; + background: transparent; + cursor: pointer; +} #qsm_emails .delete-email-button:hover { transform: scale(1.2); } @@ -485,14 +490,12 @@ span.qsm-quiz-name { flex-direction: column; } .results-page-when, .results-page-show, .email-when, .email-show { - padding: 10px; - background-color: #f1f1f1; - border: 1px solid #dfd4d4; - margin: 15px 0; + padding: 15px; min-width: 60%; } .results-page-when, .email-when { margin-right: 15px; + border-right: 1px solid #dfd4d4; } .results-page-content-header, .email-content-header { margin-bottom: 10px; @@ -501,25 +504,48 @@ span.qsm-quiz-name { margin-bottom: 5px; display: block; } -.results-page-content-header h4, .results-page-content-header p, .email-content-header h4, .email-content-header p { - margin: 0; +.results-page-content-header h4, + .email-content-header h4{ + font-size: 20px; + margin: 5px 0 15px; + font-weight: 400; } .results-page-condition, .email-condition { - display: flex; - flex-direction: column; margin-bottom: 15px; + border-radius: 10px; + background: #F8F9F9; + padding: 10px; + position: relative; } -.results-page-condition>select, .results-page-condition>input, .email-condition>select, .email-condition>input { - min-width: auto !important; - max-width: 100%; +.qsm-result-condition-title, +.qsm-email-condition-title { + font-size: 16px; +} +input[type="text"].results-page-redirect { + min-width: 100%; +} +.qsm-result-condition-mode, +.qsm-email-condition-mode { + margin-bottom: 15px; +} +.results-page-condition .qsm-result-condition-container select, .qsm_tab_content .results-page-condition .qsm-result-condition-container input[type="text"], .email-condition .qsm-email-condition-container select, .qsm_tab_content .email-condition .qsm-email-condition-container input[type="text"] { + min-width: auto; + width: 100%; + border-radius: 4px; + border-color: #1e1e1e; +} +.results-page-condition .qsm-result-condition-container, .email-condition .qsm-email-condition-container { + display: flex; + flex-wrap: wrap; + gap: 3px; } .delete-condition-button { background: none; - border: 1px solid #1dd969; - color: #dc3232; cursor: pointer; transition-duration: 200ms; - padding: 6px; + position: absolute; + right: 0; + top: 10px; } .delete-condition-button:hover { transform: scale(1.1); @@ -527,6 +553,9 @@ span.qsm-quiz-name { .email-show .label { display: block; } +.qsm-email-reply-to{ + margin-top: 10px; +} .results-page-show textarea, .to-email, .subject, .email-template { width: 100%; margin-bottom: 10px; @@ -540,12 +569,8 @@ span.qsm-quiz-name { width: calc(50% - 15px); min-width: unset; } - .results-page-condition, .email-condition { - align-items: center; - flex-direction: row; - } - .results-page-condition>select, .results-page-condition>input, .email-condition>select, .email-condition>input { - max-width: 23%; + .results-page-condition .qsm-result-condition-container, .email-condition .qsm-email-condition-container { + flex-wrap: nowrap; } .delete-condition-button { border: none; diff --git a/js/qsm-admin.js b/js/qsm-admin.js index a9a239a3a..7df49a6ed 100644 --- a/js/qsm-admin.js +++ b/js/qsm-admin.js @@ -1486,10 +1486,11 @@ var QSMContact; }; $(this).find('.email-condition').each(function () { email.conditions.push({ - 'category': $(this).children('.email-condition-category').val(), - 'criteria': $(this).children('.email-condition-criteria').val(), - 'operator': $(this).children('.email-condition-operator').val(), - 'value': $(this).children('.email-condition-value').val() + 'category': $(this).find('.email-condition-category').val(), + 'extra_condition': $(this).find('.email-extra-condition-category').val(), + 'criteria': $(this).find('.email-condition-criteria').val(), + 'operator': $(this).find('.email-condition-operator').val(), + 'value': $(this).find('.email-condition-value').val() }); }); emails.push(email); @@ -1539,18 +1540,34 @@ var QSMContact; }) .fail(QSMAdmin.displayjQueryError); }, - addCondition: function ($email, category, criteria, operator, value) { + addCondition: function ($email, category, extra_condition, criteria, operator, value) { var template = wp.template('email-condition'); $email.find('.email-when-conditions').append(template({ 'category': category, + 'extra_condition': extra_condition, 'criteria': criteria, 'operator': operator, 'value': value })); - jQuery(document).trigger('qsm_after_add_email_condition', [$email, category, criteria, operator, value]); + $email.find('.email-condition').each(function () { + let extraCategory = jQuery(this).find('.email-extra-condition-category'); + if ('quiz' == jQuery(this).find('.email-condition-category').val() || '' == jQuery(this).find('.email-condition-category').val()) { + extraCategory.hide(); + jQuery(this).find('.email-condition-operator').show(); + jQuery(this).find('option.qsm-questions-criteria').show(); + jQuery(this).find('option.qsm-score-criteria').show() + } else if ('category' == jQuery(this).find('.email-condition-category').val()) { + jQuery(this).find('.option.qsm-questions-criteria').hide(); + extraCategory.find('option').hide(); + extraCategory.find('.qsm-condition-category').show(); + jQuery(this).find('option.qsm-score-criteria').show() + jQuery(this).find('.email-condition-operator').show(); + } + }); + jQuery(document).trigger('qsm_after_add_email_condition', [$email, category, extra_condition, criteria, operator, value]); }, newCondition: function ($email) { - QSMAdminEmails.addCondition($email, '', 'score', 'equal', 0); + QSMAdminEmails.addCondition($email, 'quiz', '', 'score', 'equal', 0); }, addEmail: function (conditions, to, subject, content, replyTo) { QSMAdminEmails.total += 1; @@ -1560,6 +1577,7 @@ var QSMContact; QSMAdminEmails.addCondition( $('.qsm-email:last-child'), condition.category, + condition.extra_condition, condition.criteria, condition.operator, condition.value @@ -1583,6 +1601,7 @@ var QSMContact; newEmail: function () { var conditions = [{ 'category': '', + 'extra_condition': '', 'criteria': 'score', 'operator': 'greater', 'value': '0' @@ -3454,10 +3473,11 @@ var import_button; } $(this).find('.results-page-condition').each(function () { page.conditions.push({ - 'category': $(this).children('.results-page-condition-category').val(), - 'criteria': $(this).children('.results-page-condition-criteria').val(), - 'operator': $(this).children('.results-page-condition-operator').val(), - 'value': $(this).children('.results-page-condition-value').val() + 'category': $(this).find('.results-page-condition-category').val(), + 'extra_condition': $(this).find('.results-page-extra-condition-category').val(), + 'criteria': $(this).find('.results-page-condition-criteria').val(), + 'operator': $(this).find('.results-page-condition-operator').val(), + 'value': $(this).find('.results-page-condition-value').val() }); }); pages.push(page); @@ -3506,18 +3526,35 @@ var import_button; }) .fail(QSMAdmin.displayjQueryError); }, - addCondition: function ($page, category, criteria, operator, value) { + addCondition: function ($page, category, extra_condition, criteria, operator, value) { var template = wp.template('results-page-condition'); $page.find('.results-page-when-conditions').append(template({ 'category': category, + 'extra_condition': extra_condition, + 'criteria': criteria, 'criteria': criteria, 'operator': operator, 'value': value })); - jQuery(document).trigger('qsm_after_add_result_condition', [$page, category, criteria, operator, value]); + $page.find('.results-page-condition').each(function () { + let extraCategory = jQuery(this).find('.results-page-extra-condition-category'); + if ('quiz' == jQuery(this).find('.results-page-condition-category').val() || '' == jQuery(this).find('.results-page-condition-category').val()) { + extraCategory.hide(); + jQuery(this).find('.results-page-condition-operator').show(); + jQuery(this).find('option.qsm-questions-criteria').show(); + jQuery(this).find('option.qsm-score-criteria').show() + } else if ('category' == jQuery(this).find('.results-page-condition-category').val()) { + jQuery(this).find('.option.qsm-questions-criteria').hide(); + extraCategory.find('option').hide(); + extraCategory.find('.qsm-condition-category').show(); + jQuery(this).find('option.qsm-score-criteria').show() + jQuery(this).find('.results-page-condition-operator').show(); + } + }); + jQuery(document).trigger('qsm_after_add_result_condition', [$page, category, extra_condition, criteria, operator, value]); }, newCondition: function ($page) { - QSMAdminResults.addCondition($page, '', 'score', 'equal', 0); + QSMAdminResults.addCondition($page, 'quiz', '', 'score', 'equal', 0); }, addResultsPage: function (conditions, page, redirect) { QSMAdminResults.total += 1; @@ -3527,6 +3564,7 @@ var import_button; QSMAdminResults.addCondition( $('.results-page:last-child'), condition.category, + condition.extra_condition, condition.criteria, condition.operator, condition.value @@ -3547,7 +3585,8 @@ var import_button; }, newResultsPage: function () { var conditions = [{ - 'category': '', + 'category': 'quiz', + 'extra-condition': '', 'criteria': 'score', 'operator': 'greater', 'value': '0' @@ -3583,4 +3622,48 @@ var import_button; }); } } + function qsmHandleConditionChange(containerClass, extraCategoryClass, operatorClass, criteriaClass, defaultValueClass) { + jQuery(document).on('change', '.' + containerClass + '-category', function () { + let container = jQuery(this).closest('.' + containerClass); + let extraCategory = container.find('.' + extraCategoryClass); + + if ('quiz' == jQuery(this).val() || '' == jQuery(this).val()) { + extraCategory.hide(); + container.find('.' + operatorClass).show(); + container.find('.' + criteriaClass).show(); + container.find('.' + defaultValueClass).show(); + container.find('.' + operatorClass + ' option').hide().prop("selected", false); + container.find('.' + operatorClass + ' option.default_operator').show().prop("selected", true); + container.find('option.qsm-score-criteria').show(); + container.find('.' + criteriaClass + ' option.qsm-points-criteria').prop("selected", true); + } else if ('category' == jQuery(this).val()) { + extraCategory.show(); + container.find('.' + criteriaClass).show(); + container.find('.' + operatorClass).show(); + extraCategory.find('option').prop("selected", false).hide(); + extraCategory.find('.qsm-condition-category').show(); + container.find('.' + defaultValueClass).show(); + container.find('.' + criteriaClass + ' option.qsm-points-criteria').prop("selected", true); + extraCategory.find('option:visible:first').prop("selected", true); + container.find('.' + operatorClass + ' option').hide().prop("selected", true); + container.find('.' + operatorClass + ' option.default_operator').show().prop("selected", true); + container.find('option.qsm-score-criteria').show(); + } + }); + } + + function qsmHandleOperatorChange(containerClass, defaultValueClass) { + jQuery(document).on('change', '.' + containerClass + '-operator', function () { + let selectedOption = jQuery(this).find('option:selected'); + if (selectedOption.hasClass('default_operator')) { + jQuery(this).closest('.' + containerClass).find('.' + defaultValueClass).show(); + } + }); + } + + // Usage + qsmHandleConditionChange('results-page-condition', 'results-page-extra-condition-category', 'results-page-condition-operator', 'results-page-condition-criteria', 'condition-default-value'); + qsmHandleOperatorChange('results-page-condition', 'condition-default-value'); + qsmHandleConditionChange('email-condition', 'email-extra-condition-category', 'email-condition-operator', 'email-condition-criteria', 'condition-default-value'); + qsmHandleOperatorChange('email-condition', 'condition-default-value'); }(jQuery)); diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php index b4130e1b5..628392474 100644 --- a/mlw_quizmaster2.php +++ b/mlw_quizmaster2.php @@ -2,7 +2,7 @@ /** * Plugin Name: Quiz And Survey Master * Description: Easily and quickly add quizzes and surveys to your website. - * Version: 8.2.1 + * Version: 8.2.2 * Author: ExpressTech * Author URI: https://quizandsurveymaster.com/ * Plugin URI: https://expresstech.io/ @@ -43,7 +43,7 @@ class MLWQuizMasterNext { * @var string * @since 4.0.0 */ - public $version = '8.2.1'; + public $version = '8.2.2'; /** * QSM Alert Manager Object diff --git a/php/admin/options-page-email-tab.php b/php/admin/options-page-email-tab.php index 31a1f0755..7fcc1666b 100644 --- a/php/admin/options-page-email-tab.php +++ b/php/admin/options-page-email-tab.php @@ -181,7 +181,7 @@ function qsm_options_emails_tab_template() {
- +
@@ -195,7 +195,7 @@ function qsm_options_emails_tab_template() { - +
@@ -204,37 +204,56 @@ function qsm_options_emails_tab_template() { diff --git a/php/admin/options-page-results-page-tab.php b/php/admin/options-page-results-page-tab.php index 84118ded9..8f57c0935 100644 --- a/php/admin/options-page-results-page-tab.php +++ b/php/admin/options-page-results-page-tab.php @@ -191,7 +191,7 @@ function qsm_options_results_tab_template(){ $categories = array(); $enabled = get_option( 'qsm_multiple_category_enabled' ); if ( $enabled && 'cancelled' !== $enabled ) { - $query = $wpdb->prepare( "SELECT name FROM {$wpdb->prefix}terms WHERE term_id IN ( SELECT DISTINCT term_id FROM {$wpdb->prefix}mlw_question_terms WHERE quiz_id = %d ) ORDER BY name ASC", $quiz_id ); + $query = $wpdb->prepare( "SELECT name, term_id FROM {$wpdb->prefix}terms WHERE term_id IN ( SELECT DISTINCT term_id FROM {$wpdb->prefix}mlw_question_terms WHERE quiz_id = %d ) ORDER BY name ASC", $quiz_id ); } else { $query = $wpdb->prepare( "SELECT DISTINCT category FROM {$wpdb->prefix}mlw_questions WHERE category <> '' AND quiz_id = %d", $quiz_id ); } @@ -211,7 +211,7 @@ function qsm_options_results_tab_template(){
- +
@@ -230,24 +230,41 @@ function qsm_options_results_tab_template(){ - \ No newline at end of file +
+ + \ No newline at end of file diff --git a/php/classes/class-qsm-results-pages.php b/php/classes/class-qsm-results-pages.php index c85adfe5a..6d3c67bf9 100644 --- a/php/classes/class-qsm-results-pages.php +++ b/php/classes/class-qsm-results-pages.php @@ -53,26 +53,38 @@ public static function generate_pages( $response_data ) { // Cycle through each condition to see if we should show this page. foreach ( $page['conditions'] as $condition ) { $value = $condition['value']; - $category = ''; + $main_condition = ''; if ( isset($condition['category']) ) { - $category = $condition['category']; + $main_condition = $condition['category']; + } + if ( ! empty($condition['extra_condition']) && 'category' == $main_condition ) { + $category = $condition['extra_condition']; + if ( str_contains($category, 'qsm-cat-') ) { + $cat_id = intval( str_replace( 'qsm-cat-', '', $category ) ); + $term = get_term( $cat_id ); + if ( $term ) { + $category = $term->name; + } + } + }else { + $category = $main_condition; } // First, determine which value we need to test. switch ( $condition['criteria'] ) { case 'score': - if ( '' !== $category ) { - $test = apply_filters( 'mlw_qmn_template_variable_results_page', "%CATEGORY_SCORE_$category%", $response_data ); - } else { + if ( '' == $main_condition || 'quiz' == $main_condition ) { $test = $response_data['total_score']; + } else { + $test = apply_filters( 'mlw_qmn_template_variable_results_page', "%CATEGORY_SCORE_$category%", $response_data ); } break; case 'points': - if ( '' !== $category ) { - $test = apply_filters( 'mlw_qmn_template_variable_results_page', "%CATEGORY_POINTS_$category%", $response_data ); - } else { + if ( '' == $main_condition || 'quiz' == $main_condition ) { $test = $response_data['total_points']; + } else { + $test = apply_filters( 'mlw_qmn_template_variable_results_page', "%CATEGORY_POINTS_$category%", $response_data ); } break; diff --git a/php/classes/question-types/class-question-review.php b/php/classes/question-types/class-question-review.php index 3f2df85f9..4ee6933a8 100644 --- a/php/classes/question-types/class-question-review.php +++ b/php/classes/question-types/class-question-review.php @@ -11,6 +11,7 @@ abstract class QSM_Question_Review { public $answer_status = 'incorrect'; public $points = 0; public $question_description = ''; + public $question_type = 0; public $input_field = ''; public $form_type = 0; public $grading_system = 0; diff --git a/readme.txt b/readme.txt index fe5a6eae8..8500c2b12 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: quiz, survey, lead, test, score, exam, questionnaire, question,wordpress q Requires at least: 4.9 Tested up to: 6.4 Requires PHP: 5.4 -Stable tag: 8.2.1 +Stable tag: 8.2.2 License: GPLv2 License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -163,6 +163,13 @@ This is usually a theme conflict. You can [checkout out our common conflict solu 18. Database == Changelog == += 8.2.2 (January 18, 2024) = +* Feature: Added an option to mark texts as code snippets in the question description +* Bug: Fixed the issue of skipping question validation after the quiz timer ends +* Bug: Fixed issue when using apostrophe in fill-in-the-blanks questions +* Bug: Fixed the quiz navigation problem with reCAPTCHA +* Enhancement: Improved auto-pause logic for embedded audio when shifting pages. + = 8.2.1 (January 05, 2024) = * Feature: Added option to delete bulk questions * Bug: Resolved JavaScript conflicts