[Gemstracker-svn] SF.net SVN: gemstracker:[533] trunk/library/classes/Gems/Tracker/Source/ LimeSurvey1m9FieldMap.php

[<gem...@li...>]

Revision: 533
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=533&view=rev
Author:   mennodekker
Date:     2012-03-06 11:51:15 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Fixed problem with display of answers for dual scale questions

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php

Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php	2012-03-01 16:41:08 UTC (rev 532)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php	2012-03-06 11:51:15 UTC (rev 533)
@@ -241,6 +241,7 @@
                         $map[$row1['sgq']] = $row1;
 
                         $row2 = $row;
+                        $row2['scale_id'] = 1;
                         $row2['sgq'] .= $row['sq_title'] . '#1';
                         $row2['code'] = $row['title'] . '_' . $row['sq_title'] . '#1';
                         $row2['sq_question1'] = $this->_getQuestionAttribute($row['qid'], 'dualscale_headerB', 'scale 2');
@@ -619,16 +620,13 @@
 
             // Juggle the labels for sub-questions etc..
             if (isset($field['sq_question'])) {
-                if (isset($field['sq_question1'])) {
-                    $tmpres['label'] = MUtil_Html::raw(sprintf($this->translate->_('%s: %s'), $field['sq_question'], $field['sq_question1']));
-                }
-                if (! isset($tmpres['label'])) {
-                    $tmpres['label'] = MUtil_Html::raw($this->removeHtml($field['sq_question']));
-                } else {
+                if (isset($tmpres['label'])) {
                     // Add non answered question for grouping
                     $model->set('_' . $name . '_', $tmpres);
-
-                    // "Next" question
+                }
+                if (isset($field['sq_question1'])) {
+                    $tmpres['label'] = MUtil_Html::raw(sprintf($this->translate->_('%s: %s'), $this->removeHtml($field['sq_question']), $this->removeHtml($field['sq_question1'])));
+                } else {
                     $tmpres['label'] = MUtil_Html::raw($this->removeHtml($field['sq_question']));
                 }
                 $tmpres['thClass'] = 'question_sub';

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.