Skip to content

Commit

Permalink
Dev: replaced global function getQuestionAttributes by model one
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Jan 25, 2016
1 parent c66f508 commit a9b6bd0
Showing 1 changed file with 39 additions and 32 deletions.
71 changes: 39 additions & 32 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -93,7 +93,8 @@ function retrieveAnswers($ia)
$qtitle=$ia[3];
$inputnames=array();

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
//$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
//Create the question/answer html
$answer = "";
// Previously in limesurvey, it was virtually impossible to control how the start of questions were formatted.
Expand Down Expand Up @@ -753,7 +754,8 @@ function return_display_style($ia, $aQuestionAttributes, $thissurvey, $rowname)
return $htmltbody2;
}

function return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $rowname, $trbc='', $valuename, $method="tbody", $class=null) {
function return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $rowname, $trbc='', $valuename, $method="tbody", $class=null)
{
$htmltbody2 = "\n\n\t<$method id='javatbd$rowname'";
$htmltbody2 .= ($class !== null) ? " class='$class'": "";
$surveyid=$thissurvey['sid'];
Expand Down Expand Up @@ -814,7 +816,8 @@ function return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $an

function do_boilerplate($ia)
{
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
//$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$answer='';

if (trim($aQuestionAttributes['time_limit'])!='')
Expand All @@ -830,7 +833,7 @@ function do_boilerplate($ia)

function do_equation($ia)
{
$aQuestionAttributes= getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$sEquation=(trim($aQuestionAttributes['equation'])) ? $aQuestionAttributes['equation'] : $ia[3];
$sValue = htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]],ENT_QUOTES);

Expand All @@ -851,7 +854,8 @@ function do_5pointchoice($ia)
{
$imageurl = Yii::app()->getConfig("imageurl");
$checkconditionFunction = "checkconditions";
$aQuestionAttributes= getQuestionAttributeValues($ia[0]);
//$aQuestionAttributes= getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$id = 'slider'.time().rand(0,100);

$answer = Yii::app()->getController()->renderPartial('/survey/questions/5pointchoice/5pointchoice_header', array('id'=>$id), true);
Expand Down Expand Up @@ -920,10 +924,13 @@ function do_5pointchoice($ia)
function do_date($ia)
{
global $thissurvey;
$aQuestionAttributes=getQuestionAttributeValues($ia[0],$ia[4]);
// Rem: this should generate a bug...
//$aQuestionAttributes=getQuestionAttributeValues($ia[0],$ia[4]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$sDateLangvarJS=" translt = {
alertInvalidDate: '" . gT('Date entered is invalid!','js') . "',
};";

App()->getClientScript()->registerScript("sDateLangvarJS",$sDateLangvarJS,CClientScript::POS_HEAD);
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'date.js');
App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("third_party").'jstoolbox/date.js');
Expand Down Expand Up @@ -1276,11 +1283,7 @@ function do_date($ia)
// ---------------------------------------------------------------
function do_language($ia)
{



$checkconditionFunction = "checkconditions";

$answerlangs = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->additionalLanguages;
$answerlangs [] = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
// Get actual answer
Expand Down Expand Up @@ -1326,7 +1329,8 @@ function do_list_dropdown($ia)
$checkconditionFunction = "checkconditions";

// Question attribute variables
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
//$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$iSurveyId = Yii::app()->getConfig('surveyID'); // survey id
$sSurveyLang = $_SESSION['survey_'.$iSurveyId]['s_lang']; // survey language
$othertext = (trim($aQuestionAttributes['other_replace_text'][$sSurveyLang])!='')?$aQuestionAttributes['other_replace_text'][$sSurveyLang]:gT('Other:'); // text for 'other'
Expand Down Expand Up @@ -1597,7 +1601,8 @@ function do_list_radio($ia)
$sSurveyLang = $_SESSION['survey_'.$iSurveyId]['s_lang']; // survey language

// Question attribute variables
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
//$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$othertext = (trim($aQuestionAttributes['other_replace_text'][$sSurveyLang])!='')?$aQuestionAttributes['other_replace_text'][$sSurveyLang]:gT('Other:'); // text for 'other'
$iNbCols = (trim($aQuestionAttributes['display_columns'])!='')?$aQuestionAttributes['display_columns']:1; // number of columns

Expand Down Expand Up @@ -1886,7 +1891,7 @@ function do_listwithcomment($ia)
if (!isset($maxoptionsize)) {$maxoptionsize=35;}

// Question attribute variables
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

// Getting question
$oQuestion = Question::model()->findByPk(array('qid'=>$ia[0], 'language'=>$sSurveyLang));
Expand Down Expand Up @@ -2030,7 +2035,7 @@ function do_ranking($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if ($aQuestionAttributes['random_order']==1) {
$ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
} else {
Expand Down Expand Up @@ -2466,7 +2471,7 @@ function do_multiplechoice_withcomments($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if ($aQuestionAttributes['other_numbers_only']==1)
{
Expand Down Expand Up @@ -2652,7 +2657,7 @@ function do_file_upload($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes=getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

// Fetch question attributes
$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['fieldname'] = $ia[1];
Expand Down Expand Up @@ -2788,7 +2793,7 @@ function do_multipleshorttext($ia)
global $thissurvey;
$extraclass ="";
$answer='';
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if ($aQuestionAttributes['numbers_only']==1)
{
Expand Down Expand Up @@ -3003,7 +3008,7 @@ function do_multiplenumeric($ia)

$extraclass ="";
$checkconditionFunction = "fixnum_checkconditions";
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$answer='';
$sSeparator = getRadixPointData($thissurvey['surveyls_numberformat']);
$sSeparator = $sSeparator['separator'];
Expand Down Expand Up @@ -3290,7 +3295,7 @@ function do_numerical($ia)
$answertypeclass = "numeric";

$checkconditionFunction = "fixnum_checkconditions";
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['prefix'][$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']])!='') {
$prefix=$aQuestionAttributes['prefix'][$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']];
$extraclass .=" withprefix";
Expand Down Expand Up @@ -3397,7 +3402,7 @@ function do_shortfreetext($ia)
$sGoogleMapsAPIKey='&key='.$sGoogleMapsAPIKey;
}
$extraclass ="";
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if ($aQuestionAttributes['numbers_only']==1)
{
Expand Down Expand Up @@ -3717,7 +3722,7 @@ function do_longfreetext($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if (intval(trim($aQuestionAttributes['maximum_chars']))>0)
{
Expand Down Expand Up @@ -3796,7 +3801,7 @@ function do_hugefreetext($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if (intval(trim($aQuestionAttributes['maximum_chars']))>0)
{
Expand Down Expand Up @@ -3906,7 +3911,7 @@ function do_gender($ia)

$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

$answer = "<div class=\"answers-list radio-list\">\n"
. "\t<div class=\"col-xs-4 answer-item radio-item\">\n"
Expand Down Expand Up @@ -3964,7 +3969,7 @@ function do_array_5point($ia)
$caption=gT("An array with sub-question on each line. The answers are value from 1 to 5 and are contained in the table header. ");
$checkconditionFunction = "checkconditions";

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if (trim($aQuestionAttributes['answer_width'])!='')
{
Expand Down Expand Up @@ -4143,7 +4148,7 @@ function do_array_10point($ia)
$qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
$other = Yii::app()->db->createCommand($qquery)->queryScalar(); //Checked

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['answer_width'])!='')
{
$answerwidth=$aQuestionAttributes['answer_width'];
Expand Down Expand Up @@ -4283,7 +4288,9 @@ function do_array_yesnouncertain($ia)
$qresult = dbExecuteAssoc($qquery); //Checked
$qrow = $qresult->readAll();
$other = isset($qrow['other']) ? $qrow['other'] : '';
$aQuestionAttributes=getQuestionAttributeValues($ia[0],$ia[4]);
//// REM : This should generate a bug...
//$aQuestionAttributes=getQuestionAttributeValues($ia[0],$ia[4]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['answer_width'])!='')
{
$answerwidth=$aQuestionAttributes['answer_width'];
Expand Down Expand Up @@ -4448,7 +4455,7 @@ function do_array_increasesamedecrease($ia)

$qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
$qresult = dbExecuteAssoc($qquery); //Checked
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['answer_width'])!='')
{
$answerwidth=$aQuestionAttributes['answer_width'];
Expand Down Expand Up @@ -4615,7 +4622,7 @@ function do_array($ia)
$qquery = "SELECT other FROM {{questions}} WHERE qid={$ia[0]} AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
$other = Yii::app()->db->createCommand($qquery)->queryScalar(); //Checked

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['answer_width'])!='')
{
$answerwidth=$aQuestionAttributes['answer_width'];
Expand Down Expand Up @@ -4989,7 +4996,7 @@ function do_array_multitext($ia)
$other = Yii::app()->db->createCommand($qquery)->queryScalar(); //Checked


$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

$show_grand = $aQuestionAttributes['show_grand_total'];
$totals_class = '';
Expand Down Expand Up @@ -5371,7 +5378,7 @@ function do_array_multiflexi($ia)
$qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and parent_qid=0";
$other = Yii::app()->db->createCommand($qquery)->queryScalar(); //Checked

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
if (trim($aQuestionAttributes['multiflexible_max'])!='' && trim($aQuestionAttributes['multiflexible_min']) ==''){
$maxvalue=$aQuestionAttributes['multiflexible_max'];
$extraclass .=" maxvalue maxvalue-".trim($aQuestionAttributes['multiflexible_max']);
Expand Down Expand Up @@ -5751,7 +5758,7 @@ function do_arraycolumns($ia)
$checkconditionFunction = "checkconditions";
$caption=gT("An array with sub-question on each column. The sub-question are on table header, the answers are in each line header. ");

$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
$qquery = "SELECT other FROM {{questions}} WHERE qid=".$ia[0]." AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."'";
$other = Yii::app()->db->createCommand($qquery)->queryScalar(); //Checked

Expand Down Expand Up @@ -5913,7 +5920,7 @@ function do_array_dual($ia)
$inputnames=array();
$labelans1=array();
$labelans=array();
$aQuestionAttributes = getQuestionAttributeValues($ia[0]);
$aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);

if ($aQuestionAttributes['random_order']==1) {
$ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
Expand Down

0 comments on commit a9b6bd0

Please sign in to comment.