Skip to content

Commit

Permalink
Dev #17242: Remove unused invocations to getOwnQuestionAttributesViaP…
Browse files Browse the repository at this point in the history 
…lugin() and some QuestionBaseDataSet methods (#1852)

Co-authored-by: encuestabizdevgit <devgit@encuesta.biz>
  • Loading branch information
@gabrieljenik @encuestabizdevgit
gabrieljenik and encuestabizdevgit committed Apr 26, 2021
1 parent 50ae4b8 commit 3616000
Show file tree
Hide file tree
Showing 2 changed files with 130 additions and 261 deletions.
169 changes: 0 additions & 169 deletions application/models/QuestionBaseDataSet.php
View file
Expand Up @@ -109,173 +109,4 @@ public function getGeneralSettingsArray($iQuestionID = null, $sQuestionType = nu

return $generalOptionsFiltered;
}

/**
* Returns a preformatted block of the advanced settings for the question editor
*
* @param int $iQuestionID
* @param int $sQuestionType
* @param string $sLanguage
* @param string $sQuestionTemplate
*
* @deprecated use getPreformattedBlockOfAdvancedSettings() instead of this function
*
* @return array
* @throws CException
*/
public function getAdvancedOptions($iQuestionID = null, $sQuestionType = null, $sLanguage = null, $sQuestionTemplate = null)
{
if ($iQuestionID != null) {
$this->oQuestion = Question::model()->findByPk($iQuestionID);
} else {
$iSurveyId = App()->request->getParam('sid') ?? App()->request->getParam('surveyid'); //todo this should be done in controller ...
$this->oQuestion = $oQuestion = QuestionCreate::getInstance($iSurveyId, $sQuestionType);
}

$this->sQuestionType = $sQuestionType == null ? $this->oQuestion->type : $sQuestionType;
$this->sLanguage = $sLanguage == null ? $this->oQuestion->survey->language : $sLanguage;

$aAdvancedOptionsArray = [];
if ($iQuestionID == null) { //this is only the case if question is new and has not been saved
$userSetting = SettingsUser::getUserSettingValue('question_default_values_' . $this->oQuestion->type);
if ($userSetting !== null) {
$aAdvancedOptionsArray = (array) json_decode($userSetting);
}
}

if (empty($aAdvancedOptionsArray)) {
//this function call must be here, because $this->aQuestionAttributes is used in function below (parseFromAttributeHelper)
$this->aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($this->oQuestion->qid, $sLanguage);
if ($sQuestionTemplate === null && $this->aQuestionAttributes['question_template'] !== 'core') {
$sQuestionTemplate = $this->aQuestionAttributes['question_template'];
}
$sQuestionTemplate = $sQuestionTemplate == '' || $sQuestionTemplate == 'core' ? null : $sQuestionTemplate;

$aQuestionTypeAttributes = QuestionTheme::getQuestionThemeAttributeValues($this->sQuestionType, $sQuestionTemplate);
uasort($aQuestionTypeAttributes, 'categorySort');

foreach ($aQuestionTypeAttributes as $sAttributeName => $aQuestionAttributeArray) {
if ($sAttributeName == 'question_template') {
continue; // Avoid double displaying
}
$formElementValue = isset($this->aQuestionAttributes[$sAttributeName]) ? $this->aQuestionAttributes[$sAttributeName] : '';
$aAdvancedOptionsArray[$aQuestionAttributeArray['category']][$sAttributeName] = $this->parseFromAttributeHelper($sAttributeName, $aQuestionAttributeArray, $formElementValue);
}
}

return $aAdvancedOptionsArray;
}

/**
* Returns a preformatted block of the advanced settings for the question editor (qe).
* The advanced settings are the part at the bottom of the qe. They depend on the question type and the
* question theme.
* Result should look like:
* Display --> category
* repeat_headings --> attributename
* name
* title
* inputtpye
* formElementId
* formElementName
* formElementHelp
* formElementValue
* aFormElementOptions
* answer_width
* name
* ...
* Logic
* min_answers
* name
* ...
* @param Question|QuestionCreate $oQuestion
* @param string $sQuestionTheme
*
* @throws Exception when question type attributes are not available
* @return array
* @todo Return data-value objects instead of array
*/
public function getPreformattedBlockOfAdvancedSettings($oQuestion, $sQuestionTheme = null)
{
$advancedOptionsArray = array();
$this->oQuestion = $oQuestion;
$this->sQuestionType = $this->oQuestion->type;
$this->sLanguage = $this->oQuestion->survey->language;

// Get all attributes for advanced settings (e.g. Subquestions, Attribute, Display, Display Theme options, Logic, Other, Statistics)
if ($this->oQuestion->qid == null || $this->oQuestion->qid == 0) { //this is only the case if question is new and has not been saved
$userSetting = SettingsUser::getUserSettingValue('question_default_values_' . $this->oQuestion->type);
if ($userSetting !== null) {
$advancedOptionsArray = (array) json_decode($userSetting, true);
// TODO: Hack to set empty value. Why isn't it saved?
if (!isset($advancedOptionsArray['Display']['text_input_width']['aFormElementOptions']['options']['option'][0]['value'])) {
$advancedOptionsArray['Display']['text_input_width']['aFormElementOptions']['options']['option'][0]['value'] = '';
}
}
}

if (empty($advancedOptionsArray)) {
$questionThemeFromDB = QuestionAttribute::model()->find("qid=:qid AND attribute=:attribute", array('qid' => $this->oQuestion->qid, 'attribute' => "question_template"));
if ($sQuestionTheme === null && $questionThemeFromDB->value !== 'core') {
$sQuestionTheme = $questionThemeFromDB->value;
}
$sQuestionTheme = $sQuestionTheme == '' || $sQuestionTheme == 'core' ? null : $sQuestionTheme;

$aQuestionTypeAttributes = QuestionTheme::getQuestionThemeAttributeValues($this->sQuestionType, $sQuestionTheme);
uasort($aQuestionTypeAttributes, 'categorySort');
$questionAttributesValuesFromDB = QuestionAttribute::model()->findAll("qid=:qid", array('qid' => $this->oQuestion->qid));

foreach ($aQuestionTypeAttributes as $sAttributeName => $aQuestionAttributeArray) {
if ($sAttributeName == 'question_template') {
continue; // Avoid double displaying
}
$formElementValue = isset($questionAttributesValuesFromDB[$sAttributeName]) ? $questionAttributesValuesFromDB[$sAttributeName]->value : '';
$advancedOptionsArray[$aQuestionAttributeArray['category']][$sAttributeName] = $this->parseFromAttributeHelper($sAttributeName, $aQuestionAttributeArray, $formElementValue);
}
}
// TODO: Another hack - why is 'value' an empty array?
if (
isset($advancedOptionsArray['Display']['text_input_width']['aFormElementOptions']['options']['option'][0]['value'])
&& is_array($advancedOptionsArray['Display']['text_input_width']['aFormElementOptions']['options']['option'][0]['value'])
) {
$advancedOptionsArray['Display']['text_input_width']['aFormElementOptions']['options']['option'][0]['value'] = '';
}
return $advancedOptionsArray;
}

/**
* @param $sAttributeKey
* @param $aAttributeArray
* @param $formElementValue
* @return array
*/
protected function parseFromAttributeHelper($sAttributeKey, $aAttributeArray, $formElementValue)
{
$aAttributeArray = array_merge(QuestionAttribute::getDefaultSettings(), $aAttributeArray);
$aAdvancedAttributeArray = [
'name' => empty($aAttributeArray['name']) ? $sAttributeKey : $aAttributeArray['name'],
'title' => CHtml::decode($aAttributeArray['caption']),
'inputtype' => $aAttributeArray['inputtype'],
'formElementId' => $sAttributeKey,
'formElementName' => null,
'formElementHelp' => $aAttributeArray['help'],
'formElementValue' => $formElementValue
];
unset($aAttributeArray['caption']);
unset($aAttributeArray['help']);
unset($aAttributeArray['inputtype']);

$aFormElementOptions = $aAttributeArray;
$aFormElementOptions['classes'] = isset($aFormElementOptions['classes']) ? array_merge($aFormElementOptions['classes'], ['form-control']) : ['form-control'];

if (!is_array($aFormElementOptions['expression']) && $aFormElementOptions['expression'] == 2) {
$aFormElementOptions['inputGroup'] = [
'prefix' => '{',
'suffix' => '}',
];
}
$aAdvancedAttributeArray['aFormElementOptions'] = $aFormElementOptions;

return $aAdvancedAttributeArray;
}
}

0 comments on commit 3616000

Please sign in to comment.