Skip to content

Commit

Permalink
Fixed issue #11744: When add New answer...
Browse files Browse the repository at this point in the history 
assessment column doesn't showing
Dev: also fixed questions.php following phpmd's "unused"-ruleset
  • Loading branch information
@lacrioque
lacrioque committed Jan 30, 2017
1 parent bbc87ce commit ce09e30
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 53 deletions.
63 changes: 31 additions & 32 deletions application/controllers/admin/questions.php
View file
Expand Up @@ -40,11 +40,11 @@ public function view($surveyid, $gid, $qid)
//Count answer-options for this question
$qrr = Answer::model()->findAllByAttributes(array('qid' => $qid, 'language' => $baselang));

$aData['qct'] = $qct = count($qrr);
$aData['qct'] = count($qrr);

//Count sub-questions for this question
$sqrq = Question::model()->findAllByAttributes(array('parent_qid' => $qid, 'language' => $baselang));
$aData['sqct'] = $sqct = count($sqrq);
$aData['sqct'] = count($sqrq);

$qrrow = Question::model()->findByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang));
if (is_null($qrrow)) return;
Expand All @@ -68,7 +68,7 @@ public function view($surveyid, $gid, $qid)
$aData['oQuestion'] = $oQuestion;
$qrrow = $qrrow->attributes;
$aData['languagelist'] = Survey::model()->findByPk($iSurveyID)->getAllLanguages();
$aData['qtypes'] = $qtypes = getQuestionTypeList('', 'array');
$aData['qtypes'] = getQuestionTypeList('', 'array');

$qshowstyle = "";

Expand Down Expand Up @@ -101,7 +101,7 @@ public function view($surveyid, $gid, $qid)
$aData['sImageURL'] = Yii::app()->getConfig('adminimageurl');
$aData['iIconSize'] = Yii::app()->getConfig('adminthemeiconsize');
$questionsummary .= $this->getController()->renderPartial('/admin/survey/Question/questionbar_view', $aData, true);
$finaldata['display'] = $questionsummary;
//$finaldata['display'] = $questionsummary;
$aData['display']['menu_bars']['gid_action'] = 'viewquestion';
$aData['questionbar']['buttons']['view'] = true;

Expand Down Expand Up @@ -554,7 +554,7 @@ public function _editansweroptions($surveyid, $gid, $qid)
$criteria = new CDbCriteria;
$criteria->addColumnCondition(array('qid' => $qid));
$criteria->addNotInCondition('language', $anslangs);
$languageresult = Answer::model()->deleteAll($criteria);
//$languageresult = Answer::model()->deleteAll($criteria);

if (!isset($_POST['ansaction']))
{
Expand Down Expand Up @@ -596,7 +596,7 @@ public function _editansweroptions($surveyid, $gid, $qid)
$assessmentvisible = ($surveyinfo['assessments'] == 'Y' && $qtypes[$qtype]['assessable'] == 1);
$aData['assessmentvisible'] = $assessmentvisible;

$aData['activated'] = $activated = $surveyinfo['active'];
$aData['activated'] = $surveyinfo['active'];

$results = array();
foreach ($anslangs as $anslang)
Expand Down Expand Up @@ -817,7 +817,7 @@ public function _editsubquestion($surveyid, $gid, $qid)
'language' => Survey::model()->findByPk($surveyid)->language
), array('order' => 'question_order desc'));

$aData['anscount'] = $anscount = count($result);
$aData['anscount'] = count($result);
$row = $result[0]->attributes;
$aData['row'] = $row;
$maxsortorder = $row['question_order'] + 1;
Expand All @@ -839,7 +839,7 @@ public function _editsubquestion($surveyid, $gid, $qid)
$surveyinfo = array_merge($surveyinfo, $sumresult1->defaultlanguage->attributes);
$surveyinfo = array_map('flattenText', $surveyinfo);

$aData['activated'] = $activated = $surveyinfo['active'];
$aData['activated'] = $surveyinfo['active'];
$aData['surveyid'] = $surveyid;
$aData['gid'] = $gid;
$aData['qid'] = $qid;
Expand Down Expand Up @@ -904,7 +904,7 @@ public function getSubquestionRowForAllLanguages($surveyid, $gid, $qid, $codes,
*/
public function getSubquestionRowQuickAdd( $surveyid, $gid, $qid, $codes, $language, $first, $scale_id, $type, $position, $assessmentvisible='' )
{
echo $this->getSubquestionRow( $surveyid, $gid, $qid, $codes, $language, $first, $scale_id, $type, $position, $assessmentvisible='' );
echo $this->getSubquestionRow( $surveyid, $gid, $qid, $codes, $language, $first, $scale_id, $type, $position, $assessmentvisible );
}
/**
* This function should be called via ajax request
Expand Down Expand Up @@ -997,7 +997,7 @@ public function getSubquestionRow( $surveyid, $gid, $qid, $codes, $language, $fi
{
$view ='_answer_option';
$aData = array(
'assessmentvisible' => $assessmentvisible,
'assessmentvisible' => $assessmentvisible ? 1 : 0,
'assessment_value' => '',
'answer' => '',
'sortorder' => $newPosition,
Expand Down Expand Up @@ -1095,7 +1095,7 @@ public function newquestion($surveyid)

$surveyinfo = $sumresult1->attributes;
$surveyinfo = array_map('flattenText', $surveyinfo);
$aData['activated'] = $activated = $surveyinfo['active'];
$aData['activated'] = $surveyinfo['active'];

// Prepare selector Class for javascript function
if (Yii::app()->session['questionselectormode'] !== 'default') {
Expand All @@ -1111,7 +1111,6 @@ public function newquestion($surveyid)
$aData['accordionDatas']['eqrow'] = $eqrow;
$aData['ajaxDatas']['sValidateUrl']=$this->getController()->createUrl('admin/questions', array('sa' => 'ajaxValidate','surveyid'=>$surveyid));
$aData['addlanguages']=Survey::model()->findByPk($surveyid)->additionalLanguages;
$qattributes = array();

// Get the questions for this group, for position
// NB: gid won't be set if user clicks quick-button Add question
Expand Down Expand Up @@ -1192,8 +1191,8 @@ public function index($sa, $surveyid, $gid, $qid=null)
Yii::app()->loadHelper('admin/htmleditor');
Yii::app()->loadHelper('surveytranslator');

if (isset($_POST['sortorder']))
$postsortorder = sanitize_int($_POST['sortorder']);
// if (isset($_POST['sortorder']))
// $postsortorder = sanitize_int($_POST['sortorder']);

$aData['adding'] = $adding = $action == 'addquestion';
$aData['copying'] = $copying = $action == 'copyquestion';
Expand Down Expand Up @@ -1463,12 +1462,12 @@ public function delete($surveyid, $gid, $qid, $ajax=false)
// There are conditions dependent on this question
if ($cccount)
{
foreach ($ccresult as $ccr)
{
$qidarray[] = $ccr->qid;
}
if (isset($qidarray))
$qidlist = implode(", ", $qidarray);
// foreach ($ccresult as $ccr)
// {
// $qidarray[] = $ccr->qid;
// }
// if (isset($qidarray))
// $qidlist = implode(", ", $qidarray);

$sMessage =gT("Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed.");

Expand Down Expand Up @@ -1505,7 +1504,7 @@ public function delete($surveyid, $gid, $qid, $ajax=false)
Question::model()->updateQuestionOrder($gid, $surveyid);

$qid = "";
$postqid = "";
// $postqid = "";
$_GET['qid'] = "";
}

Expand Down Expand Up @@ -1716,9 +1715,9 @@ public function ajaxReloadPositionWidget($gid, $classes='')
}
}

private function getQuestionAttribute($type, $qid=0){

}
// private function getQuestionAttribute($type, $qid=0){
//
// }

/**
* This function prepares the data for the advanced question attributes view
Expand All @@ -1737,15 +1736,15 @@ public function ajaxquestionattributes()
if(!$thissurvey) die();

$aLanguages = array_merge(
array(Survey::model()->findByPk($surveyid)->language),
array(Survey::model()->findByPk($surveyid)->language),
Survey::model()->findByPk($surveyid)->additionalLanguages
);
$aAttributesWithValues = Question::model()->getAdvancedSettingsWithValues($qid, $type, $surveyid);

uasort($aAttributesWithValues, 'categorySort');

$aAttributesPrepared = array();
foreach ($aAttributesWithValues as $iKey => $aAttribute)
foreach ($aAttributesWithValues as $aAttribute)
{
if ($aAttribute['i18n'] == false)
$aAttributesPrepared[] = $aAttribute;
Expand All @@ -1770,7 +1769,7 @@ public function ajaxquestionattributes()
}
$aData['bIsActive'] = ($thissurvey['active']=='Y');
$aData['attributedata'] = $aAttributesPrepared;

$this->getController()->renderPartial('/admin/survey/Question/advanced_settings_view', $aData);
}

Expand Down Expand Up @@ -1952,18 +1951,18 @@ public function preview($surveyid, $qid, $lang = null)
$answers = retrieveAnswers($ia,$surveyid);

$oTemplate = Template::model()->getInstance(null, $surveyid);
$sTemplatePath = $oTemplate->path;
//$sTemplatePath = $oTemplate->path;
$thistpl = $oTemplate->viewPath;

doHeader();

$showQuestion = "$('#question$qid').show();";
//$showQuestion = "$('#question$qid').show();";

$answer = $answers[0][1];
//$answer = $answers[0][1];
// $help = $answers[0][2];

$qinfo = LimeExpressionManager::GetQuestionStatus($qid);
$help = $qinfo['info']['help'];
//$qinfo = LimeExpressionManager::GetQuestionStatus($qid);
//$help = $qinfo['info']['help'];


$question = $answers[0][0];
Expand Down
1 change: 1 addition & 0 deletions application/views/admin/survey/Question/answerOptions_view.php
View file
Expand Up @@ -239,6 +239,7 @@
id="add-input-javascript-datas"
data-url="<?php echo App()->createUrl('/admin/questions/sa/getSubquestionRowForAllLanguages/');?>"
data-quickurl="<?php echo App()->createUrl('/admin/questions/sa/getSubquestionRowQuickAdd/');?>"
data-assessmentvisible="<?php echo ($assessmentvisible ? "1" : "0"); ?>"
data-errormessage="An error occured while processing the ajax request."
data-surveyid="<?php echo $surveyid;?>"
data-gid="<?php echo $gid;?>"
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.php
View file
Expand Up @@ -51,7 +51,7 @@ class="code form-control input-lg"
class='code code-title'
name='code_<?php echo $position; ?>_<?php echo $scale_id; ?>'
value="<?php echo $title; ?>"
maxlength='5'
maxlength='5'
pattern='<?php echo $sPattern; ?>'
required='required'
/>
Expand Down
47 changes: 27 additions & 20 deletions scripts/admin/answers.js
View file
Expand Up @@ -114,16 +114,20 @@ function addinputQuickEdit($currentTable, language, first, scale_id, codes)
$codes = JSON.stringify(codes);

//We build the datas for the request
datas = 'surveyid='+$elDatas.data('surveyid'),
datas += '&gid='+$elDatas.data('gid'),
datas += '&qid='+$elDatas.data('qid');
datas += '&codes='+$codes,
datas += '&scale_id='+scale_id,
datas += '&type=answer',
datas += '&position=',
datas += '&first='+first,
datas += '&language='+language+'';

datas = {
'surveyid' : $elDatas.data('surveyid'),
'gid': $elDatas.data('gid'),
'qid': $elDatas.data('qid'),
'codes': $codes,
'scale_id': scale_id,
'type' : 'answer',
'position': '',
'first': first,
'language': language+'',
'assessmentvisible' : ( $elDatas.data('assessmentvisible') == 1 )
};

console.log(datas);
// We get the HTML of the new row to insert
$.ajax({
type: "GET",
Expand Down Expand Up @@ -174,8 +178,11 @@ function addinput()
datas += '&scale_id='+$(this).data('scale-id');
datas += '&type=answer';
datas += '&position='+$(this).data('position');
datas += '&assessmentvisible'+$(this).data('assessmentvisible');
datas += '&languages='+$languages;
console.log($elDatas.data('assessmentvisible'));
if( $elDatas.data('assessmentvisible') == 1 ){
datas += '&assessmentvisible=true';
}

$scaleId = $(this).data('scale-id')
$position = $(this).data('position')
Expand Down Expand Up @@ -286,7 +293,7 @@ function updaterowproperties()
$(this).find('.btneditanswerena').attr('name','answer_'+language+'_'+rownumber+'_'+scale_id+'_popupctrlena');
$(this).find('.btneditanswerdis').attr('id','answer_'+language+'_'+rownumber+'_'+scale_id+'_popupctrldis');
$(this).find('.btneditanswerdis').attr('name','answer_'+language+'_'+rownumber+'_'+scale_id+'_popupctrldis');

rownumber++;
});

Expand Down Expand Up @@ -735,9 +742,9 @@ function quickaddlabels(scale_id, addOrReplace, table_id)
separatorchar="\t";
}

var numericSuffix = '',
n = 1,
numeric = true,
var numericSuffix = '',
n = 1,
numeric = true,
codeAlphaPart = "",
currentCharacter,
codeSigil = (codes[0] !== undefined ? codes[0].split("") : ("A01").split(""));
Expand Down Expand Up @@ -809,10 +816,10 @@ function quickaddlabels(scale_id, addOrReplace, table_id)
}

for (var x in languages)
{
{
var lang_active = languages[x];
promises.push(
addinputQuickEdit(closestTable, lang_active, (x==0), scale_id, codes)
addinputQuickEdit(closestTable, lang_active,true, scale_id, codes)
)
}

Expand All @@ -826,14 +833,14 @@ for (var x in languages)
if(htmlRowObject.find('input.code').length > 0)
{
htmlRowObject.find('input.code').val(mapObject.code);
}
else
}
else
{
htmlRowObject.find('td.code-title').text(mapObject.text);
}

htmlRowObject.find('td.subquestion-text').find('input').val(mapObject.text);

console.log(htmlRowObject);
$table.find('tbody').append(htmlRowObject);
});
});
Expand Down

0 comments on commit ce09e30

Please sign in to comment.