Fixed issue #10607: Multiple numerical input - sum of sliders broken

LimeSurvey · Mar 9, 2016 · b00911e · b00911e
1 parent 918d540
commit b00911e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
@@ -1286,6 +1286,7 @@ public function delete($surveyid, $gid, $qid)
 
                 DefaultValue::model()->deleteAllByAttributes(array('qid' => $qid));
                 QuotaMember::model()->deleteAllByAttributes(array('qid' => $qid));
+
                 Question::model()->updateQuestionOrder($gid, $surveyid);
 
                 $qid = "";
@@ -1296,10 +1297,11 @@ public function delete($surveyid, $gid, $qid)
             Yii::app()->session['flashmessage'] = gT("Question was successfully deleted.");
 
             // remove question from lastVisited
-            $oCriteria = new CDbCriteria();
-            $oCriteria->compare('stg_name','last_question_%',true,'AND',false);
-            $oCriteria->compare('stg_value',$rqid,false,'AND');
-            SettingGlobal::model()->deleteAll($oCriteria);
+            SettingGlobal::model()->deleteAll(
+                        "stg_value = :stg_value",
+                        array(':stg_value' => $rqid )
+                    );
+
 
             $this->getController()->redirect(array('admin/survey/sa/listquestions/surveyid/' . $surveyid ));
         }

diff --git a/application/views/survey/questions/multiplenumeric/footer.php b/application/views/survey/questions/multiplenumeric/footer.php
@@ -10,6 +10,7 @@
  * @var $sumEqn             $qinfo['sumEqn']
  */
 ?>
+
     <?php if($equals_num_value):?>
         <p class='multiplenumerichelp help-item text-info'>
             <span class="label">
@@ -23,14 +24,15 @@
     <?php endif; ?>
 
     <?php if($displaytotal):?>
-        <p class='multiplenumerichelp  help-item text-info'>
-            <span class=""><?php eT('Total: '); ?></span>
+
+        <li class='multiplenumerichelp  help-item'>
+            <span class="label"><?php eT('Total: '); ?></span>
             <span id="totalvalue_<?php echo $id; ?>" class="dynamic_sum">
                 <?php echo $prefix; ?>
-                { <?php echo $sumEqn; ?> }
+                {<?php echo $sumEqn; ?>}
                 <?php echo $suffix; ?>
             </span>
-        </p>
-    <?php endif; ?>
+        </li>
 </ul>
+    <?php endif; ?>
 </div> <!-- Footer -->
diff --git a/application/views/survey/questions/multiplenumeric/item.php b/application/views/survey/questions/multiplenumeric/item.php
@@ -19,14 +19,14 @@
  */
 ?>
 <!-- question attribute "display_rows" is set -> we need a textarea to be able to show several rows -->
-<li class="question-item answer-item text-item <?php echo $extraclass;?>" <?php echo $sDisplayStyle;?>>
+<li  id='javatbd<?php echo $myfname; ?>' class="question-item answer-item numeric-item  text-item <?php echo $extraclass;?>" <?php echo $sDisplayStyle;?>>
     <?php if($alert):?>
         <div class="alert alert-danger errormandatory"  role="alert">
             <?php echo $labelText;?>
         </div> <!-- alert -->
     <?php endif;?>
     <div  class="form-group-row row">
-        <label class='control-label col-xs-12' for="answer<?php echo $myfname; ?>">
+        <label class='control-label col-xs-12 numeric-label' for="answer<?php echo $myfname; ?>">
             <?php echo $labelText;?>
         </label>
                         <br/><br/><br/>
@@ -42,6 +42,7 @@ class="text form-control numeric <?php echo $kpclass;?>"
                     id="answer<?php echo $myfname; ?>"
                     value="<?php echo $dispVal;?>"
                     onkeyup="<?php echo $checkconditionFunction; ?>"
+                    title="<?php eT('Only numbers may be entered in this field.'); ?>";
                     <?php echo $maxlength; ?>
                 />
             <?php else:?>