Fixex issue #09464: Mandatory ranking anking question cannot go to ne…

…xt question if it's filtered by another question

Dev: review relevance of sub question by number of relevance of answers.
Dev: when rewriting Question object/EM : need a function for mandatory :)

application/helpers/expressions/em_manager_helper.php

@@ -5972,7 +5972,6 @@ function _ValidateQuestion($questionSeq,$force=false)
             $qrel=true;   // assume relevant unless discover otherwise
             $prettyPrintRelEqn='';    //  assume no relevance eqn by default
             $qid=$qInfo['qid'];
-
             $gid=$qInfo['gid'];
             $qhidden = $qInfo['hidden'];
             $debug_qmessage='';
@@ -6042,7 +6041,8 @@ function _ValidateQuestion($questionSeq,$force=false)
                 if ($qInfo['type'] == 'X') {
                     $sgqas = array();   // Boilerplate questions can be ignored
                 }
-                else {
+                else
+                {
                     $sgqas = explode('|',$LEM->qid2code[$qid]);
                 }
                 foreach ($sgqas as $sgqa)
@@ -6054,6 +6054,23 @@ function _ValidateQuestion($questionSeq,$force=false)
                         continue;
                     }
                     $foundSQrelevance=false;
+                    if($qInfo['type']=='R')
+                    {
+                        // Relevance of subquestion for ranking question depend of the count of relevance of answers.
+                        $iCountRank=(isset($iCountRank) ? $iCountRank+1 : 1);
+                        $iCountRelevant=isset($iCountRelevant) ? $iCountRelevant : count(array_filter($LEM->subQrelInfo[$qid],function($sqRankAnwsers){ return $sqRankAnwsers['result']; }));
+                        if($iCountRank >  $iCountRelevant)
+                        {
+                            $foundSQrelevance=true;
+                            $irrelevantSQs[] = $sgqa;
+                        }
+                        else
+                        {
+                            $relevantSQs[] = $sgqa;
+                        }
+                        continue;
+                    }
+
                     foreach ($LEM->subQrelInfo[$qid] as $sq)
                     {
                         switch ($sq['qtype'])
@@ -6255,7 +6272,6 @@ function _ValidateQuestion($questionSeq,$force=false)
                     }
                 }
             } // end of processing relevant question for sub-questions
-
             if (($LEM->debugLevel & LEM_PRETTY_PRINT_ALL_SYNTAX) == LEM_PRETTY_PRINT_ALL_SYNTAX)
             {
                 // TODO - why is array_unique needed here?