Skip to content

Commit

Permalink
Fixed issue: Font is looking different for various question types in …
Browse files Browse the repository at this point in the history 
…statistics response filter (#2085)
  • Loading branch information
@gabrieljenik
gabrieljenik committed Mar 7, 2022
1 parent 721e1ef commit 78d9989
Show file tree
Hide file tree
Showing 19 changed files with 62 additions and 31 deletions.
39 changes: 17 additions & 22 deletions application/views/admin/export/statistics_subviews/_question.php
View file
Expand Up @@ -261,7 +261,7 @@
{echo " checked='checked'";}

echo " />";
echo '<strong>'.$oStatisticsHelper::_showSpeaker($niceqtext)."</strong>
echo $oStatisticsHelper::_showSpeaker($niceqtext)."
<div class='form-group row' style='margin-top:1em;'>
<label for='".$myfield3."' class='col-sm-4 col-form-label smalltext'>".gT("Date equals:")."</label>
Expand Down Expand Up @@ -500,7 +500,7 @@
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {echo " checked='checked'";}

echo " />&nbsp;"
.'<strong>'.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row['question'])." - # ".$flt[3]).'</strong>'
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row['question'])." - # ".$flt[3])
."</div>\n"
."\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row['title']}[]' multiple='multiple' class='form-control'>\n";

Expand Down Expand Up @@ -538,9 +538,9 @@
if (isset($summary) && array_search($myfield2, $summary)!== FALSE)
{echo " checked='checked'";}

echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row[15])." - # ".$flt[3])
."</strong>\n"
."\n"
."</div>\n"
."\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple' class='form-control'>\n"
."\t<option value='Y'";
Expand Down Expand Up @@ -585,9 +585,9 @@

if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {echo " checked='checked'";}

echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row[15])." - # ".$flt[3])
."</strong>\n"
."\n"
."</div>\n"
."\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}[]' multiple='multiple' class='form-control'>\n"
."\t<option value='I'";
Expand Down Expand Up @@ -624,9 +624,9 @@
echo " -->\n";
echo "<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {echo " checked='checked'";}
echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row['question']." [".$frow['question']."]")." - ".$row['title']."/".$frow['title'])
."</strong><br />\n";
."<br />\n";
echo "\t<span class='smalltext'>".gT("Responses containing").":</span><br />\n"
.CHtml::textField($myfield2,isset($_POST[$myfield2])?$_POST[$myfield2]:'',array('class'=>'form-control') );
echo "<hr/>";
Expand Down Expand Up @@ -683,9 +683,9 @@
if ($counter2 == 4) {echo "\t</tr>\n\t<tr>\n"; $counter2=0;}
echo "<input type='checkbox' name='summary[]' value='$myfield2'";
if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {echo " checked='checked'";}
echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row['question']." [".$frow->questionl10ns[$language]->question."]")." - ".$row['title']."/".$frow['title'])
."</strong>\n"
."\n"
."</div>\n";
echo "\t<select name='{$myfield2}[]' multiple='multiple' rows='5' cols='5' class='form-control'>\n";
for($ii=$minvalue; $ii<=$maxvalue; $ii+=$stepvalue)
Expand Down Expand Up @@ -725,10 +725,9 @@

if (isset($summary) && array_search($myfield2, $summary)!== FALSE) {echo " checked='checked'";}

echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row['question'])." - # ".$flt[3])
."</strong>
</div>\n";
."</div>\n";

/*
* when hoovering the speaker symbol we show the whole question
Expand Down Expand Up @@ -801,10 +800,9 @@
//pre-check
if (isset($summary) && array_search($myfield2, $summary) !== FALSE) {echo " checked='checked'";}

echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." ".str_replace("'", "`", $row->answerl10ns[$language]->answer)." - # ".$flt[3])
."</strong>
</div>\n"
."</div>\n"
."\t<select name='{$surveyid}X{$flt[1]}X{$flt[0]}{$i}[]' multiple='multiple' class='form-control'>\n";

//output lists of ranking items
Expand Down Expand Up @@ -880,10 +878,8 @@
}

echo " />&nbsp;"
."<strong>"
.$oStatisticsHelper::_showSpeaker($niceqtext." [".str_replace("'", "`", $row[15])."] - ".gT("Label").": ".$labeltitle)
."</strong>
</div>\n";
."</div>\n";

/* get labels
* table "labels" contains
Expand Down Expand Up @@ -951,10 +947,9 @@
$labeltitle2 = '';
}

echo " />&nbsp;<strong>"
echo " />&nbsp;"
.$oStatisticsHelper::_showSpeaker($niceqtext." [".str_replace("'", "`", $row[15])."] - ".gT("Label").": ".$labeltitle2)
."</strong>
</div>\n";
."</div>\n";
$fresult = Answer::model()->getQuestionsForStatistics('*', "qid='$flt[0]' AND language = '$language' AND scale_id = 1", 'sortorder, code');

//this is for debugging only
Expand Down
2 changes: 1 addition & 1 deletion themes/admin/Apple_Blossom/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Apple_Blossom/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}
2 changes: 1 addition & 1 deletion themes/admin/Bay_of_Many/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Bay_of_Many/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}
2 changes: 1 addition & 1 deletion themes/admin/Black_Pearl/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Black_Pearl/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}
2 changes: 1 addition & 1 deletion themes/admin/Dark_Sky/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Dark_Sky/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}
2 changes: 1 addition & 1 deletion themes/admin/Free_Magenta/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Free_Magenta/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}
2 changes: 1 addition & 1 deletion themes/admin/Noto_All_Languages/css/statistics-rtl.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions themes/admin/Noto_All_Languages/css/statistics.css
View file
Expand Up @@ -97,3 +97,7 @@ tr.info, tr.danger {
vertical-align: middle;
float: none;
}

.question-filter-container label {
font-weight: normal;
}

0 comments on commit 78d9989

Please sign in to comment.