Fixed #6737: Browsing and export of timings no longer working

LimeSurvey · Oct 19, 2012 · 347af29 · 347af29
1 parent dfb580d
commit 347af29
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 7 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -155,6 +155,10 @@ public function exportresults()
         {
             //FIND OUT HOW MANY FIELDS WILL BE NEEDED - FOR 255 COLUMN LIMIT
             $aFieldMap = createFieldMap($iSurveyID,'full',false,false,getBaseLanguageFromSurveyID($iSurveyID));
+            if ($thissurvey['savetimings'] === "Y") {
+                //Append survey timings to the fieldmap array
+                $aFieldMap = $aFieldMap + createTimingsFieldMap($iSurveyID, 'full',false,false,getBaseLanguageFromSurveyID($iSurveyID));
+            }
             $iFieldCount = count($aFieldMap);
 
             $selecthide = "";

diff --git a/application/helpers/admin/exportresults_helper.php b/application/helpers/admin/exportresults_helper.php
@@ -235,13 +235,18 @@ public function loadSurveyById($id)
     {
         $survey = new SurveyObj();
         $clang = Yii::app()->lang;
-
+        
         $intId = sanitize_int($id);
         $survey->id = $intId;
+        $survey->info = getSurveyInfo($survey->id);
         $lang = Survey::model()->findByPk($intId)->language;
         $clang = new limesurvey_lang($lang);
 
         $survey->fieldMap = createFieldMap($intId,'full',false,false,getBaseLanguageFromSurveyID($intId));
+        // Check to see if timings are present and add to fieldmap if needed
+        if ($survey->info['savetimings']=="Y") {
+            $survey->fieldMap = $survey->fieldMap + createTimingsFieldMap($intId,'full',false,false,getBaseLanguageFromSurveyID($intId));
+        }
 
         if (empty($intId))
         {
@@ -303,20 +308,24 @@ public function loadSurveyById($id)
     */
     public function loadSurveyResults(SurveyObj $survey, $iLimit, $iOffset, $iMaximum, $sFilter='' )
     {
-
+        // Get info about the survey
         $oRecordSet = Yii::app()->db->createCommand()->select()->from('{{survey_' . $survey->id . '}}');
         if (tableExists('tokens_'.$survey->id) && array_key_exists ('token',Survey_dynamic::model($survey->id)->attributes))
         {
             $oRecordSet->leftJoin('{{tokens_' . $survey->id . '}}','{{tokens_' . $survey->id . '}}.token={{survey_' . $survey->id . '}}.token');
         }
+        if ($survey->info['savetimings']=="Y") {
+            $oRecordSet->leftJoin("{{survey_" . $survey->id . "_timings}} survey_timings", "{{survey_" . $survey->id . "}}.id = survey_timings.id");
+        }
+
         if ($sFilter!='')
             $oRecordSet->where($sFilter);
             if ($iOffset+$iLimit>$iMaximum)
             {
                 $iLimit=$iMaximum-$iOffset;
             }
 
-        $survey->responses=$oRecordSet->order('id')->limit($iLimit, $iOffset)->query()->readAll();
+        $survey->responses=$oRecordSet->order('{{survey_' . $survey->id . '}}.id')->limit($iLimit, $iOffset)->query()->readAll();
 
         return count($survey->responses);
     }
@@ -357,6 +366,13 @@ class SurveyObj
     * @var array[int][string]mixed
     */
     public $groups;
+
+    /**
+     * info about the survey
+     * 
+     * @var array
+     */
+    public $info;
 
     /**
     * The questions in the survey.

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2258,14 +2258,15 @@ function createCompleteSGQA($iSurveyID,$aFilters,$sLanguage) {
 * @param mixed $style 'short' (default) or 'full' - full creates extra information like default values
 * @param mixed $force_refresh - Forces to really refresh the array, not just take the session copy
 * @param int $questionid Limit to a certain qid only (for question preview) - default is false
+* @param string $sQuestionLanguage The language to use
 * @return array
 */
 function createFieldMap($surveyid, $style='short', $force_refresh=false, $questionid=false, $sLanguage) {
     global $aDuplicateQIDs;
 
     $sLanguage = sanitize_languagecode($sLanguage);
     $surveyid = sanitize_int($surveyid);
-    $clang = new Limesurvey_lang($sLanguage); ;
+    $clang = new Limesurvey_lang($sLanguage);
 
     //checks to see if fieldmap has already been built for this page.
     if (isset(Yii::app()->session['fieldmap-' . $surveyid . $sLanguage]) && !$force_refresh && $questionid == false) {
@@ -2885,16 +2886,18 @@ function hasFileUploadQuestion($surveyid) {
 * @param mixed $style 'short' (default) or 'full' - full creates extra information like default values
 * @param mixed $force_refresh - Forces to really refresh the array, not just take the session copy
 * @param int $questionid Limit to a certain qid only (for question preview) - default is false
+* @param string $sQuestionLanguage The language to use
 * @return array
 */
 function createTimingsFieldMap($surveyid, $style='full', $force_refresh=false, $questionid=false, $sQuestionLanguage=null) {
 
     global $aDuplicateQIDs;
     static $timingsFieldMap;
 
-    $clang = Yii::app()->lang;
-
-    $surveyid=sanitize_int($surveyid);
+    $sLanguage = sanitize_languagecode($sQuestionLanguage);
+    $surveyid = sanitize_int($surveyid);
+    $clang = new Limesurvey_lang($sLanguage);
+
     //checks to see if fieldmap has already been built for this page.
     if (isset($timingsFieldMap[$surveyid][$style][$clang->langcode]) && $force_refresh==false) {
         return $timingsFieldMap[$surveyid][$style][$clang->langcode];

diff --git a/application/models/Survey_dynamic.php b/application/models/Survey_dynamic.php
@@ -130,6 +130,30 @@ public static function deleteSomeRecords($condition = FALSE)
 
         return $survey->deleteAll($criteria);
     }
+
+    /**
+     * Return criteria updated with the ones needed for including results from the timings table
+     *
+     * @param CDbCriteria|string $criteria
+     *
+     * @return CDbCriteria
+     */
+    public function addTimingCriteria($condition)
+    {
+        $newCriteria = new CDbCriteria();
+        $criteria = $this->getCommandBuilder()->createCriteria($condition);
+
+        if ($criteria->select == '*')
+        {
+            $criteria->select = 't.*';
+        }
+
+        $newCriteria->join = "LEFT JOIN {{survey_" . self::$sid . "_timings}} survey_timings ON t.id = survey_timings.id";
+        $newCriteria->select = 'tokens.*';  // Otherwise we don't get records from the token table
+        $newCriteria->mergeWith($criteria);
+
+        return $newCriteria;
+    }
 
     /**
      * Return criteria updated with the ones needed for including results from the token table