may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - analiza tabele - popravki

Browse Source
This commit is contained in:
pero1203 2022-02-16 10:42:37 +01:00
parent 9f0388ea20
commit 4d6715e390
5 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php
View File

@ -391,20 +391,42 @@ class SurveyCrosstabs {
$resultIsCheckbox = $this->DisplayDropdows(); $resultIsCheckbox = $this->DisplayDropdows();
echo '</div>'; echo '</div>';
// Nastavitve // Nastavitve
echo '<div id="crosstab_settings">' ; echo '<div id="crosstab_settings" class="crosstab_settings">';
echo ' <div class="setting_line">';
echo $lang['srv_analiza_crosstab_table_settings'].':';
echo ' </div>';
$this->displayLinePercent(); $this->displayLinePercent();
$this->displayResidual(); $this->displayResidual();
$this->displayShowChart(); $this->displayShowChart();
echo '</div>';
// Nastavitve 2
if ( $resultIsCheckbox['is_check']) { if ( $resultIsCheckbox['is_check']) {
echo '<div id="crossNavedbeVsENote" class="setting_line">';
echo '<input type="radio" name="crossNavVsEno" id="crossNavVsEno0" vlaue="0" '.($this->crossNavVsEno == 0 ? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. echo '<div id="crosstab_settings_2" class="crosstab_settings">';
'<label for="crossNavVsEno0">'.$lang['srv_analiza_crosstab_navedbe'].'</label>';
echo '<input type="radio" name="crossNavVsEno" id="crossNavVsEno1" vlaue="1" '.($this->crossNavVsEno == 1? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. echo ' <div class="setting_line">';
'<label for="crossNavVsEno1">'.$lang['srv_analiza_crosstab_enote'].'</label>'; echo $lang['srv_analiza_crosstab_answer_settings'].':';
echo '</div>'; echo ' </div>';
echo ' <div class="setting_line">';
echo ' <input type="radio" name="crossNavVsEno" id="crossNavVsEno0" vlaue="0" '.($this->crossNavVsEno == 0 ? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">';
echo ' <label for="crossNavVsEno0">'.$lang['srv_analiza_crosstab_navedbe'].'</label>';
echo ' </div>';
echo ' <div class="setting_line">';
echo ' <input type="radio" name="crossNavVsEno" id="crossNavVsEno1" vlaue="1" '.($this->crossNavVsEno == 1? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">';
echo ' <label for="crossNavVsEno1">'.$lang['srv_analiza_crosstab_enote'].'</label>';
echo ' </div>';
echo '</div>';
} }
echo '</div>';
echo '</div>'; echo '</div>';
@ -690,12 +712,10 @@ class SurveyCrosstabs {
echo '<span class="title">'.$lang['srv_analiza_crosstab_residuals'].' '.Help::display('srv_crosstab_residual2').':</span>'; echo '<span class="title">'.$lang['srv_analiza_crosstab_residuals'].' '.Help::display('srv_crosstab_residual2').':</span>';
echo '<div class="trak">'; echo '<div class="trak">';
echo ' <div class="minus"></div>';
echo ' <div class="crossCheck_EC" title="'.$lang['srv_analiza_crosstab_expected_count'].'"></div>'; echo ' <div class="crossCheck_EC" title="'.$lang['srv_analiza_crosstab_expected_count'].'"></div>';
echo ' <div class="crossCheck_RE" title="'.$lang['srv_analiza_crosstab_residual'].'"></div>'; echo ' <div class="crossCheck_RE" title="'.$lang['srv_analiza_crosstab_residual'].'"></div>';
echo ' <div class="crossCheck_SR" title="'.$lang['srv_analiza_crosstab_stnd_residual'].'"></div>'; echo ' <div class="crossCheck_SR" title="'.$lang['srv_analiza_crosstab_stnd_residual'].'"></div>';
echo ' <div class="crossCheck_AR" title="'.$lang['srv_analiza_crosstab_adjs_residual'].'"></div>'; echo ' <div class="crossCheck_AR" title="'.$lang['srv_analiza_crosstab_adjs_residual'].'"></div>';
echo ' <div class="plus"></div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';

2
lang/1.php
View File

@ -2801,6 +2801,8 @@ $lang = array (
"srv_analiza_crosstab_average" => "Povprečje", "srv_analiza_crosstab_average" => "Povprečje",
"srv_analiza_crosstab_navedbe" => "Po navedbah", "srv_analiza_crosstab_navedbe" => "Po navedbah",
"srv_analiza_crosstab_enote" => "Po enotah", "srv_analiza_crosstab_enote" => "Po enotah",
"srv_analiza_crosstab_table_settings" => "V tabeli prikaži",
"srv_analiza_crosstab_answer_settings" => "Odgovore prikaži",
"srv_standardna_porocila" => "Standardna poro&#269;ila", "srv_standardna_porocila" => "Standardna poro&#269;ila",
"srv_rep_text" => "Tekstovno poro&#269;ilo", "srv_rep_text" => "Tekstovno poro&#269;ilo",
"srv_rep_graph" => "Grafi&#269;no poro&#269;ilo", "srv_rep_graph" => "Grafi&#269;no poro&#269;ilo",

2
lang/2.php
View File

@ -2775,6 +2775,8 @@ $lang = array (
"srv_analiza_crosstab_skupaj" => "Total", "srv_analiza_crosstab_skupaj" => "Total",
"srv_analiza_crosstab_navedbe" => "By count", "srv_analiza_crosstab_navedbe" => "By count",
"srv_analiza_crosstab_enote" => "By units", "srv_analiza_crosstab_enote" => "By units",
"srv_analiza_crosstab_table_settings" => "Show in table",
"srv_analiza_crosstab_answer_settings" => "Show answers",
"srv_standardna_porocila" => "Standard reports", "srv_standardna_porocila" => "Standard reports",
"srv_antonucci" => "Antonucci", "srv_antonucci" => "Antonucci",
"srv_design" => "Design", "srv_design" => "Design",

26
public/css/admin_new.css
View File

@ -17186,13 +17186,16 @@ iframe#ifmcontentstoprint {
#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder .faicon.gray::before { #div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder .faicon.gray::before {
color: #E5E5E5; color: #E5E5E5;
} }
#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_settings { #div_analiza_data.crosstabs .crosstab_top_holder .crosstab_settings {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_settings .setting_line { #div_analiza_data.crosstabs .crosstab_top_holder .crosstab_settings .setting_line {
margin-bottom: 6px; margin-bottom: 6px;
} }
#div_analiza_data.crosstabs .crosstab_top_holder .crosstab_settings#crosstab_settings_2 {
margin-left: 64px;
}
#div_analiza_data.crosstabs #crosstab_tables .table_holder { #div_analiza_data.crosstabs #crosstab_tables .table_holder {
margin-top: 16px; margin-top: 16px;
padding-bottom: 16px; padding-bottom: 16px;
@ -17243,17 +17246,24 @@ iframe#ifmcontentstoprint {
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend {
display: flex; display: flex;
flex-direction: column; align-items: center;
width: fit-content;
margin-top: 16px; margin-top: 16px;
padding: 8px 16px;
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
border-radius: 2px;
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line {
display: flex; display: flex;
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line:nth-child(2) { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line:nth-child(2) {
margin-top: 16px; margin-left: 32px;
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .title { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .title {
margin-right: 16px; margin-right: 8px;
font-size: 14px;
line-height: 20px;
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak {
display: flex; display: flex;
@ -17263,10 +17273,10 @@ iframe#ifmcontentstoprint {
#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak div { #div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak div {
width: 22px; width: 22px;
height: 22px; height: 22px;
font-weight: 600; font-weight: 400;
font-size: 20px; font-size: 16px;
text-align: center; text-align: center;
line-height: 18px; line-height: 20px;
} }
#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder { #div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder {
margin: 16px auto 0 auto; margin: 16px auto 0 auto;

27
resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
View File

@ -61,13 +61,17 @@
} }
} }
#crosstab_settings{ .crosstab_settings{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.setting_line{ .setting_line{
margin-bottom: 6px; margin-bottom: 6px;
} }
&#crosstab_settings_2{
margin-left: 64px;
}
} }
} }
@ -149,19 +153,28 @@
#crosstab_legend{ #crosstab_legend{
display: flex; display: flex;
flex-direction: column; align-items: center;
width: fit-content;
margin-top: 16px; margin-top: 16px;
padding: 8px 16px;
background-color: $light-gray;
border: 1px solid $gray;
border-radius: 2px;
.crosstab_legend_line{ .crosstab_legend_line{
display: flex; display: flex;
&:nth-child(2){ &:nth-child(2){
margin-top: 16px; margin-left: 32px;
} }
.title{ .title{
margin-right: 16px; margin-right: 8px;
font-size: 14px;
line-height: 20px;
} }
.trak{ .trak{
@ -173,10 +186,10 @@
width: 22px; width: 22px;
height: 22px; height: 22px;
font-weight: 600; font-weight: 400;
font-size: 20px; font-size: 16px;
text-align: center; text-align: center;
line-height: 18px; line-height: 20px;
} }
} }
} }