Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed bug #846: Semantic Differential Question Type: All Answers are …
…Double in DataEntry

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2794 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
c-schmitz committed Apr 24, 2007
1 parent 825960b commit 8f971af
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions admin/dataentry.php
Expand Up @@ -1099,7 +1099,7 @@
$fieldn = substr($fnames[$i][0], 0, strlen($fnames[$i][0]));
$dataentryoutput .= "\t<tr>\n"
."\t\t<td align='right' valign='top'>$setfont{$fnames[$i][6]}</font></td>\n";
$fquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid='{$fnames[$i][8]}' order by sortorder, code";
$fquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid='{$fnames[$i][8]}' and language='$language' order by sortorder, code";
$fresult = db_execute_assoc($fquery);
$dataentryoutput .= "\t\t<td>$setfont\n";
while ($frow=$fresult->FetchRow())
Expand Down Expand Up @@ -1472,7 +1472,7 @@ function saveshow(value)
default:
$value=substr($conrow['cfieldname'], strpos($conrow['cfieldname'], "X".$conrow['cqid'])+strlen("X".$conrow['cqid']), strlen($conrow['cfieldname']));
$fquery = "SELECT * FROM ".db_table_name("labels")."\n"
. "WHERE lid='{$conrow['lid']}'\n"
. "WHERE lid='{$conrow['lid']}'\n and language='$language' "
. "AND code='{$conrow['value']}'";
$fresult=db_execute_assoc($fquery) or die("$fquery<br />".htmlspecialchars($connect->ErrorMsg()));
while($frow=$fresult->FetchRow())
Expand Down Expand Up @@ -2046,24 +2046,35 @@ function saveshow(value)
break;
case "F": //ARRAY (Flexible Labels)
case "H":
$meaquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} ORDER BY sortorder, answer";
$meaquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} and language='$language' ORDER BY sortorder, answer";
$mearesult=db_execute_assoc($meaquery) or die ("Couldn't get answers, Type \"E\"<br />$meaquery<br />".htmlspecialchars($connect->ErrorMsg()));
$dataentryoutput .= "<table>\n";
while ($mearow = $mearesult->FetchRow())
{
$dataentryoutput .= "\t<tr>\n";
$dataentryoutput .= "\t\t<td align='right'>$setfont{$mearow['answer']}</font></td>\n";
if (strpos($mearow['answer'],'|'))
{
$answerleft=substr($mearow['answer'],0,strpos($mearow['answer'],'|'));
$answerright=substr($mearow['answer'],strpos($mearow['answer'],'|')+1);
}
else
{
$answerleft=$mearow['answer'];
$answerright='';
}
$dataentryoutput .= "\t<tr>\n";
$dataentryoutput .= "\t\t<td align='right'>{$answerleft}</td>\n";
$dataentryoutput .= "\t\t<td>\n";
$dataentryoutput .= "\t\t\t<select name='$fieldname{$mearow['code']}'>\n";
$dataentryoutput .= "\t\t\t\t<option value=''>".$clang->gT("Please choose")."..</option>\n";
$fquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid']} ORDER BY sortorder, code";
$fquery = "SELECT * FROM ".db_table_name("labels")." WHERE lid={$deqrow['lid']} and language='$language' ORDER BY sortorder, code";
$fresult = db_execute_assoc($fquery);
while ($frow = $fresult->FetchRow())
{
$dataentryoutput .= "\t\t\t\t<option value='{$frow['code']}'>".$frow['title']."</option>\n";
}
$dataentryoutput .= "\t\t\t</select>\n";
$dataentryoutput .= "\t\t</td>\n";
$dataentryoutput .= "\t\t<td align='left'>{$answerright}</td>\n";
$dataentryoutput .= "</tr>\n";
}
$dataentryoutput .= "</table>\n";
Expand Down

0 comments on commit 8f971af

Please sign in to comment.