Skip to content

Commit

Permalink
Dev: added view for list_dropdown other option.
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Mar 22, 2016
1 parent 516e852 commit 20dd6bc
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 92 deletions.
103 changes: 11 additions & 92 deletions application/helpers/qanda_helper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ function retrieveAnswers($ia)
case 'R': //RANKING STYLE
$values=do_ranking($ia);
break;
case 'M': //Multiple choice checkbox

case 'M': //Multiple choice checkbox
$values=do_multiplechoice($ia);
if (count($values[1]) > 1 && $aQuestionAttributes['hide_tip']==0)
{
Expand Down Expand Up @@ -455,7 +456,6 @@ function file_validation_message($ia)
// TMSW Validation -> EM
function mandatory_popup($ia, $notanswered=null)
{

//This sets the mandatory popup message to show if required
//Called from question.php, group.php or survey.php
if ($notanswered === null) {unset($notanswered);}
Expand Down Expand Up @@ -484,7 +484,6 @@ function mandatory_popup($ia, $notanswered=null)
// TMSW Validation -> EM
function validation_popup($ia, $notvalidated=null)
{

//This sets the validation popup message to show if required
//Called from question.php, group.php or survey.php
if ($notvalidated === null) {unset($notvalidated);}
Expand Down Expand Up @@ -655,54 +654,6 @@ function return_timer_script($aQuestionAttributes, $ia, $disable=null)
return $output;
}

/**
* This function returns the default nb-col for bootstrap, based on the length of labels
*/
function return_object_nb_cols($ansresult, $minLabelSize = 11, $minInputSize=1)
{
// We first check that $minLabelSize and $minInputSize are coherent with a 12 column grid
// We give the priority to defined label size
if (($minLabelSize + $minInputSize) > 12)
$minInputSize = 12 - $minLabelSize;

$nbColLabelLgLog=0;

// We define the same col-lg and col-xs for all labels/inputs, on the base of the bigger one.
foreach ($ansresult as $ansrow)
{
// We calculate the needed row to fully display the label
$nbCol = round(strlen($ansrow['question'])/10)+1;
$nbColLabelLg = ($nbCol > $minLabelSize)?$minLabelSize:$nbCol;

// If it's the largest one until now, we log it.
if ($nbColLabelLg > $nbColLabelLgLog)
$nbColLabelLgLog = $nbColLabelLg;

}

// We define the XS label size on the base of the LG width
$nbColLabelXs = $nbColLabelLgLog + 5;
$nbColLabelXs = ($nbColLabelXs > 11)?11:$nbColLabelXs;

// The input width is defined on the base of the label width
$nbColInputLg = 12 - $nbColLabelLgLog;
$nbColInputLg = ($nbColInputLg < 1)?12:$nbColInputLg;

$nbColInputXs = 12 - $nbColLabelXs;
$nbColInputXs = ($nbColInputXs < 1)?12:$nbColInputXs;

// We store the datas in an object before returning them
$oNbCols = new stdClass();
$oNbCols->nbColLabelXs = $nbColLabelXs;
$oNbCols->nbColLabelLg = $nbColLabelLgLog;
$oNbCols->nbColInputXs = $nbColInputXs;

$oNbCols->nbColInputLg = $nbColInputLg;


return $oNbCols;
}

function return_display_style($ia, $aQuestionAttributes, $thissurvey, $rowname)
{
$htmltbody2 = '';
Expand Down Expand Up @@ -1461,51 +1412,19 @@ function do_list_dropdown($ia)

if (isset($other) && $other=='Y')
{
$answer .= "\n<script type=\"text/javascript\">\n"
."<!--\n"
."function showhideother(name, value)\n"
."\t{\n"
."\tvar hiddenothername='othertext'+name;\n"
."\tif (value == \"-oth-\")\n"
."{\n"
."document.getElementById(hiddenothername).style.display='';\n"
."document.getElementById(hiddenothername).focus();\n"
."}\n"
."\telse\n"
."{\n"
."document.getElementById(hiddenothername).style.display='none';\n"
."document.getElementById(hiddenothername).value='';\n" // reset othercomment field
."}\n"
."\t}\n"
."//--></script>\n";
$answer .= '<br/>';
$answer .= ' <input class="form-control" type="text" id="othertext'.$ia[1].'" name="'.$ia[1].'other" style="display:';

$inputnames[]=$ia[1].'other';

if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] != '-oth-')
{
$answer .= 'none';
}

// // --> START BUG FIX - text field for other was not repopulating when returning to page via << PREV
$answer .= '"';
// $thisfieldname=$ia[1].'other';
// if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname])) { $answer .= ' value="'.htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES).'" ';}
// // --> END BUG FIX

// --> START NEW FEATURE - SAVE
$answer .= " alt='".gT('Other answer')."' onchange='$checkconditionFunction(this.value, this.name, this.type);'";
$aData = array();
$aData['name']= $ia[1];
$aData['checkconditionFunction']=$checkconditionFunction;
$aData['display'] = ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] != '-oth-')?'display: none;':'';
$thisfieldname="$ia[1]other";
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname])) { $answer .= " value='".htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES)."' ";}
$answer .= ' />';
$answer .= "</p>";
// --> END NEW FEATURE - SAVE
$inputnames[]=$ia[1]."other";
}
$aData['value'] = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname]))?htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES):'';

$answer .= Yii::app()->getController()->renderPartial('/survey/questions/list_dropdown/othertext', $aData, true);

$inputnames[]=$ia[1].'other';

// TODO: check if needed : $answer .= "</p>";
}

$inputnames[]=$ia[1];

Expand Down
39 changes: 39 additions & 0 deletions application/views/survey/questions/list_dropdown/othertext.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php
/**
* List DropDown, Other Option
*
* @var $name $ia[1]
* @var $display
* @var $value
* @var $checkconditionFunction
*/
?>
<script type="text/javascript">
<!--
function showhideother(name, value)
{
var hiddenothername='othertext'+name;
if (value == "-oth-")
{
document.getElementById(hiddenothername).style.display='';
document.getElementById(hiddenothername).focus();
}
else
{
document.getElementById(hiddenothername).style.display='none';
document.getElementById(hiddenothername).value='' // reset othercomment fiel
}
}
-->
</script>

<input
class="form-control"
type="text"
id="othertext<?php echo $name; ?>"
name="<?php echo $name; ?>other"
style='<?php echo $display; ?>'
value='<?php echo $value?>'
alt='<?php eT('Other answer'); ?>'
onchange='<?php echo $checkconditionFunction;?>(this.value, this.name, this.type);'
/>

0 comments on commit 20dd6bc

Please sign in to comment.