dev: speed up survey listing by not loading the model (show columns /…

…create etc.)
LimeSurvey · Dec 13, 2012 · 737bfe8 · 737bfe8
1 parent 438becc
commit 737bfe8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -685,8 +685,9 @@ public function getSurveys_json()
             //Set Responses
             if ($rows['active'] == "Y")
             {
-                $partial = Survey_dynamic::model($rows['sid'])->countByAttributes(array('submitdate' => null));
-                $all = Survey_dynamic::model($rows['sid'])->count();
+                $cntResult = Survey_dynamic::countAllAndPartial($rows['sid']);
+                $all = $cntResult['cntAll'];
+                $partial = $cntResult['cntPartial'];
 
                 $aSurveyEntry[] = $all - $partial;
                 $aSurveyEntry[] = $partial;
@@ -696,10 +697,9 @@ public function getSurveys_json()
                 $aSurveyEntry['viewurl'] = $this->getController()->createUrl("/admin/survey/sa/view/surveyid/" . $rows['sid']);
                 if (tableExists('tokens_' . $rows['sid'] ))
                 {
-                    $tokens = Tokens_dynamic::model($rows['sid'])->count();
-                    $tokenscompleted = Tokens_dynamic::model($rows['sid'])->count(array(
-                    'condition' => "completed <> 'N'"
-                    ));
+                    $cntResult = Tokens_dynamic::countAllAndCompleted($rows['sid']);
+                    $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
@@ -183,6 +183,19 @@ public function addTokenCriteria($condition)
         return $newCriteria;
     }
 
+    public static function countAllAndPartial($sid)
+    {
+        $select = array(
+            'count(*) AS cntAll',
+            'sum(CASE 
+                 WHEN submitdate IS NULL THEN 1
+                          ELSE 0
+                 END) AS cntPartial',
+            );
+        $result = Yii::app()->db->createCommand()->select($select)->from('{{survey_' . $sid . '}}')->queryRow();
+        return $result;
+    }
+
     /**
      * Return true if actual survey is completed
      *

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -223,6 +223,19 @@ function selectEmptyTokens($iSurveyID)
     {
         return Yii::app()->db->createCommand("SELECT tid FROM {{tokens_{$iSurveyID}}} WHERE token IS NULL OR token=''")->queryAll();
     }
+
+    public static function countAllAndCompleted($sid)
+    {
+        $select = array(
+            'count(*) AS cntAll',
+            'sum(CASE completed
+                 WHEN "Y" THEN 0
+                          ELSE 1
+                 END) AS cntCompleted',
+            );
+        $result = Yii::app()->db->createCommand()->select($select)->from('{{tokens_' . $sid . '}}')->queryRow();
+        return $result;
+    }
 
    /**
      * Creates and inserts token for a specific token record and returns the token string created