Skip to content

Commit

Permalink
Fixed issue: Numerous postgres problems due to improper table alias n…
Browse files Browse the repository at this point in the history 
…ame casing
  • Loading branch information
@c-schmitz
c-schmitz committed Mar 23, 2020
1 parent a24f6a4 commit 2988636
Show file tree
Hide file tree
Showing 24 changed files with 110 additions and 110 deletions.
24 changes: 12 additions & 12 deletions application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -1400,7 +1400,7 @@ protected function getCAnswersAndCQuestions(array $theserows)
//Array Flexible Column
case "H":
$fresult = Answer::model()->with(array(
'answerL10ns' => array(
'answerl10ns' => array(
'condition' => 'answerl10ns.language = :lang',
'params' => array(':lang' => $this->language),
'alias' => 'answerl10ns',
Expand All @@ -1410,7 +1410,7 @@ protected function getCAnswersAndCQuestions(array $theserows)
'scale_id' => 0,
), array('order' => 'sortorder, code')
);
foreach ($fresult as $frow) { $canswers[] = array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], $frow['code'], $frow->answerL10ns[$this->language]->answer); }
foreach ($fresult as $frow) { $canswers[] = array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title'], $frow['code'], $frow->answerl10ns[$this->language]->answer); }
break;
}
// Only Show No-Answer if question is not mandatory
Expand Down Expand Up @@ -1492,8 +1492,8 @@ protected function getCAnswersAndCQuestions(array $theserows)

// first label
$lresult = Answer::model()->with(array(
'answerL10ns' => array(
'condition' => 'answerL10ns.language = :lang',
'answerl10ns' => array(
'condition' => 'answerl10ns.language = :lang',
'params' => array(':lang' => $this->language)
)))->findAllByAttributes(array('qid' => $rows['qid'], 'scale_id' => 0), array('order' => 'sortorder, answer'));
foreach ($lresult as $lrows) {
Expand All @@ -1502,8 +1502,8 @@ protected function getCAnswersAndCQuestions(array $theserows)

// second label
$lresult = Answer::model()->with(array(
'answerL10ns' => array(
'condition' => 'answerL10ns.language = :lang',
'answerl10ns' => array(
'condition' => 'answerl10ns.language = :lang',
'params' => array(':lang' => $this->language)
)))->findAllByAttributes(array(
'qid' => $rows['qid'],
Expand Down Expand Up @@ -1540,8 +1540,8 @@ protected function getCAnswersAndCQuestions(array $theserows)
} elseif ($rows['type'] == Question::QT_R_RANKING_STYLE) {
//Answer Ranking
$aresult = Answer::model()->with(array(
'answerL10ns' => array(
'condition' => 'answerL10ns.language = :lang',
'answerl10ns' => array(
'condition' => 'answerl10ns.language = :lang',
'params' => array(':lang' => $this->language)
)))->findAllByAttributes(
array(
Expand All @@ -1554,7 +1554,7 @@ protected function getCAnswersAndCQuestions(array $theserows)

$quicky = [];
foreach ($aresult as $arow) {
$theanswer = $arow->answerL10ns[$this->language]->answer;
$theanswer = $arow->answerl10ns[$this->language]->answer;
$quicky[] = array($arow['code'], $theanswer);
}

Expand Down Expand Up @@ -1630,8 +1630,8 @@ protected function getCAnswersAndCQuestions(array $theserows)

default:
$aresult = Answer::model()->with(array(
'answerL10ns' => array(
'condition' => 'answerL10ns.language = :lang',
'answerl10ns' => array(
'condition' => 'answerl10ns.language = :lang',
'params' => array(':lang' => $this->language),
'alias' => 'answerl10ns',
))
Expand All @@ -1641,7 +1641,7 @@ protected function getCAnswersAndCQuestions(array $theserows)
), array('order' => 'sortorder, answer'));

foreach ($aresult as $arows) {
$theanswer = $arows->answerL10ns[$this->language]->answer;
$theanswer = $arows->answerl10ns[$this->language]->answer;
$canswers[] = array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'], $arows['code'], $theanswer);
}
if ($rows['type'] == Question::QT_D_DATE) {
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/database.php
View file
Expand Up @@ -1381,15 +1381,15 @@ private function actionInsertCopyQuestion($iSurveyID)
}
}
if (returnGlobal('copyanswers') == 1) {
$oOldAnswers = Answer::model()->with('answerL10ns')->findAllByAttributes(array("qid"=>$oldQID));
$oOldAnswers = Answer::model()->with('answerl10ns')->findAllByAttributes(array("qid"=>$oldQID));
foreach ($oOldAnswers as $answer) {
$newAnswer = new Answer();
$newAnswer->attributes = $answer->attributes;
$newAnswer->qid = $this->iQuestionID;
if ($newAnswer->save()) {
$iNewAnswerId = Yii::app()->db->getLastInsertID();
if (isset($answer->answerL10ns)){
foreach($answer->answerL10ns as $language => $answerL10ns){
if (isset($answer->answerl10ns)){
foreach($answer->answerl10ns as $language => $answerL10ns){
$oAnswerLS = new AnswerL10n;
$oAnswerLS->language = $language;
$oAnswerLS->answer = $answerL10ns->answer;
Expand Down
24 changes: 12 additions & 12 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -698,7 +698,7 @@ public function editdata($subaction, $id, $surveyid)
$aDataentryoutput .= "\t<input type='text' name='{$fname['fieldname']}' value='"
.htmlspecialchars($idrow[$fname['fieldname']], ENT_QUOTES)."' />\n";
} else {
$lresult = Answer::model()->with('answerL10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $fname['qid'], 'language' => $sDataEntryLanguage)));
$lresult = Answer::model()->with('answerl10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $fname['qid'], 'language' => $sDataEntryLanguage)));
$aDataentryoutput .= "\t<select name='{$fname['fieldname']}' class='form-control'>\n"
."<option value=''";
if ($idrow[$fname['fieldname']] == "") {$aDataentryoutput .= " selected='selected'"; }
Expand All @@ -708,13 +708,13 @@ public function editdata($subaction, $id, $surveyid)
foreach ($lresult as $llrow) {
$aDataentryoutput .= "<option value='{$llrow['code']}'";
if ($idrow[$fname['fieldname']] == $llrow['code']) {$aDataentryoutput .= " selected='selected'"; }
$aDataentryoutput .= ">{$llrow->answerL10ns[$sDataEntryLanguage]->answer}</option>\n";
$aDataentryoutput .= ">{$llrow->answerl10ns[$sDataEntryLanguage]->answer}</option>\n";
}
} else {
$defaultopts = array();
$optgroups = array();
foreach ($lresult as $llrow) {
list ($categorytext, $answertext) = explode($optCategorySeparator, $llrow->answerL10ns[$sDataEntryLanguage]->answer);
list ($categorytext, $answertext) = explode($optCategorySeparator, $llrow->answerl10ns[$sDataEntryLanguage]->answer);
if ($categorytext == '') {
$defaultopts[] = array('code' => $llrow['code'], 'answer' => $answertext);
} else {
Expand Down Expand Up @@ -757,7 +757,7 @@ public function editdata($subaction, $id, $surveyid)
foreach ($lresult as $llrow) {
$aDataentryoutput .= "<option value='{$llrow['code']}'";
if ($idrow[$fname['fieldname']] == $llrow['code']) {$aDataentryoutput .= " selected='selected'"; }
$aDataentryoutput .= ">{$llrow->answerL10ns[$sDataEntryLanguage]->answer}</option>\n";
$aDataentryoutput .= ">{$llrow->answerl10ns[$sDataEntryLanguage]->answer}</option>\n";
}
$fname = next($fnames);
$aDataentryoutput .= "\t</select>\n"
Expand All @@ -776,7 +776,7 @@ public function editdata($subaction, $id, $surveyid)
}
$fname = next($fnames);
}
$ansresult = Answer::model()->with('answerL10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $thisqid, 'language' => $sDataEntryLanguage)));
$ansresult = Answer::model()->with('answerl10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $thisqid, 'language' => $sDataEntryLanguage)));
$anscount = count($ansresult);
$answers = array();
foreach ($ansresult as $ansrow) {
Expand All @@ -797,7 +797,7 @@ public function editdata($subaction, $id, $surveyid)
$aDataentryoutput .= "\t<option value=\"\" $selected>".gT('None')."</option>\n";
foreach ($ansresult as $ansrow) {
(isset($currentvalues[$i - 1]) && $currentvalues[$i - 1] == $ansrow['code']) ? $selected = " selected=\"selected\"" : $selected = "";
$aDataentryoutput .= "\t<option value=\"".$ansrow['code']."\" $selected>".flattenText($ansrow->answerL10ns[$sDataEntryLanguage]->answer)."</option>\n";
$aDataentryoutput .= "\t<option value=\"".$ansrow['code']."\" $selected>".flattenText($ansrow->answerl10ns[$sDataEntryLanguage]->answer)."</option>\n";
}
$aDataentryoutput .= "</select\n";
$aDataentryoutput .= "</li>";
Expand All @@ -808,7 +808,7 @@ public function editdata($subaction, $id, $surveyid)
. "<div style='display:none' id='ranking-{$thisqid}-name'>javatbd{$myfname}</div>";
$aDataentryoutput .= "<div style=\"display:none\">";
foreach ($ansresult as $ansrow) {
$aDataentryoutput .= "<div id=\"htmlblock-{$thisqid}-{$ansrow['code']}\">{$ansrow->answerL10ns[$sDataEntryLanguage]->answer}</div>";
$aDataentryoutput .= "<div id=\"htmlblock-{$thisqid}-{$ansrow['code']}\">{$ansrow->answerl10ns[$sDataEntryLanguage]->answer}</div>";
}
$aDataentryoutput .= "</div>";
$aDataentryoutput .= '</div>';
Expand Down Expand Up @@ -1090,7 +1090,7 @@ public function editdata($subaction, $id, $surveyid)
foreach ($fresult as $frow) {
$aDataentryoutput .= "\t<input type='radio' class='' name='{$fname['fieldname']}' value='{$frow['code']}'";
if ($idrow[$fname['fieldname']] == $frow['code']) {$aDataentryoutput .= " checked"; }
$aDataentryoutput .= " />".$frow->answerL10ns[$sDataEntryLanguage]->answer."&nbsp;\n";
$aDataentryoutput .= " />".$frow->answerl10ns[$sDataEntryLanguage]->answer."&nbsp;\n";
}
//Add 'No Answer'
$aDataentryoutput .= "\t<input type='radio' class='' name='{$fname['fieldname']}' value=''";
Expand Down Expand Up @@ -1871,21 +1871,21 @@ public function view($surveyid)
unset($optCategorySeparator);
}
$defexists = "";
$arAnswers = Answer::model()->with('answerL10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $arQuestion['qid'], 'language' => $sDataEntryLanguage)));
$arAnswers = Answer::model()->with('answerl10ns')->findAll(array('condition'=>'qid =:qid AND language = :language', 'params' => array('qid' => $arQuestion['qid'], 'language' => $sDataEntryLanguage)));
//$aDataentryoutput .= "\t<select name='$fieldname' class='form-control' >\n";
$aDatatemp = '';
if (!isset($optCategorySeparator)) {
foreach ($arAnswers as $aAnswer) {
$aDatatemp .= "<option value='{$aAnswer['code']}'";
//if ($dearow['default_value'] == "Y") {$aDatatemp .= " selected='selected'"; $defexists = "Y";}
$aDatatemp .= ">{$aAnswer->answerL10ns[$sDataEntryLanguage]->answer}</option>\n";
$aDatatemp .= ">{$aAnswer->answerl10ns[$sDataEntryLanguage]->answer}</option>\n";
}
} else {
$defaultopts = array();
$optgroups = array();

foreach ($arAnswers as $aAnswer) {
list ($categorytext, $answertext) = explode($optCategorySeparator, $aAnswer->answerL10ns[$sDataEntryLanguage]->answer);
list ($categorytext, $answertext) = explode($optCategorySeparator, $aAnswer->answerl10ns[$sDataEntryLanguage]->answer);
if ($categorytext == '') {
$defaultopts[] = array('code' => $aAnswer['code'], 'answer' => $answertext, 'default_value' => $aAnswer['assessment_value']);
} else {
Expand Down Expand Up @@ -1920,7 +1920,7 @@ public function view($surveyid)
foreach ($arAnswers as $aAnswer) {
$aDatatemp .= "<option value='{$aAnswer['code']}'";
//if ($dearow['default_value'] == "Y") {$aDatatemp .= " selected='selected'"; $defexists = "Y";}
$aDatatemp .= ">{$aAnswer->answerL10ns[$sDataEntryLanguage]->answer}</option>\n";
$aDatatemp .= ">{$aAnswer->answerl10ns[$sDataEntryLanguage]->answer}</option>\n";

}
$cdata['datatemp'] = $aDatatemp;
Expand Down

0 comments on commit 2988636

Please sign in to comment.