Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #19452: Improve usage of getQuestionAttributes PrintableSurvey #3789

Merged
merged 5 commits into from
Mar 21, 2024
Merged

Dev #19452: Improve usage of getQuestionAttributes PrintableSurvey #3789

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0436779
Dev #19452: Improve usage of getQuestionAttributes PrintableSurvey
Shnoulle Mar 12, 2024
05a9d4e
Dev: avoid multiple call of same question attributes
Shnoulle Mar 12, 2024
9eacbb8
MW-1040: Applied some fixes
Mar 13, 2024
1ed8ce7
Added a comment
Mar 13, 2024
e2c4a33
MW-1040: Fixed a typo
Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 16 additions & 7 deletions application/controllers/admin/PrintableSurvey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,20 @@ public function index($surveyid, $lang = null, $bReturn = false)

$fieldmap = createFieldMap($oSurvey, 'full', false, false, $sLanguageCode);

// For print condition text : need questionobject of some specific question
$criteria = new CDBCriteria();
$criteria->select = ['cqid'];
$criteria->with = ['questions'];
$criteria->compare('questions.sid', $surveyid);
$neededTypes = [QuestionType::QT_1_ARRAY_DUAL];
$criteria->addInCondition('questions.type', $neededTypes);
$oConditions = Condition::model()->with('questions')->findAll($criteria);
// We need only the question attributes
/* array[] Needed question attributes for condition question */
$conditionQuestionsAttributes = [];
foreach ($oConditions as $oCondition) {
$conditionQuestionsAttributes[$oCondition->cqid] = QuestionAttribute::model()->getQuestionAttributes($oCondition->questions);
}
// =========================================================
// START doin the business:
foreach ($arGroups as $arQuestionGroup) {
Expand Down Expand Up @@ -171,9 +185,7 @@ public function index($surveyid, $lang = null, $bReturn = false)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// START doing questions

$qidattributes = QuestionAttribute::model()->getQuestionAttributes($arQuestion['qid']);


$qidattributes = QuestionAttribute::model()->getQuestionAttributes($arQuestion);
if ($qidattributes['hidden'] == 1 && $arQuestion['type'] != Question::QT_ASTERISK_EQUATION) {
continue;
}
Expand All @@ -184,8 +196,6 @@ public function index($surveyid, $lang = null, $bReturn = false)
$sExplanation = ''; //reset conditions explanation
$s = 0;
// TMSW Condition->Relevance: show relevance instead of this whole section to create $explanation


$scenarioresult = Condition::model()->getScenarios($arQuestion['qid']);
$scenarioresult = $scenarioresult->readAll();
//Loop through distinct scenarios, thus grouping them together.
Expand Down Expand Up @@ -260,7 +270,6 @@ public function index($surveyid, $lang = null, $bReturn = false)
}

$conresult = Condition::model()->getConditionsQuestions($distinctrow['cqid'], $arQuestion['qid'], $scenariorow['scenario'], $sLanguageCode);

$conditions = array();
foreach ($conresult->readAll() as $conrow) {
$value = $conrow['value'];
Expand Down Expand Up @@ -389,7 +398,7 @@ public function index($surveyid, $lang = null, $bReturn = false)
$thiscquestion = $fieldmap[$conrow['cfieldname']];
$condition = "parent_qid='{$conrow['cqid']}' AND title='{$thiscquestion['aid']}'";
$ansresult = Question::model()->findAll(['condition' => $condition, 'order' => 'question_order']);
$cqidattributes = QuestionAttribute::model()->getQuestionAttributes($conrow['cqid']);
$cqidattributes = $conditionQuestionsAttributes[$conrow['cqid']];
if ($labelIndex == 0) {
if (trim((string) $cqidattributes['dualscale_headerA'][$sLanguageCode]) != '') {
$header = gT($cqidattributes['dualscale_headerA'][$sLanguageCode]);
Expand Down