Index: statistics_function.php =================================================================== --- statistics_function.php (revision 10404) +++ statistics_function.php (working copy) @@ -142,14 +142,18 @@ if($q2show=='all' ) { - $summarySql=" SELECT gid, parent_qid, qid, type " + $summarySql=" SELECT gid, parent_qid, qid, type, title " ." FROM {$dbprefix}questions WHERE parent_qid=0" - ." AND sid=$surveyid "; + ." AND sid=$surveyid ORDER BY (0 + title) ASC"; $summaryRs = db_execute_assoc($summarySql); foreach($summaryRs as $field) { + if ($field['parent_qid'] == 0) { + // Not array type + if (($field['type'] != "1") && ($field['type'] != "A") && ($field['type'] != "B") && ($field['type'] != "C") + && ($field['type'] != "E") && ($field['type'] != "F") && ($field['type'] != ":") && ($field['type'] != ";")) { $myField = $surveyid."X".$field['gid']."X".$field['qid']; // Multiple choice get special treatment @@ -181,10 +185,25 @@ } - if($q2show=='all') + } + else { + $sqlQuery="SELECT gid, parent_qid, qid, type, title FROM {$dbprefix}questions WHERE sid=$surveyid AND parent_qid='".$field['qid']."' ORDER BY title"; + $sqlRs = db_execute_assoc($sqlQuery); + foreach($sqlRs as $arrayTypefield) + { + $lsrcHelper = new lsrcHelper(); + $lsrcHelper->debugLsrc("ARRAYTYPE_FIELDS: ".implode(",", $arrayTypefield)); + $myField = $surveyid."X".$arrayTypefield['gid']."X".$arrayTypefield['parent_qid'].$arrayTypefield['title']; + $summary[]=$myField; + $myField = null; + } + } + } + if($q2show=='all' && $myField!=null) { $summary[]=$myField; - + } //$allfields[]=$myField; + $myField = null; } } else