[spalenque] - #13297 * fix sangria flat report for survey

Author: santipalenque

sangria/code/SangriaPageExportDataExtension.php

@@ -411,7 +411,7 @@ private function ExportSurveyResultsDataSurveyBuilder()
 WHEN 'SurveyCheckBoxListQuestionTemplate'
 THEN ( SELECT GROUP_CONCAT(Value SEPARATOR '|') FROM SurveyQuestionValueTemplate WHERE FIND_IN_SET(ID, SA.Value) > 0)
 WHEN 'SurveyRankingQuestionTemplate'
-THEN ( SELECT GROUP_CONCAT(Value SEPARATOR '|') FROM SurveyQuestionValueTemplate WHERE FIND_IN_SET(ID, SA.Value) > 0)
+THEN ( SELECT GROUP_CONCAT(Value ORDER BY FIND_IN_SET(ID, SA.Value) SEPARATOR '|') FROM SurveyQuestionValueTemplate WHERE FIND_IN_SET(ID, SA.Value) > 0)
 WHEN 'SurveyRadioButtonListQuestionTemplate'
 THEN ( SELECT GROUP_CONCAT(Value SEPARATOR '|') FROM SurveyQuestionValueTemplate WHERE FIND_IN_SET(ID, SA.Value) > 0)
 ELSE SA.Value END AS Answer
@@ -804,7 +804,7 @@ private function getSurveyBuilderExportData($flat_fields = array(), $flat_fields
                         foreach($options as $o)
                         {
                             $index = array_search($o, $answers);
-                            $line[self::functionPrepareValueForCSV(sprintf("%s - %s", $question, $o))] =  $index === false ? '0' : ($index + 1);;
+                            $line[self::functionPrepareValueForCSV(sprintf("%s - %s", $question, $o))] =  $index === false ? '0' : ($index + 1);
                         }
                     }
                 }

survey_builder/code/infrastructure/active_records/instances/Survey.php

@@ -71,6 +71,8 @@ protected function onBeforeWrite()
         parent::onBeforeWrite();
         if ($this->CreatedBy()->inGroup(Survey::SurveyTestersGroupSlug)) {
             $this->IsTest = true;
+        } else {
+            $this->IsTest = false;
         }
     }