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

Redesgn - popravki analiz

Browse Source
This commit is contained in:
pero1203 2022-02-16 09:32:59 +01:00
parent e3534a6b62
commit ed8cf4d4cb
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -444,9 +444,9 @@ class SurveyAnalysis {
}
if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) {
/*if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) {
echo "Posodobljeno: ".date("d.m.Y, H:i:s", strtotime(self::$dataFileUpdated));
}
}*/
# krostabe naredimo
if(self::$podstran == M_ANALYSIS_CROSSTAB ) {
@ -5912,8 +5912,8 @@ class SurveyAnalysis {
echo '<div class="freq-p_holder">';
echo '<button id="freq-p_button_1_'.$spid.'" class="small active" title="'.$lang['srv_frequency'].'" onClick="show_single_percent(\''.$spid.'\', \'1\');">'.$lang['srv_frequency'].'</button>';
echo '<button id="freq-p_button_2_'.$spid.'" class="small active" title="'.$lang['srv_chart_percent'].'" onClick="show_single_percent(\''.$spid.'\', \'2\');">'.$lang['srv_chart_percent'].'</button>';
echo '<button id="freq-p_button_1_'.$spid.'" class="small left active" title="'.$lang['srv_frequency'].'" onClick="show_single_percent(\''.$spid.'\', \'1\');">'.$lang['srv_frequency'].'</button>';
echo '<button id="freq-p_button_2_'.$spid.'" class="small right active" title="'.$lang['srv_chart_percent'].'" onClick="show_single_percent(\''.$spid.'\', \'2\');">'.$lang['srv_chart_percent'].'</button>';
echo'</div>';
}
@ -7717,13 +7717,11 @@ class SurveyAnalysis {
echo '<div class="div_analiza_scale">';
if ($objectSkala->canChangeSkala()) {
echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::ORD) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::ORD].'" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::ORD.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::ORD].'</button>';
echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::NOM) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::NOM].'" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::NOM.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::NOM].'</button>';
echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::ORD) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::ORD].'" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::ORD.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::ORD].'</button>';
echo '<button class="small '.($objectSkala->is(SpremenljivkaSkala::NOM) ? 'active' : '').'" title="'.$lang['srv_skala_long_'.SpremenljivkaSkala::NOM].'" onclick="changeSpremenljivkaLestvica(\''.$spid.'\',\''.SpremenljivkaSkala::NOM.'\'); return false;">'.$lang['srv_skala_'.SpremenljivkaSkala::NOM].'</button>';
}
else {
echo '<span title="'.$lang['srv_skala_long_'.$objectSkala->getSkala()].'">';
echo $lang['srv_skala_'.$objectSkala->getSkala()];
echo '</span>';
echo '<button class="small single active" title="'.$lang['srv_skala_long_'.$objectSkala->getSkala()].'">'.$lang['srv_skala_'.$objectSkala->getSkala()].'</button>';
}
echo '</div>';

16
public/css/admin_new.css
View File

@ -16110,6 +16110,7 @@ textarea#addusers, textarea#addusers_note {
#ttestResults .div_analiza_holder .div_analiza_scale button:first-child,
#ttestResults .div_analiza_holder .freq-p_holder button:first-child {
border-radius: 2px 0px 0px 2px;
border-right: 1px #1E88E5 solid !important;
}
#div_analiza_data .div_analiza_holder .enote-navedbe_holder button:nth-child(2),
#div_analiza_data .div_analiza_holder .div_analiza_scale button:nth-child(2),
@ -16124,6 +16125,7 @@ textarea#addusers, textarea#addusers_note {
#ttestResults .div_analiza_holder .div_analiza_scale button:nth-child(2),
#ttestResults .div_analiza_holder .freq-p_holder button:nth-child(2) {
border-radius: 0px 2px 2px 0px;
border-left: 0 !important;
}
#div_analiza_data .div_analiza_holder .enote-navedbe_holder button.active, #div_analiza_data .div_analiza_holder .enote-navedbe_holder button:hover,
#div_analiza_data .div_analiza_holder .div_analiza_scale button.active,
@ -16152,6 +16154,20 @@ textarea#addusers, textarea#addusers_note {
background-color: #EAF9FE;
border-color: #1E88E5;
}
#div_analiza_data .div_analiza_holder .enote-navedbe_holder button.single,
#div_analiza_data .div_analiza_holder .div_analiza_scale button.single,
#div_analiza_data .div_analiza_holder .freq-p_holder button.single,
#div_means_data .div_analiza_holder .enote-navedbe_holder button.single,
#div_means_data .div_analiza_holder .div_analiza_scale button.single,
#div_means_data .div_analiza_holder .freq-p_holder button.single,
#div_break_data .div_analiza_holder .enote-navedbe_holder button.single,
#div_break_data .div_analiza_holder .div_analiza_scale button.single,
#div_break_data .div_analiza_holder .freq-p_holder button.single,
#ttestResults .div_analiza_holder .enote-navedbe_holder button.single,
#ttestResults .div_analiza_holder .div_analiza_scale button.single,
#ttestResults .div_analiza_holder .freq-p_holder button.single {
border-radius: 2px;
}
#div_analiza_data .div_analiza_holder .div_analiza_scale,
#div_means_data .div_analiza_holder .div_analiza_scale,
#div_break_data .div_analiza_holder .div_analiza_scale,

8
resources/sass/admin_new/pages/survey_analysis/basic.scss
View File

@ -61,10 +61,14 @@
&:first-child{
border-radius: 2px 0px 0px 2px;
border-right: 1px $blue solid !important;
}
&:nth-child(2){
border-radius: 0px 2px 2px 0px;
border-left: 0 !important;
}
&.active,
@ -74,6 +78,10 @@
background-color: $light-blue;
border-color: $blue;
}
&.single{
border-radius: 2px;
}
}
}