dev: and now for pgsql too :)

LimeSurvey · Dec 13, 2012 · 0ba6f40 · 0ba6f40
1 parent 4d7977c
commit 0ba6f40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -674,8 +674,8 @@ public function getSurveys_json()
             if ($rows['active'] == "Y")
             {
                 $cntResult = Survey_dynamic::countAllAndPartial($rows['sid']);
-                $all = $cntResult['cntAll'];
-                $partial = $cntResult['cntPartial'];
+                $all = $cntResult['cntall'];
+                $partial = $cntResult['cntpartial'];
 
                 $aSurveyEntry[] = $all - $partial;
                 $aSurveyEntry[] = $partial;
@@ -686,8 +686,8 @@ public function getSurveys_json()
                 if (tableExists('tokens_' . $rows['sid'] ))
                 {
                     $cntResult = Tokens_dynamic::countAllAndCompleted($rows['sid']);
-                    $tokens = $cntResult['cntAll'];
-                    $tokenscompleted = $cntResult['cntCompleted'];
+                    $tokens = $cntResult['cntall'];
+                    $tokenscompleted = $cntResult['cntcompleted'];
 
                     $aSurveyEntry[] = $tokens;
                     $aSurveyEntry[] = ($tokens == 0) ? 0 : round($tokenscompleted / $tokens * 100, 1);

diff --git a/application/models/Survey_dynamic.php b/application/models/Survey_dynamic.php
@@ -182,11 +182,11 @@ public function addTokenCriteria($condition)
     public static function countAllAndPartial($sid)
     {
         $select = array(
-            'count(*) AS cntAll',
+            'count(*) AS cntall',
             'sum(CASE 
                  WHEN '. Yii::app()->db->quoteColumnName('submitdate') . ' IS NULL THEN 1
                           ELSE 0
-                 END) AS cntPartial',
+                 END) AS cntpartial',
             );
         $result = Yii::app()->db->createCommand()->select($select)->from('{{survey_' . $sid . '}}')->queryRow();
         return $result;

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -229,11 +229,11 @@ function selectEmptyTokens($iSurveyID)
     public static function countAllAndCompleted($sid)
     {
         $select = array(
-            'count(*) AS cntAll',
+            'count(*) AS cntall',
             'sum(CASE '. Yii::app()->db->quoteColumnName('completed') . '
                  WHEN '.Yii::app()->db->quoteValue('Y').' THEN 0
                           ELSE 1
-                 END) AS cntCompleted',
+                 END) AS cntcompleted',
             );
         $result = Yii::app()->db->createCommand()->select($select)->from('{{tokens_' . $sid . '}}')->queryRow();
         return $result;