Fixed issue 856: Language Question DataEntry-Screen now working

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2813 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Apr 29, 2007 · 39ef54d · 39ef54d
1 parent f596531
commit 39ef54d
Showing 1 changed file with 33 additions and 22 deletions.
diff --git a/admin/dataentry.php b/admin/dataentry.php
@@ -932,21 +932,27 @@
 					$i--;
 					break;
 
-					case "I": //FILE CSV ONE
+					case "I": //Language Switch
 					$lquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$fnames[$i][7]} AND ".db_table_name("answers").".language = '{$language}' ORDER BY sortorder, answer";
 					$lresult = db_execute_assoc($lquery);
-					$dataentryoutput .= "\t\t\t<select name='{$fnames[$i][0]}'>\n"
-					."\t\t\t\t<option value=''";
+
+
+                    $slangs = GetAdditionalLanguagesFromSurveyID($surveyid);
+                    $baselang = GetBaseLanguageFromSurveyID($surveyid);
+                    array_unshift($slangs,$baselang);
+
+                    $dataentryoutput.= "<select name='{$fnames[$i][0]}'>\n";
+					$dataentryoutput .= "\t\t\t\t<option value=''";
 					if ($idrow[$fnames[$i][0]] == "") {$dataentryoutput .= " selected";}
 					$dataentryoutput .= ">".$clang->gT("Please choose")."..</option>\n";
 
-					while ($llrow = $lresult->FetchRow())
-					{
-						$dataentryoutput .= "\t\t\t\t<option value='{$llrow['code']}'";
-						if ($idrow[$fnames[$i][0]] == $llrow['code']) {$dataentryoutput .= " selected";}
-						$dataentryoutput .= ">{$llrow['answer']}</option>\n";
-					}
-					$dataentryoutput .= "\t\t\t</select>\n";
+                    foreach ($slangs as $lang)
+                       	{
+                            $dataentryoutput.="<option value='{$lang}'";
+                       		if ($lang == $idrow[$fnames[$i][0]]) {$dataentryoutput .= " selected='selected'";}
+                            $dataentryoutput.=">".getLanguageNameFromCode($lang,false)."</option>\n";
+                       	}
+                    $dataentryoutput .= "</select>";
 					break;
 
 					case "P": //MULTIPLE OPTIONS WITH COMMENTS checkbox + text
@@ -1921,17 +1927,22 @@ function saveshow(value)
 					}
 					break;
 					case "I": //Language Switch
-					$defexists='';
-					$deaquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} ORDER BY sortorder, answer";
-					$dearesult = db_execute_assoc($deaquery);
-					$dataentryoutput .= "\t\t\t<select name='$fieldname'>\n";
-					while ($dearow = $dearesult->FetchRow())
-					{
-						$dataentryoutput .= "\t\t\t\t<option value='{$dearow['code']}'";
-						if ($dearow['default_value'] == "Y") {$dataentryoutput .= " selected"; $defexists = "Y";}
-						$dataentryoutput .= ">{$dearow['answer']}</option>\n";
-					}
-					if ($defexists='') {$dataentryoutput .= "\t\t\t\t<option selected value=''>".$clang->gT("Please choose")."..</option>\n";}
+                    $slangs = GetAdditionalLanguagesFromSurveyID($surveyid);
+                    $baselang = GetBaseLanguageFromSurveyID($surveyid);
+                    array_unshift($slangs,$baselang);
+
+                    $dataentryoutput.= "<select name='{$fieldname}'>\n";
+					$dataentryoutput .= "\t\t\t\t<option value=''";
+					$dataentryoutput .= " selected";
+					$dataentryoutput .= ">".$clang->gT("Please choose")."..</option>\n";
+
+                    foreach ($slangs as $lang)
+                       	{
+                            $dataentryoutput.="<option value='{$lang}'";
+                       		//if ($lang == $idrow[$fnames[$i][0]]) {$dataentryoutput .= " selected='selected'";}
+                            $dataentryoutput.=">".getLanguageNameFromCode($lang,false)."</option>\n";
+                       	}
+                    $dataentryoutput .= "</select>";
 					break;
 					case "P": //MULTIPLE OPTIONS WITH COMMENTS checkbox + text
 					$dataentryoutput .= "<table border='0'>\n";
@@ -2145,7 +2156,7 @@ function saveshow(value)
                 $slangs = GetAdditionalLanguagesFromSurveyID($surveyid);
                 $baselang = GetBaseLanguageFromSurveyID($surveyid);
                 array_unshift($slangs,$baselang);
-                $dataentryoutput.= "<select name='save_language' onchange=\"window.open(this.options[this.selectedIndex].value, '_top')\">\n";
+                $dataentryoutput.= "<select name='save_language'>\n";
                 foreach ($slangs as $lang)
                    	{
                    		if ($lang == $baselang) $dataentryoutput .= "\t<option value='{$lang}' selected='selected'>".getLanguageNameFromCode($lang,false)."</option>\n";