Fixed issue : Statistics take all responses, even if select complete …

…or incomplete response Dec: children of #06766
LimeSurvey · Oct 24, 2012 · 3e2ab51 · 3e2ab51
1 parent fe18433
commit 3e2ab51
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -994,8 +994,8 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
                 }
 
                 //filter incomplete answers if set
-                if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";}
-                elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";}
+                if (incompleteAnsFilterState() == "incomplete") {$query .= " AND submitdate is null";}
+                elseif (incompleteAnsFilterState() == "complete") {$query .= " AND submitdate is not null";}
 
                 //$sql was set somewhere before
                 if ($sql != "NULL") {$query .= " AND $sql";}
@@ -1744,8 +1744,8 @@ protected function displayResults($outputs, $results, $rt, $outputType, $surveyi
             }
 
             //check filter option
-            if (incompleteAnsFilterState() == "inc") {$query .= " AND submitdate is null";}
-            elseif (incompleteAnsFilterState() == "filter") {$query .= " AND submitdate is not null";}
+            if (incompleteAnsFilterState() == "incomplete") {$query .= " AND submitdate is null";}
+            elseif (incompleteAnsFilterState() == "complete") {$query .= " AND submitdate is not null";}
 
             //check for any "sql" that has been passed from another script
             if ($sql != "NULL") {$query .= " AND $sql";}
@@ -3106,8 +3106,8 @@ public function generate_statistics($surveyid, $allfields, $q2show='all', $usegr
         $query = "SELECT count(*) FROM {{survey_$surveyid}}";
 
         //if incompleted answers should be filtert submitdate has to be not null
-        if (incompleteAnsFilterState() == "inc") {$query .= " WHERE submitdate is null";}
-        elseif (incompleteAnsFilterState() == "filter") {$query .= " WHERE submitdate is not null";}
+        if (incompleteAnsFilterState() == "incomplete") {$query .= " WHERE submitdate is null";}
+        elseif (incompleteAnsFilterState() == "complete") {$query .= " WHERE submitdate is not null";}
         $result = Yii::app()->db->createCommand($query)->query();
 
         //$total = total number of answers
@@ -3117,7 +3117,7 @@ public function generate_statistics($surveyid, $allfields, $q2show='all', $usegr
         if (isset($selects) && $selects)
         {
             //filter incomplete answers?
-            if (incompleteAnsFilterState() == "filter" || incompleteAnsFilterState() == "inc") {$query .= " AND ";}
+            if (incompleteAnsFilterState() == "complete" || incompleteAnsFilterState() == "incomplete") {$query .= " AND ";}
 
             else {$query .= " WHERE ";}
 
@@ -3348,10 +3348,10 @@ protected function getQuartile($quartile, $fieldname, $surveyid, $sql, $excludez
             }
 
             //filtering enabled?
-            if (incompleteAnsFilterState() == "inc")
+            if (incompleteAnsFilterState() == "incomplete")
             {
                 $query .= " AND submitdate is null";
-            } elseif (incompleteAnsFilterState() == "filter")
+            } elseif (incompleteAnsFilterState() == "complete")
             {
                 $query .= " AND submitdate is not null";
             }
@@ -3404,4 +3404,4 @@ protected function getQuartile($quartile, $fieldname, $surveyid, $sql, $excludez
             return $allRows[$row][$fieldname] + $diff * ($allRows[$row+1][$fieldname]-$allRows[$row][$fieldname]);
         }        
     }
-}
+}