Dev Fix for EM test

LimeSurvey · Jan 23, 2018 · a58d94b · a58d94b
1 parent 28ad432
commit a58d94b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -857,12 +857,13 @@ public static function getLEMqcode2sgqa($iSurveyId){
         */
         public static function ConvertConditionsToRelevance($surveyId, $qid=NULL)
         {
-            $aDictionary = LimeExpressionManager::getLEMqcode2sgqa($surveyId);
-            if (is_null($aDictionary)) {
-                $aDictionary=array();
-            } else {
-                $aDictionary = array_flip($aDictionary);
-            } 
+            $aDictionary=array();
+            if (!is_null($surveyId)) {
+                $aDictionary = LimeExpressionManager::getLEMqcode2sgqa($surveyId);
+                if (!is_null($aDictionary)) {
+                    $aDictionary = array_flip($aDictionary);
+                } 
+            }
             $query = LimeExpressionManager::getConditionsForEM($surveyId,$qid);
             $aConditions=$query->readAll();
             $_qid = -1;
@@ -945,7 +946,6 @@ public static function ConvertConditionsToRelevance($surveyId, $qid=NULL)
                             $row['cfieldname'] = $aDictionary[$row['cfieldname']];
                         }                        
                         // else create name by concatenating two parts together
-                        debugbreak();
                         $fieldname = $row['cfieldname'] . $row['value'] . '.NAOK';
                         $subqid = $row['cfieldname'];
                         $value = 'Y';

diff --git a/application/views/admin/expressions/test/conditions2relevance.php b/application/views/admin/expressions/test/conditions2relevance.php
@@ -6,7 +6,11 @@
 ?>
 
 <?php
-$data = LimeExpressionManager::UnitTestConvertConditionsToRelevance();
+$aSurveys = Survey::model()->findAll();
+$data= array();
+foreach ($aSurveys as $aSurvey){
+    $data += LimeExpressionManager::UnitTestConvertConditionsToRelevance($aSurvey->sid);
+}
 echo count($data) . " question(s) in your database contain conditions.  Below is the mapping of question ID number to generated relevance equation<br/>";
 echo "<pre>";
 print_r($data);