Skip to content

Commit

Permalink
Fixed issue 4206:Array (Multi Flexible) (Numbers) - Not working corre…
Browse files Browse the repository at this point in the history 
…ctly

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8505 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
Harsha Mora committed Mar 20, 2010
1 parent ea39038 commit 69d2fe5
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 38 deletions.
20 changes: 10 additions & 10 deletions admin/dataentry.php
View file
Expand Up @@ -1465,19 +1465,19 @@
break;
case ":": //ARRAY (Multi Flexi) (Numbers)
$qidattributes=getQuestionAttributes($fnames[$i][7]);
if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min'] =='')) {
if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min']) ==''){
$maxvalue=$qidattributes['multiflexible_max'];
$minvalue=1;
}
if (trim($qidattributes['multiflexible_min'])!='' && trim($qidattributes['multiflexible_max'] =='' )) {
if (trim($qidattributes['multiflexible_min'])!='' && trim($qidattributes['multiflexible_max']) ==''){
$minvalue=$qidattributes['multiflexible_min'];
$maxvalue=10 ;
$maxvalue=$qidattributes['multiflexible_min'] + 10;
}
if (trim($qidattributes['multiflexible_min'])=='' && trim($qidattributes['multiflexible_max'] =='' )) {
if (trim($qidattributes['multiflexible_min'])=='' && trim($qidattributes['multiflexible_max']) ==''){
$minvalue=1;
$maxvalue=10;
}
if (trim($qidattributes['multiflexible_min']) !='' && trim($qidattributes['multiflexible_max'] !='' )) {
if (trim($qidattributes['multiflexible_min']) !='' && trim($qidattributes['multiflexible_max']) !=''){
if($qidattributes['multiflexible_min'] < $qidattributes['multiflexible_max']){
$minvalue=$qidattributes['multiflexible_min'];
$maxvalue=$qidattributes['multiflexible_max'];
Expand Down Expand Up @@ -2754,19 +2754,19 @@ function saveshow(value)
break;
case ":": //ARRAY (Multi Flexi)
$qidattributes=getQuestionAttributes($deqrow['qid']);
if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min'] =='')) {
if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min']) =='') {
$maxvalue=$qidattributes['multiflexible_max'];
$minvalue=1;
}
if (trim($qidattributes['multiflexible_min'])!='' && trim($qidattributes['multiflexible_max'] =='' )) {
if (trim($qidattributes['multiflexible_min'])!='' && trim($qidattributes['multiflexible_max']) =='') {
$minvalue=$qidattributes['multiflexible_min'];
$maxvalue=10;
$maxvalue=$qidattributes['multiflexible_min'] + 10;
}
if (trim($qidattributes['multiflexible_min'])=='' && trim($qidattributes['multiflexible_max'] =='' )) {
if (trim($qidattributes['multiflexible_min'])=='' && trim($qidattributes['multiflexible_max']) =='') {
$minvalue=1;
$maxvalue=10;
}
if (trim($qidattributes['multiflexible_min']) !='' && trim($qidattributes['multiflexible_max'] !='' )) {
if (trim($qidattributes['multiflexible_min']) !='' && trim($qidattributes['multiflexible_max']) !='') {
if($qidattributes['multiflexible_min'] < $qidattributes['multiflexible_max']){
$minvalue=$qidattributes['multiflexible_min'];
$maxvalue=$qidattributes['multiflexible_max'];
Expand Down
31 changes: 19 additions & 12 deletions admin/printablesurvey.php
View file
Expand Up @@ -1368,18 +1368,25 @@ function star_replace($input)
// ==================================================================
case ":": //ARRAY (Multi Flexible) (Numbers)
$headstyle="style='padding-left: 20px; padding-right: 7px'";
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'];
}
Expand Down
34 changes: 18 additions & 16 deletions qanda.php
View file
Expand Up @@ -5965,22 +5965,24 @@ function do_array_multiflexi($ia)
$lquery = "SELECT * FROM {$dbprefix}labels WHERE lid=$lid AND language='".$_SESSION['s_lang']."' ORDER BY sortorder, code";

$qidattributes=getQuestionAttributes($ia[0]);
if (trim($qidattributes['multiflexible_max'])!='')
{
$maxvalue=$qidattributes['multiflexible_max'];
}
else
{
$maxvalue=10;
}
if (trim($qidattributes['multiflexible_min'])!='')
{
$minvalue=$qidattributes['multiflexible_min'];
}
else
{
if(isset($minvalue['value']) && $minvalue['value'] == 0) {$minvalue = 0;} else {$minvalue=1;}
}
if (trim($qidattributes['multiflexible_max'])!='' && trim($qidattributes['multiflexible_min']) ==''){
$maxvalue=$qidattributes['multiflexible_max'];
if(isset($minvalue['value']) && $minvalue['value'] == 0) {$minvalue = 0;} else {$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']) ==''){
if(isset($minvalue['value']) && $minvalue['value'] == 0) {$minvalue = 0;} else {$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'])!='')
{
Expand Down

0 comments on commit 69d2fe5

Please sign in to comment.