Fixed issue #05948: Mandatory directive for question is ignored for a…

…rray (numbers) using checkbox layout
LimeSurvey · Apr 4, 2012 · 3ed8d54 · 3ed8d54
1 parent 65cdd51
commit 3ed8d54
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -4263,7 +4263,6 @@ function _ValidateQuestion($questionSeq)
                     case 'F':
                     case 'J':
                     case 'H':
-                    case ':':
                     case ';':
                     case '1':
                         // In general, if any relevant questions aren't answered, then it violates the mandatory rule
@@ -4273,6 +4272,44 @@ function _ValidateQuestion($questionSeq)
                         }
                         $mandatoryTip .= $LEM->gT('Please complete all parts').'.';
                         break;
+                    case ':':
+                        $qattr = isset($LEM->qattr[$qid]) ? $LEM->qattr[$qid] : array();
+                        if (isset($qattr['multiflexible_checkbox']) && $qattr['multiflexible_checkbox'] == 1)
+                        {
+                            // Need to check whether there is at least one checked box per row
+                            foreach ($LEM->subQrelInfo[$qid] as $sq)
+                            {
+                                if ($_SESSION[$LEM->sessid]['relevanceStatus'][$sq['rowdivid']])
+                                {
+                                    $rowCount=0;
+                                    $numUnanswered=0;
+                                    foreach ($sgqas as $s)
+                                    {
+                                        if (strpos($s, $sq['rowdivid']) !== false)
+                                        {
+                                            ++$rowCount;
+                                            if (array_search($s,$unansweredSQs) !== false) {
+                                                ++$numUnanswered;
+                                            }
+                                        }
+                                    }
+                                    if ($rowCount > 0 && $rowCount == $numUnanswered)
+                                    {
+                                        $qmandViolation = true;
+                                    }
+                                }
+                            }
+                            $mandatoryTip .= $LEM->gT('Please check at least one box per row').'.';
+                        }
+                        else
+                        {
+                            if (count($unansweredSQs) > 0)
+                            {
+                                $qmandViolation = true; // TODO - what about 'other'?
+                            }
+                            $mandatoryTip .= $LEM->gT('Please complete all parts').'.';
+                        }
+                        break;
                     case 'R':
                         if (count($unansweredSQs) > 0)
                         {

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -6024,7 +6024,7 @@ function do_array_multiflexi($ia)
                     }
                     else
                     {
-                        $myvalue = '0';
+                        $myvalue = '';
                         $setmyvalue = '';
                     }
                     $answer .= "\t<td class=\"answer_cell_00$ld question-item answer-item {$answertypeclass}-item\">\n"