Fixed issue #14738: Percentages are not correct for multiple choice q…

…uestions if a date filter is set
LimeSurvey · Mar 22, 2021 · 8c4ee6a · 8c4ee6a
1 parent 5039b25
commit 8c4ee6a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -920,7 +920,6 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
                     //standard deviation
                     $query = "SELECT STDDEV(CAST(".Yii::app()->db->quoteColumnName($fieldname)." AS DECIMAL(26,6))) as stdev";
                 }
-
                 //sum
                 $query .= ", SUM(CAST(".Yii::app()->db->quoteColumnName($fieldname)." AS DECIMAL(26,6))) as sum";
 
@@ -2756,6 +2755,9 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
             foreach ($outputs['alist'] as $al) {
                 $criteria->addCondition(Yii::app()->db->quoteColumnName($al[2])." IS NULL");
             }
+            if (!empty($sql)) {
+                $criteria->addCondition($sql);
+            }             
             if (incompleteAnsFilterState() == "incomplete") {$criteria->addCondition("submitdate IS NULL"); } elseif (incompleteAnsFilterState() == "complete") {$criteria->addCondition("submitdate IS NOT NULL"); }
             $multiNotDisplayed = SurveyDynamic::model($surveyid)->count($criteria);
             if (isset($_POST['noncompleted']) and ($_POST['noncompleted'] == 1)) {
@@ -4097,7 +4099,6 @@ public function generate_statistics($surveyid, $allfields, $q2show = 'all', $use
                 ."\t\t<p>"
                 ."\t\t\t<input type='submit' class='btn btn-default' value='".gT("Browse")."'  />\n"
                 ."\t\t\t<input type='hidden' name='sid' value='$surveyid' />\n"
-                ."\t\t\t<input type='hidden' name='sql' value=\"$sql\" />\n"
                 ."\t\t\t<input type='hidden' name='subaction' value='all' />\n"
                 ."\t\t</p>"
                 ."\t\t</form>\n";