From cc9fec4d15d595231fa8f031b45cdf6f748f66a8 Mon Sep 17 00:00:00 2001 From: Harsha Mora Date: Sun, 28 Mar 2010 14:12:28 +0000 Subject: [PATCH] Updated feature:Modified Array (MultiFlexible) Numbers in statistics to work properly git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8529 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/statistics.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/admin/statistics.php b/admin/statistics.php index 6a9b398e78c..0a29d2dd300 100644 --- a/admin/statistics.php +++ b/admin/statistics.php @@ -1078,16 +1078,25 @@ $counter2=0; //Get qidattributes for this question $qidattributes=getQuestionAttributes($flt[0]); - if (trim($qidattributes['multiflexible_max'])!='') { - $maxvalue=$qidattributes['multiflexible_max']; - } else { - $maxvalue=10; - } - if (trim($qidattributes['multiflexible_min'])!='') { - $minvalue=$qidattributes['multiflexible_min']; - } else { - $minvalue=1; - } + if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min']) ==''){ + $maxvalue=$qidattributes['multiflexible_max']; + $minvalue=1; + } + if (trim($qidattributes['multiflexible_min'])!='' && trim($qidattributes['multiflexible_max']) ==''){ + $minvalue=$qidattributes['multiflexible_min']; + $maxvalue=$qidattributes['multiflexible_min'] + 10; + } + if (trim($qidattributes['multiflexible_min'])=='' && trim($qidattributes['multiflexible_max']) ==''){ + $minvalue=1; + $maxvalue=10; + } + if (trim($qidattributes['multiflexible_min']) !='' && trim($qidattributes['multiflexible_max']) !=''){ + if($qidattributes['multiflexible_min'] < $qidattributes['multiflexible_max']){ + $minvalue=$qidattributes['multiflexible_min']; + $maxvalue=$qidattributes['multiflexible_max']; + } + } + if (trim($qidattributes['multiflexible_step'])!='') { $stepvalue=$qidattributes['multiflexible_step']; } else {