From 1bf184856313fd2b082a1a748ace6e5875160232 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 3 Aug 2022 07:27:53 -0300 Subject: [PATCH 1/8] Fixed issue #17067: Subquestion Relevance in array by column does not work (#2553) - Disable feature for Array by column Co-authored-by: encuestabizdevgit --- application/views/questionAdministration/subquestionRow.twig | 5 ++++- application/views/questionAdministration/subquestions.twig | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/views/questionAdministration/subquestionRow.twig b/application/views/questionAdministration/subquestionRow.twig index 9c56347395b..f55f60a0e09 100644 --- a/application/views/questionAdministration/subquestionRow.twig +++ b/application/views/questionAdministration/subquestionRow.twig @@ -129,18 +129,21 @@ + {% set relevanceTooltip = supportsRelevance ? gT("Click to expand") : gT("Relevance is not currently supported for columns") %} + {% if first and scale_id == 0 %} {% else %} diff --git a/application/views/questionAdministration/subquestions.twig b/application/views/questionAdministration/subquestions.twig index a657ac2bcf7..9d8b297cae2 100644 --- a/application/views/questionAdministration/subquestions.twig +++ b/application/views/questionAdministration/subquestions.twig @@ -69,6 +69,7 @@ 'subquestionl10n': subquestion.questionl10ns[lang], 'language' : lang, 'oldCode' : true, + 'supportsRelevance' : question.questionType.code != 'H', } %} {% set position = position + 1 %} From 1c82f3da2fd3ce075bc5963f6208f34a22bd9dc5 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 3 Aug 2022 07:50:05 -0300 Subject: [PATCH 2/8] Fixed issue #18299: Simple statistics, "Text Display" questions are shown (#2557) Co-authored-by: encuestabizdevgit --- application/controllers/admin/Statistics.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/admin/Statistics.php b/application/controllers/admin/Statistics.php index e526f5071b2..72d92c5a841 100644 --- a/application/controllers/admin/Statistics.php +++ b/application/controllers/admin/Statistics.php @@ -757,6 +757,7 @@ public function simpleStatistics($surveyid) case Question::QT_U_HUGE_FREE_TEXT: // Huge free text case Question::QT_Q_MULTIPLE_SHORT_TEXT: case Question::QT_SEMICOLON_ARRAY_TEXT: + case Question::QT_X_TEXT_DISPLAY: break; From 463318308d22e730deea686cc7e7a4377506140b Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 3 Aug 2022 11:01:52 -0300 Subject: [PATCH 3/8] Fixed issue #18261: Simple statistics, 'Array (5 point choice)' dont show subquestions (#2554) Co-authored-by: encuestabizdevgit --- .../helpers/admin/statistics_helper.php | 18 +++++++++++++++++- .../simplestats/_statisticsoutput_header.php | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php index 732a78085eb..0aad74d22bd 100644 --- a/application/helpers/admin/statistics_helper.php +++ b/application/helpers/admin/statistics_helper.php @@ -584,6 +584,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, $qtitle = ""; $qquestion = ""; $qtype = ""; + $subquestionText = ""; $sQuestionType = substr($rt, 0, 1); $fieldmap = createFieldMap($survey, "full", false, false, $language); $sDatabaseType = Yii::app()->db->getDriverName(); @@ -1162,6 +1163,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, //list IDs and answer codes in brackets $qquestion .= $linefeed; $qtitle .= "($qanswer)" . "[" . $atext . "]"; + $subquestionText = $atext; break; @@ -1179,6 +1181,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, $qquestion .= $linefeed; $qtitle .= "({$qanswer})" . "[" . $atext . "]"; + $subquestionText = $atext; break; @@ -1197,6 +1200,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, //output $qquestion .= $linefeed; $qtitle .= "({$qanswer})" . "[" . $atext . "]"; + $subquestionText = $atext; break; @@ -1213,6 +1217,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, } $qquestion .= $linefeed; $qtitle .= "({$qanswer})" . "[" . $atext . "]"; + $subquestionText = $atext; break; @@ -1231,6 +1236,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, $qquestion .= $linefeed; $qtitle .= "($qanswer)" . "[" . $atext . "] [" . $ltext . "]"; + $subquestionText = $atext; break; case Question::QT_COLON_ARRAY_NUMBERS: // Array (Multiple Flexi) (Numbers) @@ -1287,6 +1293,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, //output $qquestion .= $linefeed; $qtitle .= "($qanswer)" . "[" . $atext . "]"; + $subquestionText = $atext; break; @@ -1380,6 +1387,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, //adapt title and question $qtitle = $qtitle . " [" . $sSubquestion . "][" . $labelno . "]"; $qquestion = $qastring . $labelheader; + $subquestionText = $sSubquestion; break; @@ -1409,7 +1417,15 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql, $alist[] = array("", gT("No answer"), false, 'is_no_answer'); } - return array("alist" => $alist, "qtitle" => $qtitle, "qquestion" => $qquestion, "qtype" => $qtype, "statisticsoutput" => $statisticsoutput, "parentqid" => (int)$qqid); + return [ + "alist" => $alist, + "qtitle" => $qtitle, + "qquestion" => $qquestion, + "qtype" => $qtype, + "statisticsoutput" => $statisticsoutput, + "parentqid" => (int)$qqid, + "subquestionText" => $subquestionText, + ]; } /** diff --git a/application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php b/application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php index 3cd90f2de68..0f1e8597bb4 100644 --- a/application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php +++ b/application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php @@ -10,5 +10,5 @@
-

+

From 29f723790d7eb62928e67f512d5209ea56dae6cb Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 3 Aug 2022 11:26:24 -0300 Subject: [PATCH 4/8] Fixed issue #18271: Blank page after clicking "Close" (#2547) Co-authored-by: encuestabizdevgit --- .../QuestionAdministrationController.php | 7 ++----- .../includes/editQuestionTopbarRight_view.php | 15 +++++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/application/controllers/QuestionAdministrationController.php b/application/controllers/QuestionAdministrationController.php index 26dcea2f0fb..69dad109f49 100644 --- a/application/controllers/QuestionAdministrationController.php +++ b/application/controllers/QuestionAdministrationController.php @@ -96,12 +96,9 @@ public function actionCreate($surveyid) $this->aData['showSaveAndNewGroupButton'] = true; $this->aData['showSaveAndNewQuestionButton'] = true; $this->aData['closeUrl'] = Yii::app()->createUrl( - 'questionGroupsAdministration/view/', + 'questionAdministration/listquestions', [ - 'surveyid' => $oQuestion->sid, - 'gid' => $oQuestion->gid, - 'landOnSideMenuTab' => 'structure', - 'mode' => 'overview', + 'surveyid' => $surveyid ] ); diff --git a/application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.php b/application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.php index 077b5074d66..13947e98bda 100644 --- a/application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.php +++ b/application/extensions/TopbarWidget/views/includes/editQuestionTopbarRight_view.php @@ -19,10 +19,17 @@ - - - - + qid)): ?> + + + + + + + + + + From 739ac13b5dd72740ceb0b36dc3835bac90f139f6 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 3 Aug 2022 11:47:11 -0300 Subject: [PATCH 5/8] Fixed issue #17872: Answerfilters reset after pagination changed (#2437) Co-authored-by: encuestabizdevgit --- .../extensions/LimeGridView/LimeGridView.php | 13 +++++++++++++ application/views/admin/token/browse.php | 3 --- .../views/questionAdministration/listquestions.php | 3 --- .../listquestiongroups.php | 3 --- application/views/responses/listResponses_view.php | 3 --- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application/extensions/LimeGridView/LimeGridView.php b/application/extensions/LimeGridView/LimeGridView.php index 120557ae278..a15042bf667 100644 --- a/application/extensions/LimeGridView/LimeGridView.php +++ b/application/extensions/LimeGridView/LimeGridView.php @@ -66,6 +66,19 @@ public function registerClientScript() $cs->registerCoreScript('history'); $cs->registerScriptFile($this->baseScriptUrl.'/jquery.yiigridview.js',LSYii_ClientScript::POS_PREBEGIN); $cs->registerScript(__CLASS__.'#'.$id,"jQuery('#$id').yiiGridView($options);",LSYii_ClientScript::POS_POSTSCRIPT); + + $script = ' + jQuery(document).on("change", "#' . $id . ' .changePageSize", function(){ + var pageSizeName = $(this).attr("name"); + if (!pageSizeName) { + pageSizeName = "pageSize"; + } + var data = $("#' . $id . ' .filters input, #' . $id . ' .filters select").serialize(); + data += (data ? "&" : "") + pageSizeName + "=" + $(this).val(); + $.fn.yiiGridView.update("' . $id . '", {data: data}); + }); + '; + Yii::app()->getClientScript()->registerScript('pageChanger#' . $id, $script, LSYii_ClientScript::POS_POSTSCRIPT); } } diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php index 8f2c004e021..4d239e69dad 100644 --- a/application/views/admin/token/browse.php +++ b/application/views/admin/token/browse.php @@ -59,9 +59,6 @@ App()->getClientScript()->registerScript("Tokens:updateRowsPerPage", " if($('#token-grid').length > 0){ reinstallParticipantsFilterDatePicker(); - jQuery(document).on('change', '#pageSizeTokenView', function(){ - $.fn.yiiGridView.update('token-grid',{ data:{ pageSizeTokenView: $(this).val() }}); - }); } ", LSYii_ClientScript::POS_POSTSCRIPT); ?> diff --git a/application/views/questionAdministration/listquestions.php b/application/views/questionAdministration/listquestions.php index 463f049a294..59f8c9a7afa 100644 --- a/application/views/questionAdministration/listquestions.php +++ b/application/views/questionAdministration/listquestions.php @@ -149,9 +149,6 @@ getClientScript()->registerScript("ListQuestions-pagination", " var bindPageSizeChange = function(){ - $('#pageSize').on('change', function(){ - $.fn.yiiGridView.update('question-grid',{ data:{ pageSize: $(this).val() }}); - }); $(document).trigger('actions-updated'); }; ", LSYii_ClientScript::POS_BEGIN); ?> diff --git a/application/views/questionGroupsAdministration/listquestiongroups.php b/application/views/questionGroupsAdministration/listquestiongroups.php index df79f810304..df08d816d68 100644 --- a/application/views/questionGroupsAdministration/listquestiongroups.php +++ b/application/views/questionGroupsAdministration/listquestiongroups.php @@ -127,9 +127,6 @@ class="btn btn-warning"> getClientScript()->registerScript("ListQuestionGroups-pagination", " var bindPageSizeChange = function(){ - $('#pageSize').on('change', function(){ - $.fn.yiiGridView.update('question-group-grid',{ data:{ pageSize: $(this).val() }}); - }); $(document).trigger('actions-updated'); }; ", LSYii_ClientScript::POS_BEGIN); ?> diff --git a/application/views/responses/listResponses_view.php b/application/views/responses/listResponses_view.php index 0867ee4f2bb..ac5676ffe65 100644 --- a/application/views/responses/listResponses_view.php +++ b/application/views/responses/listResponses_view.php @@ -274,9 +274,6 @@ '; $script = ' var postUrl = "' . Yii::app()->getController()->createUrl("responses/setSession") . '"; // For massive export - jQuery(document).on("change", "#pageSize", function(){ - $.fn.yiiGridView.update("responses-grid",{ data:{ pageSize: $(this).val() }}); - }); $(".grid-view [data-toggle=\'popover\']").popover(); '; App()->getClientScript()->registerScript('listresponses', $scriptVars, LSYii_ClientScript::POS_BEGIN); From 17759d90dbd556628304fd049d7c3996ba575ecc Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Thu, 4 Aug 2022 07:17:53 -0300 Subject: [PATCH 6/8] Fixed issue #18162: Design options: missing translation / icon (#2552) Co-authored-by: encuestabizdevgit --- application/helpers/twig_translation_helper.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/helpers/twig_translation_helper.php b/application/helpers/twig_translation_helper.php index 4808c8cc0df..de6dfb3e348 100644 --- a/application/helpers/twig_translation_helper.php +++ b/application/helpers/twig_translation_helper.php @@ -42,6 +42,13 @@ function dummy_twig_translation_helper() gT("Load label set"); // From /var/www/html/limesurvey/application/views/questionAdministration/subquestions.twig gT("Save label set"); // From /var/www/html/limesurvey/application/views/questionAdministration/subquestions.twig gT("Quick add"); // From /var/www/html/limesurvey/application/views/questionAdministration/subquestions.twig + gT("Show Clear All button"); // From themes/survey/fruity/options/options.twig + gT("Question help text position"); // From themes/survey/fruity/options/options.twig + gT("Top"); // From themes/survey/fruity/options/options.twig + gT("Bottom"); // From themes/survey/fruity/options/options.twig + gT("Break tables"); // From themes/survey/fruity/options/options.twig + gT("Always on"); // From themes/survey/fruity/options/options.twig + gT("Small screens"); // From themes/survey/fruity/options/options.twig gT("After specific subquestion"); // From application/views/survey/questions/answer/multiplechoice/config.xml gT("Relevance help for printable survey"); // From application/views/survey/questions/answer/5pointchoice/config.xml gT("Specify how array-filtered sub-questions should be displayed"); // From application/views/survey/questions/answer/arrays/10point/config.xml From d027281d50e1fe0b0c0710789fc5dc13dc8e6482 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Thu, 4 Aug 2022 07:21:33 -0300 Subject: [PATCH 7/8] Fixed issue #18270: Language switch is not repopulated correctly after change question type (#2546) Co-authored-by: encuestabizdevgit --- assets/scripts/admin/questionEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/admin/questionEditor.js b/assets/scripts/admin/questionEditor.js index ca6231abdf6..1b9c741ce2f 100644 --- a/assets/scripts/admin/questionEditor.js +++ b/assets/scripts/admin/questionEditor.js @@ -1635,7 +1635,7 @@ $(document).on('ready pjax:scriptcomplete', function () { $('.lang-hide').hide(); const languages = languageJson.langs.split(';'); - $('.lang-' + languages[0]).show(); + $('.lang-switch-button[data-lang="' + languages[0] + '"]').trigger('click'); // TODO: Duplication. $('.btnaddsubquestion').on('click.subquestions', addSubquestionInput); From c8ffd476615adb5281b367a16a4c96adcd1a0dd6 Mon Sep 17 00:00:00 2001 From: Marko Bischof Date: Thu, 4 Aug 2022 12:22:11 +0200 Subject: [PATCH 8/8] Fixed issue #18259: add surveyId to select box (#2519) --- .../views/admin/participants/modal_subviews/_addToSurvey.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/admin/participants/modal_subviews/_addToSurvey.php b/application/views/admin/participants/modal_subviews/_addToSurvey.php index ac894ff0d9a..031ba02b4ef 100644 --- a/application/views/admin/participants/modal_subviews/_addToSurvey.php +++ b/application/views/admin/participants/modal_subviews/_addToSurvey.php @@ -25,7 +25,7 @@