Dev: QuestionTypeRenderer Multiple Numerical

LimeSurvey · Jan 4, 2019 · 4c2884e · 4c2884e
1 parent 3499120
commit 4c2884e
Show file tree

Hide file tree

Showing 9 changed files with 708 additions and 28 deletions.
diff --git a/application/config/questiontypes.php b/application/config/questiontypes.php
@@ -88,11 +88,8 @@
             'css/uploader.css',
         ),
         'js'=>array(
-            'scripts/uploadquestion'.$minVersion.'.js',
-        ),
-        'depends' => [
-            'emoji'
-        ]
+            'build/uploadquestion'.$minVersion.'.js',
+        )
     ),
     /* array-numeric question */
     'question-array-numeric'=>array(

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -149,17 +149,10 @@ function retrieveAnswers($ia)
         case Question::QT_Q_MULTIPLE_SHORT_TEXT: //MULTIPLE SHORT TEXT
         case Question::QT_T_LONG_FREE_TEXT: //LONG FREE TEXT
         case Question::QT_U_HUGE_FREE_TEXT: //HUGE FREE TEXT
+        case Question::QT_K_MULTIPLE_NUMERICAL_QUESTION: //MULTIPLE NUMERICAL QUESTION
             $oRenderer = $oQuestion->getRenderererObject($ia);
             $values = $oRenderer->render();
             break;
-
-        case Question::QT_Q_MULTIPLE_SHORT_TEXT: //MULTIPLE SHORT TEXT
-            $values = do_multipleshorttext($ia);
-            break;
-
-        case Question::QT_K_MULTIPLE_NUMERICAL_QUESTION: //MULTIPLE NUMERICAL QUESTION
-            $values = do_multiplenumeric($ia);
-            break;
 
         case Question::QT_N_NUMERICAL: //NUMERICAL QUESTION TYPE
             $values = do_numerical($ia);
@@ -1862,8 +1855,9 @@ function upload_$ia[1]() {
         var imageurl =  '".Yii::app()->getConfig('imageurl')."';
         var uploadurl =  '".$scriptloc."';
     </script>\n";
-    Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."modaldialog.js", LSYii_ClientScript::POS_BEGIN);
-    Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl')."uploader-files.css");
+    //Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."modaldialog.js", LSYii_ClientScript::POS_BEGIN);
+    //Yii::app()->getClientScript()->registerCssFile(Yii::app()->getConfig('publicstyleurl')."uploader-files.css");
+    Yii::app()->getClientScript()->registerPackage('question-file-upload');
     // Modal dialog
     //$answer .= $uploadbutton;
     $filecountvalue = '0';

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -926,14 +926,14 @@ public function getRenderererObject($aFieldArray)
             case Question::QT_Q_MULTIPLE_SHORT_TEXT: return new RenderMultipleShortText($aFieldArray);
             case Question::QT_T_LONG_FREE_TEXT: //fallthrough
             case Question::QT_U_HUGE_FREE_TEXT: return new RenderFreeText($aFieldArray);
+            case Question::QT_K_MULTIPLE_NUMERICAL_QUESTION: return new RenderMultipleNumerical($aFieldArray);
             case Question::QT_A_ARRAY_5_CHOICE_QUESTIONS: return 'arrays/5point';
             case Question::QT_B_ARRAY_10_CHOICE_QUESTIONS: return 'arrays/10point';
             case Question::QT_C_ARRAY_YES_UNCERTAIN_NO: return 'arrays/yesnouncertain';
             case Question::QT_E_ARRAY_OF_INC_SAME_DEC_QUESTIONS: return 'arrays/increasesamedecrease';
             case Question::QT_F_ARRAY_FLEXIBLE_ROW: return 'arrays/multiflexi';
             case Question::QT_G_GENDER_DROPDOWN: return 'gender';
             case Question::QT_H_ARRAY_FLEXIBLE_COLUMN: return 'arrays/multiflexi';
-            case Question::QT_K_MULTIPLE_NUMERICAL_QUESTION: return 'multiplenumeric';
             case Question::QT_N_NUMERICAL: return 'numerical';
             case Question::QT_S_SHORT_FREE_TEXT: return 'shortfreetext';
             case Question::QT_Y_YES_NO_RADIO: return 'yesno';

diff --git a/application/models/QuestionBaseRenderer.php b/application/models/QuestionBaseRenderer.php
@@ -335,8 +335,8 @@ public function getCurrentRelevecanceClass($myfname)
     */              
     public function getLabelInputWidth()
     {
-        $labelAttributeWidth = trim($this->aQuestionAttributes['label_input_columns']);
-        $inputAttributeWidth = trim($this->aQuestionAttributes['text_input_columns']);
+        $labelAttributeWidth = @trim($this->aQuestionAttributes['label_input_columns']);
+        $inputAttributeWidth = @trim($this->aQuestionAttributes['text_input_columns']);
 
         $attributeInputContainerWidth = intval($inputAttributeWidth);
         if ($attributeInputContainerWidth < 1 || $attributeInputContainerWidth > 12) {

diff --git a/application/views/QuestionTypeRenderer/RenderMultipleNumerical.php b/application/views/QuestionTypeRenderer/RenderMultipleNumerical.php
diff --git a/application/views/QuestionTypeRenderer/RenderRanking.php b/application/views/QuestionTypeRenderer/RenderRanking.php
@@ -127,13 +127,13 @@ public function render($sCoreClasses = '')
         //$this->applyScripts();
 
         if (trim($this->aQuestionAttributes['choice_title'][App()->language]) != '') {
-            $choice_title = htmlspecialchars(trim($aQuestionAttributes['choice_title'][App()->language]), ENT_QUOTES);
+            $choice_title = htmlspecialchars(trim($this->aQuestionAttributes['choice_title'][App()->language]), ENT_QUOTES);
         } else {
             $choice_title = gT("Your Choices", 'js');
         }
 
         if (trim($this->aQuestionAttributes['rank_title'][App()->language]) != '') {
-            $rank_title = htmlspecialchars(trim($aQuestionAttributes['rank_title'][App()->language]), ENT_QUOTES);
+            $rank_title = htmlspecialchars(trim($this->aQuestionAttributes['rank_title'][App()->language]), ENT_QUOTES);
         } else {
             $rank_title = gT("Your Ranking", 'js');
         }

diff --git a/application/views/survey/questions/answer/file_upload/answer.twig b/application/views/survey/questions/answer/file_upload/answer.twig
@@ -93,8 +93,8 @@
             filecount++;
 
             var fileObject = {
-                title : {{showTitle}} ? $("#{{fileid}}_title_"+i).val() : '',
-                comment: {{showComment}} ? $("#{{fileid}}_comment_"+i).val() : '',
+                title : {{showTitle ? '$("#{{fileid}}_title_"+i).val()' : '""' }},
+                comment: {{showComment ? '$("#{{fileid}}_comment_"+i).val()' : '""'}},
                 size: '',
                 name: '',
                 ext: ''

diff --git a/application/views/survey/questions/answer/multiplenumeric/answer.twig b/application/views/survey/questions/answer/multiplenumeric/answer.twig
@@ -18,10 +18,17 @@
 <!-- answer -->
 <ul class='{{coreClass}} list-unstyled form-horizontal' role="group" aria-labelledby="ls-question-text-{{basename}}">
     {% block rows %}
-        {{ sRows }}
+        {% if aRows is empty %}
+            {% include 'survey/questions/answer/multiplenumeric/empty.twig' %}
+        {% else %}
+            {% for aRow in aRows %}
+                {{ dump(aRow) }}
+                {% include rowTemplate with aRow only %}
+            {% endfor %}
+        {% endif %}
     {% endblock %}
     {% block dynamic %}
-        {{ include("/survey/questions/answer/multiplenumeric/rows/dynamic_slider.twig", {
+        {{ include(dynamicTemplate, {
             'id' : id,
             'sumRemainingEqn' : sumRemainingEqn,
             'sumEqn' : sumEqn,

diff --git a/application/views/survey/questions/answer/multipleshorttext/answer.twig b/application/views/survey/questions/answer/multipleshorttext/answer.twig
@@ -10,9 +10,14 @@
 
 <!-- answer -->
 <ul class="{{ coreClass }} list-unstyled form-horizontal" role="group" aria-labelledby="ls-question-text-{{ basename }}">
-    {% for aRow in aRows %}
-        {% set rowTemplate = (aRow.textarea ? 'survey/questions/answer/multipleshorttext/rows/answer_row_textarea.twig' : 'survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.twig') %}
-        {% include rowTemplate with aRow only %}
-    {% endfor %}
+    {% if aRows is empty %}
+        {% include 'survey/questions/answer/multipleshorttext/empty.twig' %}
+    {% else %}
+        {% for aRow in aRows %}
+            {% set rowTemplate = (aRow.textarea ? 'survey/questions/answer/multipleshorttext/rows/answer_row_textarea.twig' : 'survey/questions/answer/multipleshorttext/rows/answer_row_inputtext.twig') %}
+            {% include rowTemplate with aRow only %}
+        {% endfor %}
+    {% endif %}
+
 </ul>
 <!-- end of answer -->