Fixed issue: Response browsing failing when using filtered view from …

…statistics and setting an additional filter Dev Fixed also confusing mischanged filter fieldnames in statistics
LimeSurvey · Nov 8, 2021 · d4bbfbc · d4bbfbc
1 parent 137eefa
commit d4bbfbc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -471,12 +471,12 @@ function buildSelects($allfields, $surveyid, $language)
                     $selects[] = Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv) - 3)) . " = " . App()->db->quoteValue($_POST[$pv]);
                 } else {
                     //date less than
-                    if (substr($pv, -4) == "less") {
+                    if (substr($pv, -4) == "more") {
                         $selects[] = Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv) - 5)) . " >= " . App()->db->quoteValue($_POST[$pv]);
                     }
 
                     //date greater than
-                    if (substr($pv, -4) == "more") {
+                    if (substr($pv, -4) == "less") {
                         $selects[] = Yii::app()->db->quoteColumnName(substr($pv, 1, strlen($pv) - 5)) . " <= " . App()->db->quoteValue($_POST[$pv]);
                     }
                 }

diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php
@@ -684,7 +684,7 @@ public function search()
         // When selection of responses come from statistics
         // TODO: This provide a first step to enable the old jQgrid selector system, and could be use for users and tokens
         if (Yii::app()->user->getState('sql_' . self::$sid) != null) {
-            $criteria->condition .= Yii::app()->user->getState('sql_' . self::$sid);
+            $criteria->addCondition(Yii::app()->user->getState('sql_' . self::$sid));
         }
 
         $this->filterColumns($criteria);
@@ -851,7 +851,7 @@ public function getQuestionArray($oQuestion, $oResponses, $bHonorConditions, $su
                     "title" => "other",
                 ), false);
                 $oOtherQuestion->questionl10ns = [$sLanguage => $oOtherQuestionL10n];
-                
+
                 $aQuestionAttributes['subquestions']["other"] = $this->getQuestionArray($oOtherQuestion, $oResponses, $bHonorConditions, true, false, $sLanguage);
                 if ($oQuestion->type == "P") {
                     $aQuestionAttributes['subquestions']["other"]['comment'] = $this->getQuestionArray($oOtherQuestion, $oResponses, $bHonorConditions, true, true, $sLanguage);
@@ -934,7 +934,7 @@ public function getQuestionArray($oQuestion, $oResponses, $bHonorConditions, $su
                     )
             );
 
-            foreach($aAnswers as $key=>$value){
+            foreach ($aAnswers as $key => $value) {
                 $aAnswerText[$value['scale_id']][$value['code']] = Answer::model()->getAnswerFromCode($value->qid, $value->code, $sLanguage, $value->scale_id);
             }
 
@@ -994,7 +994,7 @@ public function getQuestionArray($oQuestion, $oResponses, $bHonorConditions, $su
                 $aQuestionAttributes['answervalueslabels'][$oScaleSubquestion->title] = isset($oScaleSubquestion->questionl10ns[$sLanguage]->question) ? $oScaleSubquestion->questionl10ns[$sLanguage]->question : null;
             }
         }
-        
+
         if ($oQuestion->type == 'N' || ($oQuestion->parent_qid != 0 && $oQuestion->parent['type'] === "K")) {
             if (strpos($aQuestionAttributes['answervalue'], ".") !== false) { // Remove last 0 and last . ALWAYS (see \SurveyObj\getShortAnswer)
                 $aQuestionAttributes['answervalue'] = rtrim(rtrim($aQuestionAttributes['answervalue'], "0"), ".");

diff --git a/application/views/admin/export/statistics_subviews/_question.php b/application/views/admin/export/statistics_subviews/_question.php
@@ -252,8 +252,8 @@
                 */
                 $myfield2="D$myfield";
                 $myfield3=$myfield2."eq";
-                $myfield4=$myfield2."less";
-                $myfield5=$myfield2."more";
+                $myfield4=$myfield2."more";
+                $myfield5=$myfield2."less";
                 echo '<div class="statistics-responses-label-group ls-space padding bottom-5 top-15 ls-flex-item">';
                 echo "<input type='checkbox'  name='summary[]' value='$myfield2'";