exportSpss & bugfix

LimeSurvey · Nov 6, 2017 · c31ec15 · c31ec15
1 parent b904e0c
commit c31ec15
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
@@ -175,7 +175,7 @@ public function exportresults()
             //FIND OUT HOW MANY FIELDS WILL BE NEEDED - FOR 255 COLUMN LIMIT
             if ($survey->isSaveTimings) {
                 //Append survey timings to the fieldmap array
-                $aFieldMap = createTimingsFieldMap($iSurveyID, 'full',false,false,$oSurvey->language);
+                $aFieldMap = createTimingsFieldMap($iSurveyID, 'full',false,false,$survey->language);
             }
             $iFieldCount = count($aFieldMap);
 

diff --git a/tests/controllers/AdminViewsTest.php b/tests/controllers/AdminViewsTest.php
@@ -55,15 +55,16 @@ public function testAdminSurveyViews(){
     private function findViewTag($name,$view){
         $this->openView($view);
         $element = null;
+
+        $screenshot = $this->webDriver->takeScreenshot();
+        file_put_contents(__DIR__ . '/../_output/'.$name.'.png', $screenshot);
         try{
             $element = $this->webDriver->findElement(WebDriverBy::id('action::'.$name));
         } catch (\Exception $e){
             //throw new Exception($e->getMessage());
         }
         $this->assertNotEmpty($element,sprintf('FAILED viewing %s on route %s',$name,$view['route']));
 
-        $screenshot = $this->webDriver->takeScreenshot();
-        file_put_contents(__DIR__ . '/../_output/'.$name.'.png', $screenshot);
 
     }
 

diff --git a/tests/data/views/adminSurveyViews.php b/tests/data/views/adminSurveyViews.php
@@ -38,10 +38,12 @@
     // FIXME these FAIL !!
     //'surveyResponsesIndex' =>['route'=>'responses/sa/index/surveyid/{SID}'],
     //'surveyResponsesBrowse' =>['route'=>'responses/sa/browse/surveyid/{SID}'],
+
+    // FIXME these views need an activated survey
     'dataEntryView' =>['route'=>'dataentry/sa/view/surveyid/{SID}'],
     'statisticsIndex' =>['route'=>'statistics/sa/index/surveyid/{SID}'],
-    'exportResults' =>['route'=>'export/sa/exportresults/sid/{SID}'],
-    'exportSpss' =>['route'=>'export/sa/exportspss/sid/{SID}'],
+    //'exportResults' =>['route'=>'export/sa/exportresults/surveyid/{SID}'],
+    //'exportSpss' =>['route'=>'export/sa/exportspss/sid/{SID}'],