Skip to content

Commit

Permalink
Fixed issue #10838: Wrong decimal separator for total in "array text"
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed May 26, 2016
1 parent f5e76d7 commit 3ff1f94
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 388 deletions.
46 changes: 23 additions & 23 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -265,7 +265,7 @@ function retrieveAnswers($ia)
break;

case ';': //ARRAY (Multi Flexi) Text
$values=do_array_multitext($ia); //It's like the "5th element" movie, come to life
$values=do_array_texts($ia); //It's like the "5th element" movie, come to life
break;

case '1': //Array (Flexible Labels) dual scale
Expand Down Expand Up @@ -4808,7 +4808,7 @@ function do_array($ia)
}


function do_array_multitext($ia)
function do_array_texts($ia)
{
global $thissurvey;
$aLastMoveResult = LimeExpressionManager::GetLastMoveResult();
Expand Down Expand Up @@ -4884,47 +4884,47 @@ function do_array_multitext($ia)
{
case 'R':
$totals_class = $show_totals = 'row';
$row_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_total', array('empty'=>false), true);
$col_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>''), true);
$row_total = doRender('/survey/questions/arrays/texts/rows/cells/td_total', array('empty'=>false), true);
$col_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>''), true);

if ($show_grand == true)
{
$row_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Grand total'), 'classes'=>'answertext'), true);
$col_total = doRender('/survey/questions/arrays/multitext/columns/col_total', array('empty'=>true), true);
$grand_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_grand_total', array('empty'=>false), true);
$row_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Grand total'), 'classes'=>'answertext'), true);
$col_total = doRender('/survey/questions/arrays/texts/columns/col_total', array('empty'=>true), true);
$grand_total = doRender('/survey/questions/arrays/texts/rows/cells/td_grand_total', array('empty'=>false), true);
};

$caption .=gT("The last row shows the total for the column. ");
break;

case 'C':
$totals_class = $show_totals = 'col';
$col_total = doRender('/survey/questions/arrays/multitext/columns/col_total', array('empty'=>false, 'label'=>true), true);
$row_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>'answertext'), true);
$col_total = doRender('/survey/questions/arrays/texts/columns/col_total', array('empty'=>false, 'label'=>true), true);
$row_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>'answertext'), true);

if ($show_grand == true)
{
$row_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_total', array('empty'=>true), true);
$col_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Grand total'), 'classes'=>''), true);
$grand_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_grand_total', array('empty'=>false), true);
$row_total = doRender('/survey/questions/arrays/texts/rows/cells/td_total', array('empty'=>true), true);
$col_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Grand total'), 'classes'=>''), true);
$grand_total = doRender('/survey/questions/arrays/texts/rows/cells/td_grand_total', array('empty'=>false), true);
};
$caption .= gT("The last column shows the total for the row. ");
break;

case 'B':
$totals_class = $show_totals = 'both';
$row_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_total', array('empty'=>false), true);
$col_total = doRender('/survey/questions/arrays/multitext/columns/col_total', array('empty'=>false, 'label'=>false), true);
$col_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>''), true);
$row_head = doRender('/survey/questions/arrays/multitext/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>'answertext'), true);
$row_total = doRender('/survey/questions/arrays/texts/rows/cells/td_total', array('empty'=>false), true);
$col_total = doRender('/survey/questions/arrays/texts/columns/col_total', array('empty'=>false, 'label'=>false), true);
$col_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>''), true);
$row_head = doRender('/survey/questions/arrays/texts/rows/cells/thead', array('totalText'=>gT('Total'), 'classes'=>'answertext'), true);

if ($show_grand == true)
{
$grand_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_grand_total', array('empty'=>false), true);
$grand_total = doRender('/survey/questions/arrays/texts/rows/cells/td_grand_total', array('empty'=>false), true);
}
else
{
$grand_total = doRender('/survey/questions/arrays/multitext/rows/cells/td_grand_total', array('empty'=>true), true);
$grand_total = doRender('/survey/questions/arrays/texts/rows/cells/td_grand_total', array('empty'=>true), true);
};

$caption .= gT("The last row shows the total for the column and the last column shows the total for the row. ");
Expand Down Expand Up @@ -5024,7 +5024,7 @@ function do_array_multitext($ia)
if ( ($anscount - $fn + 1) >= $minrepeatheadings )
{
// Close actual body and open another one
$sRows .= doRender('/survey/questions/arrays/multitext/rows/repeat_header', array(
$sRows .= doRender('/survey/questions/arrays/texts/rows/repeat_header', array(
'answerwidth' => $answerwidth,
'labelans' => $labelans,
'right_exists' => $right_exists,
Expand Down Expand Up @@ -5079,7 +5079,7 @@ function do_array_multitext($ia)

$inputnames[] =$myfname2;
$value = str_replace ('"', "'", str_replace('\\', '', $myfname2value));
$answer_tds .= doRender('/survey/questions/arrays/multitext/rows/cells/answer_td', array(
$answer_tds .= doRender('/survey/questions/arrays/texts/rows/cells/answer_td', array(
'ld' => $ld,
'myfname2' => $myfname2,
'labelText' => $labelans[$thiskey],
Expand All @@ -5106,7 +5106,7 @@ function do_array_multitext($ia)

$formatedRowTotal = str_replace(array('[[ROW_NAME]]','[[INPUT_WIDTH]]') , array(strip_tags($answertext),$inputwidth) , $row_total);

$sRows .= doRender('/survey/questions/arrays/multitext/rows/answer_row', array(
$sRows .= doRender('/survey/questions/arrays/texts/rows/answer_row', array(
'myfname' => $myfname,
'answertext' => $answertext,
'error' => $error,
Expand Down Expand Up @@ -5151,7 +5151,7 @@ function do_array_multitext($ia)
Yii::app()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."array-totalsum.js");
}

$answer = doRender('/survey/questions/arrays/multitext/answer', array(
$answer = doRender('/survey/questions/arrays/texts/answer', array(
'answerwidth' => $answerwidth,
'col_head' => $col_head,
'cellwidth' => $cellwidth,
Expand All @@ -5174,7 +5174,7 @@ function do_array_multitext($ia)
}
else
{
$answer .= doRender('/survey/questions/arrays/multitext/empty_error', array(), true);
$answer .= doRender('/survey/questions/arrays/texts/empty_error', array(), true);
$inputnames ='';
}
return array($answer, $inputnames);
Expand Down
8 changes: 1 addition & 7 deletions ...vey/questions/arrays/multitext/answer.php → .../survey/questions/arrays/texts/answer.php
View file
Expand Up @@ -87,13 +87,7 @@
</table>
</div>

<?php if(!empty($q_table_id)): ?>
<script type="text/javascript">
<!--
new multi_set('<?php echo $q_table_id; ?>','<?php echo $radix; ?>')
// -->
</script>
<?php else: ?>
<?php if(empty($q_table_id)): ?>
<script type="text/javascript">
<!--
$('#question<?php echo $name;?> .question').delegate('input[type=text]:visible:enabled','blur keyup',function(event){
Expand Down
0 ...ns/arrays/multitext/columns/col_total.php → ...stions/arrays/texts/columns/col_total.php
View file
File renamed without changes.
0 ...uestions/arrays/multitext/empty_error.php → ...ey/questions/arrays/texts/empty_error.php
View file
File renamed without changes.
0 ...ions/arrays/multitext/rows/answer_row.php → ...uestions/arrays/texts/rows/answer_row.php
View file
File renamed without changes.
0 ...arrays/multitext/rows/cells/answer_td.php → ...ons/arrays/texts/rows/cells/answer_td.php
View file
File renamed without changes.
0 ...s/multitext/rows/cells/td_grand_total.php → ...rrays/texts/rows/cells/td_grand_total.php
View file
File renamed without changes.
0 .../arrays/multitext/rows/cells/td_total.php → ...ions/arrays/texts/rows/cells/td_total.php
View file
File renamed without changes.
0 ...ons/arrays/multitext/rows/cells/thead.php → ...estions/arrays/texts/rows/cells/thead.php
View file
File renamed without changes.
0 ...s/arrays/multitext/rows/repeat_header.php → ...tions/arrays/texts/rows/repeat_header.php
View file
File renamed without changes.

0 comments on commit 3ff1f94

Please sign in to comment.