Skip to content

Commit

Permalink
Dev: multiple choice with comments, views
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisGac committed Jan 26, 2016
1 parent c4c5c38 commit c387f99
Show file tree
Hide file tree
Showing 4 changed files with 165 additions and 74 deletions.
151 changes: 77 additions & 74 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -2449,24 +2449,14 @@ function do_multiplechoice($ia)
function do_multiplechoice_withcomments($ia)
{
global $thissurvey;

$inputnames= array();
if ($thissurvey['nokeyboard']=='Y')
{
includeKeypad();
$kpclass = "text-keypad";
}
else
{
$kpclass = "";
}

$kpclass = testKeypad($thissurvey['nokeyboard']); // Virtual keyboard (probably obsolete today)
$inputnames = array();
$attribute_ref=false;
$qaquery = "SELECT qid,attribute FROM {{question_attributes}} WHERE value LIKE '".strtolower($ia[2])."'";
$qaresult = Yii::app()->db->createCommand($qaquery)->query(); //Checked

$attribute_ref=false;

foreach($qaresult->readAll() as $qarow)
{
$qquery = "SELECT qid FROM {{questions}} WHERE sid=".$thissurvey['sid']." AND qid=".$qarow['qid'];
Expand All @@ -2476,9 +2466,7 @@ function do_multiplechoice_withcomments($ia)
$attribute_ref = true;
}
}

$checkconditionFunction = "checkconditions";

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

if ($aQuestionAttributes['other_numbers_only']==1)
Expand Down Expand Up @@ -2511,8 +2499,12 @@ function do_multiplechoice_withcomments($ia)
$ansresult = Yii::app()->db->createCommand($ansquery)->query(); //Checked
$anscount = count($ansresult)*2;

$answer = "<input type='hidden' name='MULTI$ia[1]' value='$anscount' />\n";
$answer_main = '';
$answer = "";
$headerDatas = array(
'name'=>'MULTI'.$ia[1],
'value'=> $anscount
);
$answer_main = Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice_with_comments/header', $headerDatas, true);

$fn = 1;
if (!isset($other)){
Expand All @@ -2527,7 +2519,6 @@ function do_multiplechoice_withcomments($ia)
$label_width = 0;
}


// Size of elements depends on longest text item
$toIterate = $ansresult->readAll();
$longest_question = 0;
Expand All @@ -2552,98 +2543,110 @@ function do_multiplechoice_withcomments($ia)
{
$myfname = $ia[1].$ansrow['title'];
$trbc='';
/* Check for array_filter */

list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $myfname, $trbc, $myfname, "li","responsive-content question-item answer-item checkbox-text-item");
/* Check for array_filter */
$sDisplayStyle = return_display_style($ia, $aQuestionAttributes, $thissurvey, $myfname);

if($label_width < strlen(trim(strip_tags($ansrow['question']))))
{
$label_width = strlen(trim(strip_tags($ansrow['question'])));
}

$myfname2 = $myfname."comment";
$startitem = "\t$htmltbody2\n";
/* Print out the checkbox */
$answer_main .= $startitem;
$answer_main .= "\t$hiddenfield\n";
$answer_main .= "<span class=\"option\">\n"
. "\t<input class=\"checkbox\" type=\"checkbox\" name=\"$myfname\" id=\"answer$myfname\" value=\"Y\"";

/* If the question has already been ticked, check the checkbox */
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
{
if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'Y')
{
$answer_main .= CHECKED;
$checked = CHECKED;
}
}
$answer_main .=" onclick='$checkconditionFunction(this.value, this.name, this.type);' />\n";


$answer_main .= "\t<label for=\"answer$myfname\" class=\"answertext col-lg-{$nbColLabelLg} col-xs-{$nbColLabelXs} \">\n"
. $ansrow['question']."</label>\n";

$answer_main .= "<input type='hidden' name='java$myfname' id='java$myfname' value='";
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
{
$answer_main .= $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
$javavalue = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
}
$answer_main .= "' />\n";
$fn++;

/////////////////////////////

$answer_main .= "</span>\n<span class=\"comment\">\n\t<label for='answer$myfname2' class=\"answer-comment hide \">".gT('Make a comment on your choice here:')."</label>\n"
."<input class='form-control text ".$kpclass."' type='text' size='40' id='answer$myfname2' name='$myfname2' value='";
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2])) {$answer_main .= htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2],ENT_QUOTES);}
$answer_main .= "' onkeyup='$checkconditionFunction(this.value,this.name,this.type);' />\n</span>\n"
. "\t</li>\n";

$fn++;
$inputnames[]=$myfname;
$inputnames[]=$myfname2;

$itemDatas = array(
'sDisplayStyle'=>$sDisplayStyle,
'kpclass'=>$kpclass,
'title'=>'',
'liclasses' => 'responsive-content question-item answer-item checkbox-text-item',
'name'=>$myfname,
'id'=>'answer'.$myfname,
'value'=>'Y', // TODO : check if it should be the same than javavalue
'classes'=>'',
'checkconditionFunction'=>$checkconditionFunction.'(this.value, this.name, this.type)',
'checkconditionFunctionComment'=>$checkconditionFunction.'(this.value, this.name, this.type)',
'labeltext'=>$ansrow['question'],
'javainput'=>true,
'javaname'=>'java'.$myfname,
'javavalue'=>$javavalue,
'checked'=>$checked,
'inputCommentId'=>'answer'.$myfname2,
'commentLabelText'=>gT('Make a comment on your choice here:'),
'inputCommentName'=>$myfname2,
'inputCOmmentValue'=>$inputCOmmentValue,
);
$answer_main = Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice_with_comments/item', $itemDatas, true);

}
if ($other == 'Y')
{
$myfname = $ia[1].'other';
$myfname2 = $myfname.'comment';
$anscount = $anscount + 2;
$answer_main .= "<li class=\"other question-item answer-item checkbox-text-item other-item\" id=\"javatbd$myfname\">";
// SPAN LABEL OPTION
$answer_main .= " <span class=\"option\">\n";
$answer_main .= " <input class=\"other ".$kpclass."\" type=\"checkbox\" name=\"$myfname\" id=\"answer$myfname\" title=\"".gT('Other').'" size="10"';
$answer_main .= " onkeyup='$oth_checkconditionFunction(this.value, this.name, this.type);'";
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])
{
$dispVal = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
if ($aQuestionAttributes['other_numbers_only']==1)
{
$dispVal = str_replace('.',$sSeparator,$dispVal);
}
$answer_main .= ' value="'.htmlspecialchars($dispVal,ENT_QUOTES).'"';
}
$fn++;
// --> START NEW FEATURE - SAVE
$answer_main .= " />";
$answer_main .= " <label for=\"answer$myfname\" class=\"answertext\">\n";
$answer_main .= $othertext;
$answer_main .= " </label>";
$answer_main .= "\n</span>\n";
// SPAN LABEL COMMENT
$answer_main .= "<span class=\"comment\">\n\t<label for=\"answer$myfname2\" class=\"answer-comment hide\">".gT('Make a comment on your choice here:')."\t</label>\n"
. '<input class="form-control text '.$kpclass.'" type="text" size="40" name="'.$myfname2.'" id="answer'.$myfname2.'"'
. " onkeyup='$checkconditionFunction(this.value,this.name,this.type);'"
. ' title="'.gT('Make a comment on your choice here:').'" value="';
// --> END NEW FEATURE - SAVE
// SPAN LABEL OPTION //////////////////////////
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])
{
$dispVal = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
if ($aQuestionAttributes['other_numbers_only']==1)
{
$dispVal = str_replace('.',$sSeparator,$dispVal);
}
$value = htmlspecialchars($dispVal,ENT_QUOTES);
}
$fn++;

if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2])) {$answer_main .= htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2],ENT_QUOTES);}
$answer_main .= "\"/>\n";
$answer_main .= "</span>\n\t</li>\n";
if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2]))
{
$inputCOmmentValue = htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2],ENT_QUOTES);
}

$itemDatas = array(
'liclasses' => 'other question-item answer-item checkbox-text-item other-item',
'liid'=>'javatbd'.$myfname,
'kpclass'=>$kpclass,
'title'=>gT('Other'),
'sDisplayStyle'=>$sDisplayStyle,
'name'=>$myfname,
'id'=>'answer'.$myfname,
'value'=>$value, // TODO : check if it should be the same than javavalue
'classes'=>'',
'checkconditionFunction'=>$oth_checkconditionFunction.'(this.value, this.name, this.type)',
'checkconditionFunctionComment'=>$checkconditionFunction.'(this.value, this.name, this.type)',
'labeltext'=>$othertext,
'inputCommentId'=>'answer'.$myfname2,
'commentLabelText'=>gT('Make a comment on your choice here:'),
'inputCommentName'=>$myfname2,
'inputCOmmentValue'=>$inputCOmmentValue,
'checked'=>$checked,
'javainput'=>false,
'javaname'=>'',
'javavalue'=>'',
);
$answer_main .= Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice_with_comments/item', $itemDatas, true);
$inputnames[]=$myfname;
$inputnames[]=$myfname2;
}
$answer .= "<ul class=\"list-unstyled subquestions-list questions-list checkbox-text-list\">\n".$answer_main."</ul>\n";

$answer_main .= Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice_with_comments/footer', array(), true);

if($aQuestionAttributes['commented_checkbox']!="allways" && $aQuestionAttributes['commented_checkbox_auto'])
{
Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."multiplechoice_withcomments.js");
Expand Down
6 changes: 6 additions & 0 deletions application/views/survey/questions/multiplechoice_with_comments/footer.php
View file
@@ -0,0 +1,6 @@
<?php
/**
* Multiple choice with comments question, footer Html
*/
?>
</ul>
9 changes: 9 additions & 0 deletions application/views/survey/questions/multiplechoice_with_comments/header.php
View file
@@ -0,0 +1,9 @@
<?php
/**
* Multiple choice with comments question, header Html
* @var $name 'MULTI'.$ia[1];
* @var $value $anscount;
*/
?>
<input type='hidden' name='<?php echo $name; ?>' value='<?php echo $value;?>' />
<ul class="list-unstyled subquestions-list questions-list checkbox-text-list">
73 changes: 73 additions & 0 deletions application/views/survey/questions/multiplechoice_with_comments/item.php
View file
@@ -0,0 +1,73 @@
<?php
/**
* Multiple choice with comments question, item Html
* @var $liclasses
* @var $liid
* @var $kpclass
* @var $title
* @var $sDisplayStyle
* @var $name $myfname
* @var $id answer$myfname
* @var $value Y
* @var $classes ''
* @var $checked ''
* @var $checkconditionFunction $checkconditionFunction(this.value, this.name, this.type);
* @var $checkconditionFunctionComment
* @var $labeltext $ansrow['question']
* @var $javaname java$myfname
* @var $javavalue ''
* @var $checked if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])) ...
* @var $inputCommentId 'answer'.$myfname2
* @var $commentLabelText gT('Make a comment on your choice here:'); ?>
* @var $inputCommentName $myfname2
* @var $inputCOmmentValue if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2])) {$answer_main .= htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname2],ENT_QUOTES);}
*/
?>
<li class='<?php echo $liclasses;?>'>
<!-- Checkbox and label -->
<span class="option col-xs-12" <?php echo $sDisplayStyle ;?> >
<span class="row">
<input
class="checkbox <?php echo $classes; echo $kpclass; ?>"
title="<?php echo $title;?>"
type="checkbox"
name="<?php echo $name; ?>"
id="<?php echo $id;?>"
value="<?php echo $value?>"
<?php echo $checked;?>
onclick="<?php echo $checkconditionFunction;?>"
/>

<label for="<?php echo $id;?>" class="answertext col-xs-11">
<?php echo $labeltext;?>
</label>

<?php if($javainput):?>
<input
type='hidden'
name='<?php echo $javaname?>'
id='<?php echo $javaname?>'
value='<?php echo $javavalue;?>'
<?php echo $checked;?>
/>
<?php endif;?>
</span>
</span>

<!-- Comment -->
<span class="comment col-xs-12" <?php echo $sDisplayStyle; ?>>
<label for='<?php echo $inputCommentId;?>' class="answer-comment hide">
<?php echo $commentLabelText;?>
</label>

<input
class='form-control text <?php echo $kpclass; ?>'
type='text'
size='40'
id='<?php echo $inputCommentId;?>'
name='<?php echo $inputCommentName; ?>'
value='<?php echo $inputCOmmentValue; ?>'
onkeyup='<?php echo $checkconditionFunctionComment;?>'
/>
</span>
</li>

0 comments on commit c387f99

Please sign in to comment.