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

… create etc.) dev: keep dbversion and update also on config after we load them saves extra db calls
LimeSurvey · Dec 13, 2012 · 0801b36 · 0801b36
1 parent 14cff6f
commit 0801b36
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/application/helpers/globalsettings_helper.php b/application/helpers/globalsettings_helper.php
@@ -27,11 +27,11 @@ function injectglobalsettings()
         //foreach  ($dbvaluearray as $setting)
         foreach ($settings as $setting)
         {
-            if (Yii::app()->getConfig($setting->getAttribute('stg_name')) !== false)
-            {
+            //if (Yii::app()->getConfig($setting->getAttribute('stg_name')) !== false)
+            //{
                 //$$setting['stg_name']=$setting['stg_value'];
                 Yii::app()->setConfig($setting->getAttribute('stg_name'), $setting->getAttribute('stg_value'));
-            }
+            //}
         }
     }
 }

diff --git a/application/models/Survey_dynamic.php b/application/models/Survey_dynamic.php
@@ -179,6 +179,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
@@ -225,6 +225,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