';
- }
+
+ echo '
'.$lang['srv_statistic_menu'].' '.Help::display('srv_menu_statistic').'';
+
+ echo '
';
+
if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')) {
echo '
';
-
- } else {
+ }
+ else {
echo '
';
- echo '
';
}
static function outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) {
@@ -1190,6 +1189,7 @@ class SurveyAnalysis {
echo '
| ';
echo '';
}
+
static function outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) {
global $lang;
# opcije
@@ -1266,21 +1266,22 @@ class SurveyAnalysis {
*/
static function displaySums($_spid = null) {
global $site_path;
- # preberemo header
+
+ # preberemo header
if (self::$headFileName === null ) {
// die ('
');
- } else {
+ }
+ else {
#preberemo HEADERS iz datoteke
if (self::$headFileName == null) {
echo "
Napaka";
die();
}
+
self::$_HEADERS = unserialize(file_get_contents(self::$headFileName));
# odstranimo sistemske variable tipa email, ime, priimek, geslo
self::removeSystemVariables();
- #print_r("
");
- #print_r(self::$_HEADERS);
- #print_r("");
+
# polovimo frekvence
self::getFrequencys();
$vars_count = count(self::$_FILTRED_VARIABLES);
@@ -1300,7 +1301,6 @@ class SurveyAnalysis {
if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) )
{
echo $line_break;
- #print_r($spremenljivka['tip']);
# prikazujemo v odvisnosti od kategorije spremenljivke
switch ($spremenljivka['tip']) {
@@ -1581,12 +1581,15 @@ class SurveyAnalysis {
# tekst vprašanja
echo '
';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
+
#odgovori
$show_valid_percent = (self::$_HEADERS[$spid]['show_valid_percent'] == true) ? 1 : 0;
echo ''.$spremenljivka['naslov'].'';
@@ -1606,7 +1609,10 @@ class SurveyAnalysis {
}
echo ' | ';
echo '
';
- echo '';
+
+
+ echo '
';
+
#variabla
echo '| ';
@@ -1625,12 +1631,15 @@ class SurveyAnalysis {
echo ' | '. $lang['srv_analiza_frekvence_titleVeljavni'] .' | ';
}
echo ''. $lang['srv_analiza_frekvence_titleKumulativa'] .' | ';
+
echo '
';
// konec naslovne vrstice
+
+
// zeleno vrstico prikažemo samo skupaj z legendo
if (self::$_SHOW_LEGENDA && false) {
$css_bck = 'anl_bck_0_0 ';
- echo '';
+ echo '
';
echo '| | ';
echo ' | ';
@@ -1722,10 +1731,11 @@ class SurveyAnalysis {
# izpišemo še odklon in povprečje
if ($show_valid_percent == 1 && self::$_HEADERS[$spid]['skala'] != 1) {
$css_bck = 'anl_bck';
- echo '
';
- echo '| | ';
+ echo '
';
+ echo '| | ';
echo '
';
- echo '';
+
+ echo '
';
echo '| | ';
echo ''.$lang['srv_analiza_opisne_povprecje'].' | ';
echo ''. self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').' | ';
@@ -1733,7 +1743,10 @@ class SurveyAnalysis {
echo ''.self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').' | ';
echo '
';
}
+
echo '
';
+
+
# izpišemo še tekstovne odgovore za polja drugo
if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) {
foreach ($_answersOther AS $oAnswers) {
@@ -1804,8 +1817,11 @@ class SurveyAnalysis {
# odgovori
echo '
';
- echo '
';
- echo '';
+
+ echo '';
+
+ echo '';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -1814,12 +1830,14 @@ class SurveyAnalysis {
if (self::$_SHOW_LEGENDA) {
echo ' '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
';
}
- // echo ' ('.$lang['srv_analiza_opisne_answers'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo '';
echo '
';
- echo '';
+
+
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo ' | ';
@@ -1838,11 +1856,13 @@ class SurveyAnalysis {
echo '';
echo ''.$lang['srv_analiza_opisne_valid'].' | ';
echo ''.$lang['srv_analiza_num_units'].' | ';
+
echo '
';
+
$bck_css = ' anl_bck_0_0';
$_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables'];
- echo '';
+ echo '
';
echo '| | ';
echo ' | ';
if (self::$_SHOW_LEGENDA) {
@@ -1859,10 +1879,12 @@ class SurveyAnalysis {
}
}
}
- //echo '' . $lang['srv_anl_suma1'] . ' | ';
echo ''. $_valid_cnt .' | ';
echo ''.$_approp_cnt. ' | ';
+
echo '
';
+
+
foreach (self::$_HEADERS[$spid]['grids'] AS $gid => $grids) {
if ($gidsCanShow[$gid]) {
$_cnt = 0;
@@ -1925,13 +1947,18 @@ class SurveyAnalysis {
echo '';
}
}
+
echo '
';
+
echo '';
+
# navedbe
echo '';
+
echo '
';
- echo '';
+
+ echo '
';
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -1944,8 +1971,12 @@ class SurveyAnalysis {
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo '';
+
echo '
';
- echo '';
+
+
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo ' | ';
@@ -1963,11 +1994,14 @@ class SurveyAnalysis {
echo ' (f / %)';
echo ' (f / %)';
echo '';
+
echo '
';
+
$bck_css = ' anl_bck_0_0';
$_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables'];
- echo '';
+ echo '
';
+
echo '| | ';
echo ' | ';
if (self::$_SHOW_LEGENDA) {
@@ -1983,7 +2017,10 @@ class SurveyAnalysis {
}
}
echo '' . $lang['srv_anl_suma1'] . ' | ';
+
echo '
';
+
+
foreach (self::$_HEADERS[$spid]['grids'] AS $gid => $grids) {
$_cnt = 0;
# vodoravna vrstice s podatki
@@ -2043,7 +2080,9 @@ class SurveyAnalysis {
echo '';
}
}
+
echo '';
+
echo '';
echo '';
echo '| '.$_arguments.' | ';
@@ -2054,6 +2093,7 @@ class SurveyAnalysis {
echo self::formatNumber('100',SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%');
echo '';
echo ' ';
+
echo ' | ';
echo '';
}
@@ -2122,7 +2162,9 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -2132,8 +2174,12 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
';
}
echo '';
+
echo '
';
- echo '';
+
+
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
@@ -2148,11 +2194,15 @@ class SurveyAnalysis {
echo '';
echo ''.$lang['srv_analiza_opisne_valid'].' | ';
echo ''.$lang['srv_analiza_num_units'].' | ';
- echo '
';
+
+ echo '';
+
$bck_css = ' anl_bck_desc_2';
$_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables'];
- echo '';
+
+ echo '
';
+
echo '| | ';
if (self::$_SHOW_LEGENDA) {
@@ -2168,7 +2218,10 @@ class SurveyAnalysis {
}
echo ' | ';
echo ' | ';
+
echo '
';
+
+
# vodoravna vrstice s podatki
echo '';
echo '| '.$lang['srv_analiza_frekvence_titleFrekvenca'].' | ';
@@ -2201,7 +2254,7 @@ class SurveyAnalysis {
echo '
';
// dodamo še procente
- echo '';
+ echo '
';
echo '| '.$lang['srv_analiza_frekvence_titleOdstotekEnote'].' | ';
foreach ($_variables AS $vkey => $variable) {
if ($variable['other'] != true) {
@@ -2213,6 +2266,7 @@ class SurveyAnalysis {
}
echo ' | ';
echo ' | ';
+
echo '
';
echo '
';
@@ -2292,8 +2346,11 @@ class SurveyAnalysis {
self::displaySpremenljivkaIcons($spid);
echo '';
+
echo '
';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -2307,10 +2364,14 @@ class SurveyAnalysis {
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo '';
+
echo '
';
+
+
$css_txt = 'anl_variabla_line';
- echo '';
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo ' | ';
@@ -2328,8 +2389,10 @@ class SurveyAnalysis {
if ($veljavni_percent) {
echo '% - '.$lang['srv_analiza_num_units_valid'].' | ';
}
+
echo '
';
+
$cssBack = "anl_bck anl_variabla_line ";
$_max_valid = 0;
@@ -2420,10 +2483,14 @@ class SurveyAnalysis {
echo '
';
echo '
';
+
echo '
';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -2437,9 +2504,13 @@ class SurveyAnalysis {
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo ' ('.$lang['srv_analiza_opisne_units'].' / '.$lang['srv_analiza_opisne_arguments'].')';
echo '';
+
echo '
';
+
+
$css_txt = 'anl_variabla_line';
- echo '';
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo ' | ';
@@ -2451,8 +2522,10 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_frequency'].' | ';
echo '% | ';
echo '';
+
echo '
';
+
$cssBack = "anl_bck anl_variabla_line ";
if (count ($spremenljivka['grids']) > 0)
@@ -2583,7 +2656,9 @@ class SurveyAnalysis {
self::displaySpremenljivkaIcons($spid);
echo '';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -2593,10 +2668,14 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
';
}
echo '';
+
echo '
';
+
+
$css_txt = 'anl_variabla_line';
- echo '';
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
@@ -2618,11 +2697,13 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_povprecje'].' | ';
echo ''.$lang['srv_analiza_opisne_odklon'].' | ';
}
+
echo '
';
+
$cssBack = "anl_bck_0_0 ";
$_variables = $grid['variables'];
- echo '';
+ echo '
';
echo '| | ';
if ( $_sub_question_col ) {
echo ' | ';
@@ -2843,7 +2924,9 @@ class SurveyAnalysis {
self::displaySpremenljivkaIcons($spid);
echo '';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -2853,10 +2936,14 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
';
}
echo '';
+
echo '
';
+
+
$css_txt = 'anl_variabla_line';
- echo '';
+ echo '
';
+
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
@@ -2874,11 +2961,15 @@ class SurveyAnalysis {
echo '';
#št. enot
echo ' | ';
+
echo '
';
+
+
#naslovi podskupin
$cssBack = "anl_bck_0_0 ";
$_variables = $grid['variables'];
- echo '';
+ echo '
';
+
echo '| | ';
if ( $_sub_question_col ) {
echo ' | ';
@@ -2901,10 +2992,12 @@ class SurveyAnalysis {
echo '
';
+
# naslovi variabel
$cssBack = "anl_bck_0_0 ";
$_variables = $grid['variables'];
- echo '';
+ echo '
';
+
echo '| | ';
if ( $_sub_question_col ) {
echo ' | ';
@@ -2931,7 +3024,6 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_povprecje'].' | ';
echo ''.$lang['srv_analiza_opisne_odklon'].' | ';
-
if (count($spremenljivka['options']) > 0) {
foreach ( $spremenljivka['options'] as $key => $kategorija) {
// misinge imamo zdruzene
@@ -2947,6 +3039,8 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_num_units'].' | ';
echo '
';
+
+
#zloopamo skozi gride in nardimo
$_tmp_table = array();
$_part = 1;
@@ -3162,8 +3256,10 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
@@ -3181,8 +3277,12 @@ class SurveyAnalysis {
echo ' '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').' ';
}
echo ' | ';
+
echo '
';
- echo '';
+
+
+ echo '
';
+
#variabla
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
@@ -3199,12 +3299,14 @@ class SurveyAnalysis {
echo ' |
';
// konec naslovne vrstice
+
$_answersOther = array();
$_grids_count = count($spremenljivka['grids']);
if ($_grids_count > 0) {
# naslovna vrstica
$_row = $spremenljivka['grids'][0];
- echo '';
+ echo '
';
+
echo '| | ';
echo ' | ';
@@ -3226,6 +3328,8 @@ class SurveyAnalysis {
}
}
echo '
';
+
+
$_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot ';
$last = 0;
//anl_bck_desc_2 anl_bl anl_br anl_variabla_sub
@@ -3373,12 +3477,15 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
+
#odgovori
echo ''.$spremenljivka['naslov'].'';
if (self::$_SHOW_LEGENDA) {
@@ -3397,16 +3504,18 @@ class SurveyAnalysis {
echo ' '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').' ';
}
echo ' | ';
+
echo '
';
- echo '';
+
+ echo '
';
+
#variabla
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
-
if ($show_enota) {
echo '';
if ($spremenljivka['tip'] == 20 || $spremenljivka['tip'] == 7) {
@@ -3415,7 +3524,8 @@ class SurveyAnalysis {
echo $lang['srv_analiza_opisne_variable_text'];
}
echo' | ';
- } else { # če mamo number brez labele izrisujemo drugače
+ }
+ else { # če mamo number brez labele izrisujemo drugače
echo '';
echo ' ';
echo' | ';
@@ -3431,8 +3541,10 @@ class SurveyAnalysis {
echo '' . $lang['srv_analiza_opisne_odklon'].' | ';
echo '' . $lang['srv_analiza_opisne_min'] . ' | ';
echo '' . $lang['srv_analiza_opisne_max'] . ' | ';
+
echo '
';
+
$_answersOther = array();
$_grupa_cnt = 0;
if (count($spremenljivka['grids']) > 0)
@@ -3635,8 +3747,10 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
@@ -3660,15 +3774,17 @@ class SurveyAnalysis {
echo ' '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').' ';
}
echo ' | ';
+
echo '
';
- echo '';
+
+ echo '
';
+
#variabla
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
-
if ($show_enota == true) {
echo '';
if ($spremenljivka['tip'] == 20 || $spremenljivka['tip'] == 7) {
@@ -3677,7 +3793,8 @@ class SurveyAnalysis {
echo $lang['srv_analiza_opisne_variable_text'];
}
echo' | ';
- } else { # če mamo number brez labele izrisujemo drugače
+ }
+ else { # če mamo number brez labele izrisujemo drugače
echo '';
echo ' ';
echo' | ';
@@ -3696,8 +3813,10 @@ class SurveyAnalysis {
echo '' . $lang['srv_analiza_opisne_odklon'].' | ';
echo '' . $lang['srv_analiza_opisne_min'] . ' | ';
echo '' . $lang['srv_analiza_opisne_max'] . ' | ';
+
echo '
';
+
$_answersOther = array();
$_grupa_cnt = 0;
if (count($spremenljivka['grids']) > 0)
@@ -3788,27 +3907,29 @@ class SurveyAnalysis {
}
if ($spremenljivka['tip'] == 18) {
$css_back = 'anl_bck_text_1 anl_bt';
- echo '';
+ echo '
';
echo '| ';
echo $lang['srv_anl_suma1'];
echo ' | ';
- echo ' | ';
+ echo ' | ';
- if (self::$_SHOW_LEGENDA && $inline_legenda){
- echo ' | ';
- echo ' | ';
- }
- echo ' | ';
- echo ' | ';
- echo '';
- echo self::formatNumber($sum_avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),'');
- echo ' | ';
- # skupna suma
- echo '100% | ';
- echo ' | ';
- echo ' | ';
- echo ' | ';
- echo '
';
+ if (self::$_SHOW_LEGENDA && $inline_legenda){
+ echo ' | ';
+ echo ' | ';
+ }
+
+ echo ' | ';
+ echo ' | ';
+ echo '';
+ echo self::formatNumber($sum_avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),'');
+ echo ' | ';
+
+ # skupna suma
+ echo '100% | ';
+ echo ' | ';
+ echo ' | ';
+ echo ' | ';
+ echo '';
}
echo '
';
@@ -3844,7 +3965,9 @@ class SurveyAnalysis {
self::displaySpremenljivkaIcons($spid);
echo '';
- echo '';
+
+ echo '
';
+
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
@@ -3853,7 +3976,9 @@ class SurveyAnalysis {
echo ''.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
';
}
echo '';
+
echo '
';
+
echo '
';
if (self :: $show_spid_div == true) {
@@ -3921,8 +4046,10 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
@@ -3941,25 +4068,31 @@ class SurveyAnalysis {
}
echo ' | ';
echo '
';
- echo '';
+
+
+ echo '
';
+
#variabla
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
- #odgovori
+
+ #odgovori
+ if(!$lokacija)
+ echo ''.$lang['srv_analiza_opisne_subquestion'] . ' | ';
- if(!$lokacija)
- echo ''.$lang['srv_analiza_opisne_subquestion'] . ' | ';
if (self::$_SHOW_LEGENDA){
echo ''.$lang['srv_analiza_opisne_variable_expression'].' | ';
echo ''.$lang['srv_analiza_opisne_variable_skala'].' | ';
}
- if(!$lokacija){
- echo ''. $lang['srv_analiza_opisne_arguments'] .' | ';
- echo '
';
- }
+
+ if(!$lokacija){
+ echo ''. $lang['srv_analiza_opisne_arguments'] .' | ';
+ echo '';
+ }
// konec naslovne vrstice
+
$_answersOther = array();
$_grids_count = count($spremenljivka['grids']);
if ($_grids_count > 0) {
@@ -4252,12 +4385,15 @@ class SurveyAnalysis {
# tekst vprašanja
echo '';
+
# naslovna vrstica
- echo '';
+ echo '
';
+
#variabla
echo '| ';
echo self::showVariable($spid, $spremenljivka['variable']);
echo ' | ';
+
#odgovori
echo ''.$spremenljivka['naslov'].'';
if (self::$_SHOW_LEGENDA) {
@@ -4276,14 +4412,18 @@ class SurveyAnalysis {
echo ' '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').' ';
}
echo ' | ';
+
echo '
';
- echo '';
+
+
+ echo '
';
+
#variabla
echo '| ';
self::showIcons($spid,$spremenljivka,$_from);
echo ' | ';
- #odgovori
-
+
+ #odgovori
echo ''.$lang['srv_analiza_frekvence_titleAnswers'] . ' | ';
if (self::$_SHOW_LEGENDA && $inline_legenda){
echo ''.$lang['srv_analiza_opisne_variable_expression'].' | ';
@@ -4295,7 +4435,10 @@ class SurveyAnalysis {
echo ''. $lang['srv_analiza_frekvence_titleVeljavni'] .' | ';
}
echo ''. $lang['srv_analiza_frekvence_titleKumulativa'] .' | ';
+
echo '
';
+
+
// konec naslovne vrstice
$_answersOther = array();
$_grids_count = count($spremenljivka['grids']);
@@ -4767,23 +4910,11 @@ class SurveyAnalysis {
echo ' | ';
}
- //Veljavni - Skupaj
+ // Veljavni - Skupaj
echo '';
echo $validHeatmapRegion;
- //echo self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['validCnt'] : 0;
echo ' | ';
-
-/* $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0
- ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt']
- : 0;
- echo '' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ' | ';
- if (self::$_HEADERS[$spid]['show_valid_percent'] == true) {
- echo '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ' | ';
- }
- echo ' | '; */
- echo '';
- // $counter++;
return $counter;
}
@@ -4894,25 +5025,11 @@ class SurveyAnalysis {
echo ' | ';
}
- //Mankajoci - Skupaj
+ // Mankajoci - Skupaj
echo '';
- echo $manjkajoci;
- //$answer['cnt'] = self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0;
- //echo (int)$answer['cnt'];
+ echo $manjkajoci;
echo ' | ';
- //stolpec "Veljavni kliki"
-/* echo '';
- echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%');
- echo ' | ';
- */
-
-/* if (self::$_HEADERS[$spid]['show_valid_percent']) {
- echo '';
- echo ' ';
- echo ' | ';
- } */
-
echo ' | ';
echo '';
$counter++;
@@ -4942,8 +5059,6 @@ class SurveyAnalysis {
}
echo '';
- //echo '| | '; // $lang['srv_anl_appropriate']
- //echo ''.$lang['srv_anl_suma2'].' | ';
echo ''.$lang['srv_anl_suma2'].' | ';
echo ' | ';
@@ -4952,18 +5067,10 @@ class SurveyAnalysis {
echo ' | ';
}
- //SKUPAJ
+ // SKUPAJ
echo '' .$ustrezniHeatmapRegion. ' | ';
-
- //echo '' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . ' | ';
-
- //echo '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ' | ';
- /*if (self::$_HEADERS[$spid]['show_valid_percent']) {
- echo ' | ';
- } */
- //echo ' | ';
- echo '
';
+ echo '';
}
/** izpišemo tabelo z tekstovnimi odgovori drugo
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f62f64c18..a4fd379fd 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9916,9 +9916,6 @@ header #top_line .tooltip.monitor {
cursor: pointer;
}
-header {
- /* sub settings (under second navigation) */
-}
header #surveyNavigation {
height: 58px;
background-color: #1E88E5;
@@ -10021,7 +10018,7 @@ header #secondNavigation .separator {
width: 1px;
height: 25px;
margin: 0 16px;
- border-left: 1px #808080 solid;
+ border-left: 1px #E5E5E5 solid;
}
header #secondNavigation ul.secondNavigation,
header #secondNavigation ul.secondNavigationArchive {
@@ -10047,7 +10044,7 @@ header #secondNavigation ul.secondNavigationArchive li a {
padding: 12px 32px;
line-height: 41px;
font-size: 15px;
- color: #808080;
+ color: #C4C4C4;
text-decoration: none;
}
header #secondNavigation ul.secondNavigation li.active, header #secondNavigation ul.secondNavigation li:hover,
@@ -10075,67 +10072,136 @@ header #secondNavigation #secondNavigation_links a span::before {
header #topSettingsHolder {
display: flex;
align-items: center;
+ justify-content: space-between;
box-sizing: border-box;
+ padding: 0 32px;
width: 100%;
- height: 41px;
- color: #1E88E5;
+ height: 44px;
+ color: #333333;
+ font-size: 14px;
+ line-height: 18px;
border-bottom: 1px #E5E5E5 solid;
}
header #topSettingsHolder .borderLeft {
padding-left: 20px;
border-left: 1px dotted #E5E5E5;
}
-header #topSettingsHolder #additional_navigation {
- position: relative;
- width: auto;
- margin: 9px 0px 0 0;
- background: 0;
+header #topSettingsHolder .left_options_holder {
+ display: flex;
}
-header #topSettingsHolder #additional_navigation a span {
- padding: 2px 50px 2px 0;
- font-size: 12px;
- font-weight: 500;
+header #topSettingsHolder .left_options_holder #additional_navigation {
+ position: relative;
+ display: flex;
+ align-items: center;
+}
+header #topSettingsHolder .left_options_holder #additional_navigation span {
+ margin-right: 32px;
+}
+header #topSettingsHolder .left_options_holder #additional_navigation span a {
+ font-size: 14px;
+ line-height: 18px;
+ color: #C4C4C4;
+ text-decoration: none;
+}
+header #topSettingsHolder .left_options_holder #additional_navigation span a.help {
color: #1E88E5;
}
-header #topSettingsHolder #additional_navigation a span.active {
- color: #FFC700;
- background: 0;
+header #topSettingsHolder .left_options_holder #additional_navigation span.active a {
+ color: #1E88E5;
}
-header #topSettingsHolder #additional_navigation a span.faicon.arrow_back {
+header #topSettingsHolder .left_options_holder #additional_navigation span span.faicon.arrow_back {
padding: 0;
line-height: 0px;
- margin-right: 40px;
+ margin-right: 32px;
}
-header #topSettingsHolder #dataOnlyValid {
+header #topSettingsHolder .left_options_holder #dataOnlyValid {
position: relative;
- display: inline-block;
+ display: flex;
+ align-items: center;
+ height: 25px;
width: auto;
- margin: 4px 0 0;
- padding: 3px 0 4px 0;
+ padding: 0 32px;
+ border-left: 1px #E5E5E5 solid;
}
-header #topSettingsHolder #dataOnlyValid .middle {
+header #topSettingsHolder .left_options_holder #dataOnlyValid label {
+ font-size: 14px;
+ line-height: 18px;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav {
+ position: relative;
+ display: flex;
+ margin-right: 32px;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza {
+ z-index: 78;
+ width: 190px;
+ border: 1px solid #E5E5E5;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza:hover ul li.highlightLineTab {
+ background: none;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza:hover > ul li {
+ display: block !important;
+ transition: 0.2s;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul {
+ z-index: 78;
+ margin: 0;
+ padding: 0;
+ list-style-type: none;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li {
+ padding: 2px 1px;
+ background-color: #E5E5E5;
+ border: 0;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li a {
+ display: block;
+ margin-right: 12px;
+ color: #333333 !important;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li:hover > a {
+ color: #333333 !important;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li.highlightLineTab {
+ background-image: url(../../../admin/survey/icons/icons/bullet_arrow_down.png);
+ background-repeat: no-repeat;
+ background-position: right 1px;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li.highlightLineTab a span {
+ font-weight: 500;
+ color: #333333 !important;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li.previewCheck {
+ margin-top: 4px;
+ padding: 5px 0 7px 0;
+ color: #333333;
+ border-top: 1px #E5E5E5 solid;
+}
+header #topSettingsHolder .left_options_holder #analizaSubNav #globalSetingsLinks.analiza ul li.previewCheck label:hover {
+ color: #FFC700;
+}
+header #topSettingsHolder .right_options_holder {
+ display: flex;
+}
+header #topSettingsHolder .right_options_holder > div {
margin-left: 20px;
}
-header #topSettingsHolder #dataOnlyValid .middle input {
- margin: 0px 4px 1px 2px;
-}
-header #topSettingsHolder #analiza_right_options_holder {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder {
position: relative;
- float: right;
- margin: 4px 15px 0 0;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options {
display: inline;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options2 {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options2 {
display: inline;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options3 {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options3 {
float: left;
display: inline;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 {
display: none;
white-space: nowrap;
position: absolute;
@@ -10151,79 +10217,79 @@ header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_righ
background-color: #FFFFFF;
border: 1px solid #1E88E5;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul {
margin: 0px !important;
padding: 0px;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li {
display: block;
margin: 0px !important;
padding: 3px;
list-style: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link {
font-weight: 500;
color: #1E88E5 !important;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link:hover,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link:hover {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link:hover,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link:hover {
color: #FFC700 !important;
text-decoration: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link.gray,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link.gray {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link.gray,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link.gray {
font-weight: normal;
color: #1E88E5 !important;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link.gray:hover,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link.gray:hover {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li span.as_link.gray:hover,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li span.as_link.gray:hover {
color: #FFC700 !important;
text-decoration: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li span.advanced,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li span.advanced {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li span.advanced,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li span.advanced {
display: block;
font-weight: normal;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right ul li.space,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 ul li.space {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul li.space,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul li.space {
display: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right a,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 a {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right a,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 a {
color: #1E88E5 !important;
text-decoration: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right a:visited,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 a:visited {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right a:visited,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 a:visited {
color: #1E88E5 !important;
text-decoration: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right a:hover,
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 a:hover {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right a:hover,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 a:hover {
color: #FFC700 !important;
text-decoration: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2 {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 {
right: 35px;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options span#filters_span {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options span#filters_span {
color: #1E88E5;
margin-left: 4px;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options:hover span#filters_span {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options:hover span#filters_span {
color: #FFC700 !important;
}
-header #topSettingsHolder #analiza_right_options_holder #analiza_right_options2:hover span#filters_span {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #analiza_right_options2:hover span#filters_span {
color: #FFC700 !important;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right.analiza ul li.space {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right.analiza ul li.space {
display: none;
}
-header #topSettingsHolder #analiza_right_options_holder #div_analiza_filtri_right2.analiza ul li.space {
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2.analiza ul li.space {
display: none;
}
header div.breadcrumbs {
@@ -15076,356 +15142,346 @@ textarea#addusers, textarea#addusers_note {
height: 120px;
}
-/*sum vertical checkbox*/
-.anl_bck_2 {
- background-color: white;
+#div_analiza_data .div_analiza_holder {
+ margin: 32px 0 16px 0;
}
-
-.anl_bck {
- background-color: #1E88E5;
-}
-
-/*plain text*/
-.anl_tbl_inner {
- border-spacing: 0px;
- padding: 0px;
- margin: 0px;
- border-collapse: collapse;
- width: 100%;
-}
-
-.tbl_clps {
- padding: 0px !important;
- margin: 0px !important;
- border-collapse: collapse !important;
-}
-
-.anl_tbl {
- width: 100%;
- border-spacing: 0px;
- padding: 0px;
- margin: 0px;
- margin-bottom: 20px;
- border-collapse: collapse;
-}
-.anl_tbl th {
- padding: 6px;
-}
-.anl_tbl td {
- padding: 6px;
-}
-
-.cll_clps {
- padding: 0px !important;
- margin: 0px !important;
- border-collapse: collapse !important;
-}
-
-.anl_bck_0_0 {
- background-color: #E5E5E5;
-}
-
-.anl_bck_0_1 {
- background-color: white;
-}
-
-.anl_bck_1_0 {
- background-color: white;
-}
-
-.anl_bck_1_1 {
- background-color: white;
-}
-
-.anl_bck_2_1 {
- background-color: white;
-}
-
-.anl_bck_2_0 {
- background-color: #f9f9f7;
-}
-
-.anl_bck_text_0 {
- background-color: #FFFFE3;
-}
-
-.anl_bck_text_1 {
- background-color: #FFFFF0;
-}
-
-.anl_bck_desc_1 {
- background-color: #EAF9FE;
-}
-
-.anl_bck_desc_2 {
- background-color: white;
-}
-
-.anl_bck_desc_3 {
- background-color: #FFFFE3;
-}
-
-.anl_bck_freq_1 {
- background-color: #EAF9FE;
-}
-
-.anl_bck_freq_2 {
- background-color: white;
-}
-
-.anl_tin {
- text-indent: 8px;
-}
-
-.anl_tin1 {
- text-indent: 16px;
-}
-
-.anl_tin2 {
- text-indent: 24px;
-}
-
-.anl_variabla {
- font-weight: bold;
- color: #1E88E5;
-}
-.anl_variabla a {
- font-weight: bold;
- color: #1E88E5;
- cursor: pointer;
-}
-
-.anl_variabla_sub {
- color: #1E88E5;
-}
-
-.anl_variabla_label {
- color: #1E88E5;
- color: black;
-}
-
-.anl_variabla_info {
- color: #E5E5E5;
- font-size: 10px;
-}
-
-.anl_variabla_line {
- color: #E5E5E5;
-}
-
-.anl_ita {
- font-style: italic;
-}
-
-.anl_detail_percent {
- color: #FF0000;
- width: 70px;
- text-align: right;
- font-weight: normal;
-}
-.anl_detail_percent a {
- color: #FF0000;
- width: 70px;
- text-align: right;
- font-weight: normal;
-}
-
-.anl_detail_cnt {
- color: silver;
-}
-
-.anl_ac {
- text-align: center;
-}
-
-.anl_al {
- text-align: left;
-}
-
-.anl_ar {
- border: 1px solid #EAF9FE;
- text-align: right;
-}
-
-.anl_ba {
- border: 1px solid #EAF9FE;
-}
-
-.anl_bl {
- border-left: 1px solid #EAF9FE;
-}
-
-.anl_br {
- border-right: 1px solid #EAF9FE;
-}
-
-.anl_bt {
- border-top: 1px solid #EAF9FE;
-}
-
-.anl_bb {
- border-bottom: 1px solid #EAF9FE;
-}
-
-.anl_red_ba {
- border: 1px solid #FF0000;
-}
-
-.anl_dash_bl {
- border-left: 1px dashed silver;
-}
-
-.anl_dash_br {
- border-right: 1px dashed silver;
-}
-
-.anl_dash_bt {
- border-top: 1px dashed silver;
-}
-
-.anl_dash_bb {
- border-bottom: 1px dashed silver;
-}
-
-.anl_dash_red_bb {
- border-bottom: 1px dashed #red;
-}
-
-.anl_double_bt {
- border-top: 3px double #E5E5E5;
-}
-
-.anl_legenda_freq {
- font-weight: normal;
-}
-
-.anl_variable_type {
- float: right;
-}
-.anl_variable_type span {
- color: #E5E5E5;
-}
-
-.anl_str {
- font-weight: bold;
-}
-
-.anl_w15 {
- width: 15px !important;
-}
-
-.anl_w30 {
- width: 30px !important;
-}
-
-.anl_w50 {
- width: 50px !important;
-}
-
-.anl_w70 {
- width: 70px !important;
-}
-
-.anl_w90 {
- width: 90px !important;
-}
-
-.anl_w110 {
- width: 110px !important;
-}
-
-.anl_w140 {
- width: 140px !important;
-}
-
-.anl_p5 {
- padding: 5px !important;
-}
-
-.anl_p10 {
- padding: 10px !important;
-}
-
-.anl_indent {
- text-indent: 20px;
-}
-
-.anl_ba_dot {
- border: 1px dotted #E5E5E5;
-}
-
-.anl_bl_dot {
- border-left: 1px dotted #E5E5E5;
-}
-
-.anl_br_dot {
- border-right: 1px dotted #E5E5E5;
-}
-
-.anl_bt_dot {
- border-top: 1px dotted #E5E5E5;
-}
-
-.anl_bb_dot {
- border-bottom: 1px dotted #E5E5E5;
-}
-
-.anl_user_text {
- color: #B30080;
-}
-
-.anl_user_text_more {
- float: left;
- padding: 0px 5px;
- text-indent: 0px;
- color: #B30080;
-}
-
-.anl_ti_20 {
- text-indent: 20px;
-}
-
-.anl_click_missing {
- color: black;
- font-weight: normal;
- cursor: pointer;
-}
-.anl_click_missing:hover {
- color: #1E88E5;
-}
-
-.anl_click_missing_hide {
- color: black;
- font-weight: normal;
- cursor: pointer;
-}
-.anl_click_missing_hide:hover {
- color: #1E88E5;
-}
-
-.div_analiza_holder {
- margin-top: 20px;
-}
-
-.div_analiza_icons {
+#div_analiza_data .div_analiza_holder .div_analiza_icons {
+ opacity: 0;
+ filter: alpha(opacity=0);
float: left;
z-index: 75;
position: relative;
margin-top: -20px;
padding-bottom: 3px;
+}
+#div_analiza_data .div_analiza_holder .div_analiza_scale {
opacity: 0;
filter: alpha(opacity=0);
-}
-
-.div_analiza_scale {
float: right;
position: relative;
margin-top: -20px;
padding-bottom: 3px;
- opacity: 0;
- filter: alpha(opacity=0);
+}
+#div_analiza_data .div_analiza_holder table {
+ width: 100%;
+ margin: 0;
+}
+#div_analiza_data .div_analiza_holder table tr {
+ height: auto;
+}
+#div_analiza_data .div_analiza_holder table tr th,
+#div_analiza_data .div_analiza_holder table tr td {
+ box-sizing: border-box;
+ padding: 18px;
+ font-size: 14px;
+ line-height: 18px;
+ background-color: #FFFFFF;
+ border: 1px #E5E5E5 solid;
+}
+#div_analiza_data .div_analiza_holder table tr th table tr td,
+#div_analiza_data .div_analiza_holder table tr td table tr td {
+ border: 0;
+}
+#div_analiza_data .div_analiza_holder table tr th.anl_w110,
+#div_analiza_data .div_analiza_holder table tr td.anl_w110 {
+ width: 112px;
+ text-align: center;
+}
+#div_analiza_data .div_analiza_holder table tr th.cll_clps,
+#div_analiza_data .div_analiza_holder table tr td.cll_clps {
+ padding: 0;
+ line-height: 8px;
+ border: 0 !important;
+}
+#div_analiza_data .div_analiza_holder table tr.row1 th,
+#div_analiza_data .div_analiza_holder table tr.row1 td {
+ font-size: 16px;
+ font-weight: 600;
+ line-height: 20px;
+ background-color: #F8F8F8;
+}
+#div_analiza_data .div_analiza_holder table tr.row2 th,
+#div_analiza_data .div_analiza_holder table tr.row2 td {
+ font-size: 15px;
+ font-weight: 600;
+ line-height: 19px;
+ background-color: #F8F8F8;
+}
+#div_analiza_data .div_analiza_holder table tr.row3 th,
+#div_analiza_data .div_analiza_holder table tr.row3 td, #div_analiza_data .div_analiza_holder table tr.row4 th,
+#div_analiza_data .div_analiza_holder table tr.row4 td {
+ background-color: #F8F8F8;
+}
+#div_analiza_data .div_analiza_holder table tr.sum td {
+ background: rgba(255, 199, 0, 0.05);
+}
+#div_analiza_data .div_analiza_holder table tr.sum.all td {
+ background: rgba(255, 199, 0, 0.1);
+}
+#div_analiza_data .div_analiza_holder .div_other_text {
+ margin-top: 32px;
}
+/*sum vertical checkbox*/
+/*.anl_bck_2 {
+ background-color: white;
+}
+.anl_bck {
+ background-color: $blue;
+}*/
+/*plain text*/
+/*.anl_tbl_inner {
+ border-spacing: 0px;
+ padding: 0px;
+ margin: 0px;
+ border-collapse: collapse;
+ width: 100%;
+}
+.tbl_clps {
+ padding: 0px !important;
+ margin: 0px !important;
+ border-collapse: collapse !important;
+}
+.anl_tbl {
+ width: 100%;
+ border-spacing: 0px;
+ padding: 0px;
+ margin: 0px;
+ margin-bottom: 20px;
+ border-collapse: collapse;
+ th {
+ padding: 6px;
+ }
+ td {
+ padding: 6px;
+ }
+}
+.cll_clps {
+ padding: 0px !important;
+ margin: 0px !important;
+ border-collapse: collapse !important;
+}
+.anl_bck_0_0 {
+ background-color: $gray;
+}
+.anl_bck_0_1 {
+ background-color: white;
+}
+.anl_bck_1_0 {
+ background-color: white;
+}
+.anl_bck_1_1 {
+ background-color: white;
+}
+.anl_bck_2_1 {
+ background-color: white;
+}
+.anl_bck_2_0 {
+ background-color: #f9f9f7;
+}
+
+.anl_bck_text_0 {
+ background-color: #FFFFE3;
+}
+.anl_bck_text_1 {
+ background-color: #FFFFF0;
+}
+.anl_bck_desc_1 {
+ background-color: $light-blue;
+}
+.anl_bck_desc_2 {
+ background-color: white;
+}
+.anl_bck_desc_3 {
+ background-color: #FFFFE3;
+}
+.anl_bck_freq_1 {
+ background-color: $light-blue;
+}
+.anl_bck_freq_2 {
+ background-color: white;
+}
+.anl_tin {
+ text-indent: 8px;
+}
+.anl_tin1 {
+ text-indent: 16px;
+}
+.anl_tin2 {
+ text-indent: 24px;
+}
+.anl_variabla {
+ font-weight: bold;
+ color: $blue;
+ a {
+ font-weight: bold;
+ color: $blue;
+ cursor: pointer;
+ }
+}
+.anl_variabla_sub {
+ color: $blue;
+}
+.anl_variabla_label {
+ color: $blue;
+ color: black;
+}
+.anl_variabla_info {
+ color: $gray;
+ font-size: 10px;
+}
+.anl_variabla_line {
+ color: $gray;
+}
+.anl_ita {
+ font-style: italic;
+}
+.anl_detail_percent {
+ color: $red;
+ width: 70px;
+ text-align: right;
+ font-weight: normal;
+ a {
+ color: $red;
+ width: 70px;
+ text-align: right;
+ font-weight: normal;
+ }
+}
+.anl_detail_cnt {
+ color: silver;
+}
+.anl_ac {
+ text-align: center;
+}
+.anl_al {
+ text-align: left;
+}
+.anl_ar {
+ border: 1px solid $light-blue;
+ text-align: right;
+}
+.anl_ba {
+ border: 1px solid $light-blue;
+}
+.anl_bl {
+ border-left: 1px solid $light-blue;
+}
+.anl_br {
+ border-right: 1px solid $light-blue;
+}
+.anl_bt {
+ border-top: 1px solid $light-blue;
+}
+.anl_bb {
+ border-bottom: 1px solid $light-blue;
+}
+.anl_red_ba {
+ border: 1px solid $red;
+}
+.anl_dash_bl {
+ border-left: 1px dashed silver;
+}
+.anl_dash_br {
+ border-right: 1px dashed silver;
+}
+.anl_dash_bt {
+ border-top: 1px dashed silver;
+}
+.anl_dash_bb {
+ border-bottom: 1px dashed silver;
+}
+.anl_dash_red_bb {
+ border-bottom: 1px dashed #red;
+}
+.anl_double_bt {
+ border-top: 3px double $gray;
+}
+.anl_legenda_freq {
+ font-weight: normal;
+}
+.anl_variable_type {
+ span {
+ color: $gray;
+ }
+ float: right;
+}
+.anl_str {
+ font-weight: bold;
+}
+.anl_w15 {
+ width: 15px !important;
+}
+.anl_w30 {
+ width: 30px !important;
+}
+.anl_w50 {
+ width: 50px !important;
+}
+.anl_w70 {
+ width: 70px !important;
+}
+.anl_w90 {
+ width: 90px !important;
+}
+.anl_w110 {
+ width: 110px !important;
+}
+.anl_w140 {
+ width: 140px !important;
+}
+.anl_p5 {
+ padding: 5px !important;
+}
+.anl_p10 {
+ padding: 10px !important;
+}
+.anl_indent {
+ text-indent: 20px;
+}
+.anl_ba_dot {
+ border: 1px dotted $gray;
+}
+.anl_bl_dot {
+ border-left: 1px dotted $gray;
+}
+.anl_br_dot {
+ border-right: 1px dotted $gray;
+}
+.anl_bt_dot {
+ border-top: 1px dotted $gray;
+}
+.anl_bb_dot {
+ border-bottom: 1px dotted $gray;
+}
+.anl_user_text {
+ color: #B30080;
+}
+.anl_user_text_more {
+ float: left;
+ padding: 0px 5px;
+ text-indent: 0px;
+ color: #B30080;
+}
+.anl_ti_20 {
+ text-indent: 20px;
+}
+.anl_click_missing {
+ color: black;
+ font-weight: normal;
+ cursor: pointer;
+ &:hover {
+ color: $blue;
+ }
+}
+.anl_click_missing_hide {
+ color: black;
+ font-weight: normal;
+ cursor: pointer;
+ &:hover {
+ color: $blue;
+ }
+}*/
#srv_preview_analiza {
margin: 1px;
background-color: white;
diff --git a/resources/sass/admin_new/components/header/navigation.scss b/resources/sass/admin_new/components/header/navigation.scss
index befd6004d..396a5f836 100644
--- a/resources/sass/admin_new/components/header/navigation.scss
+++ b/resources/sass/admin_new/components/header/navigation.scss
@@ -148,7 +148,7 @@ header{
margin: 0 16px;
- border-left: 1px $very-dark-gray2 solid;
+ border-left: 1px $gray solid;
}
ul.secondNavigation,
@@ -177,7 +177,7 @@ header{
line-height: 41px;
font-size: 15px;
- color: $very-dark-gray2;
+ color: $dark-gray;
text-decoration: none;
}
@@ -209,16 +209,20 @@ header{
}
}
- /* sub settings (under second navigation) */
+ // 3. nivo navigacije (opcijski)
#topSettingsHolder {
display: flex;
align-items: center;
- box-sizing: border-box;
-
- width: 100%;
- height: 41px;
+ justify-content: space-between;
- color: $blue;
+ box-sizing: border-box;
+ padding: 0 32px;
+ width: 100%;
+ height: 44px;
+
+ color: $black;
+ font-size: 14px;
+ line-height: 18px;
border-bottom: 1px $gray solid;
@@ -228,183 +232,289 @@ header{
}
- #additional_navigation {
- position: relative;
-
- width: auto;
- margin: 9px 0px 0 0;
-
- background: 0;
-
- a {
- span {
- padding: 2px 50px 2px 0;
- font-size: 12px;
- font-weight: 500;
- color: $blue;
- }
+ // Leva stran (navigacija, ustrezni...)
+ .left_options_holder{
+ display: flex;
- span.active {
- color: $yellow;
- background: 0;
- }
+ // Dodatna navigacija (vpogled...)
+ #additional_navigation {
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ span{
+ margin-right: 32px;
- span.faicon.arrow_back {
- padding: 0;
- line-height: 0px;
- margin-right: 40px;
+ a{
+ font-size: 14px;
+ line-height: 18px;
+ color: $dark-gray;
+ text-decoration: none;
+
+ &.help{
+ color: $blue;
+ }
+ }
+
+ &.active {
+ a{
+ color: $blue;
+ }
+ }
+
+ span.faicon.arrow_back {
+ padding: 0;
+ line-height: 0px;
+ margin-right: 32px;
+ }
}
}
- }
-
- #dataOnlyValid {
- position: relative;
- display: inline-block;
-
- width: auto;
- margin: 4px 0 0;
- padding: 3px 0 4px 0;
-
- .middle {
- margin-left: 20px;
-
- input {
- margin: 0px 4px 1px 2px;
- }
- }
- }
-
- #analiza_right_options_holder {
- position: relative;
- float: right;
- margin: 4px 15px 0 0;
-
- #analiza_right_options {
- display: inline;
- }
-
- #analiza_right_options2 {
- display: inline;
- }
-
- #analiza_right_options3 {
- float:left;
- display: inline;
- }
-
- #div_analiza_filtri_right,
- #div_analiza_filtri_right2{
- display: none;
- white-space: nowrap;
- position: absolute;
- z-index: 78;
- top: 32px;
- right: 0;
-
+
+ // Veljavni/ustrezni
+ #dataOnlyValid {
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ height: 25px;
width: auto;
- min-height: 20px;
- height: auto;
- padding: 10px;
+ padding: 0 32px;
- text-align: left;
- font-size: 13px;
+ border-left: 1px $gray solid;
- background-color: $white;
- border: 1px solid $blue;
+ label{
+ font-size: 14px;
+ line-height: 18px;
+ }
+ }
- ul {
- margin: 0px !important;
- padding: 0px;
+ // Podnavigacija analiz
+ #analizaSubNav {
+ position: relative;
+ display: flex;
- li {
- display: block;
- margin: 0px !important;
- padding: 3px;
- list-style: none;
-
- span.as_link {
- font-weight: 500;
- color: $blue !important;
- &:hover {
- color: $yellow !important;
- text-decoration: none;
+ margin-right: 32px;
+
+ #globalSetingsLinks.analiza {
+ z-index: 78;
+ width: 190px;
+
+ border: 1px solid $gray;
+
+ &:hover {
+
+ ul {
+ li.highlightLineTab {
+ background: none;
}
}
-
- span.as_link.gray {
- font-weight: normal;
- color: $blue !important;
-
- &:hover {
- color: $yellow !important;
- text-decoration: none;
+ >ul {
+ li {
+ display: block !important;
+ transition: 0.2s;
}
}
-
- span.advanced {
- display: block;
- font-weight: normal;
- }
}
+ ul {
+ z-index: 78;
+ margin: 0;
+ padding: 0;
- li.space {
- display: none;
+ list-style-type: none;
+
+ li {
+ padding: 2px 1px;
+ background-color: $gray;
+ border: 0;
+
+ a {
+ display: block;
+ margin-right: 12px;
+ color: $black !important;
+ }
+
+ &:hover {
+ >a {
+ color: $black !important;
+ }
+ }
+ }
+ li.highlightLineTab {
+ background-image: url(../../../admin/survey/icons/icons/bullet_arrow_down.png);
+ background-repeat: no-repeat;
+ background-position: right 1px;
+
+ a {
+ span {
+ font-weight: 500;
+ color: $black !important;
+ }
+ }
+ }
+ li.previewCheck {
+ margin-top: 4px;
+ padding: 5px 0 7px 0;
+ color: $black;
+ border-top: 1px $gray solid;
+
+ label {
+ &:hover {
+ color: $yellow;
+ }
+ }
+ }
}
}
- a {
- color: $blue !important;
- text-decoration: none;
- &:visited {
+ }
+ }
+
+
+ // Desna stran (filtri...)
+ .right_options_holder{
+ display: flex;
+
+ >div{
+ margin-left: 20px;
+ }
+
+
+ &#analiza_right_options_holder {
+ position: relative;
+
+ #analiza_right_options {
+ display: inline;
+ }
+
+ #analiza_right_options2 {
+ display: inline;
+ }
+
+ #analiza_right_options3 {
+ float:left;
+ display: inline;
+ }
+
+ #div_analiza_filtri_right,
+ #div_analiza_filtri_right2{
+ display: none;
+ white-space: nowrap;
+ position: absolute;
+ z-index: 78;
+ top: 32px;
+ right: 0;
+
+ width: auto;
+ min-height: 20px;
+ height: auto;
+ padding: 10px;
+
+ text-align: left;
+ font-size: 13px;
+
+ background-color: $white;
+ border: 1px solid $blue;
+
+ ul {
+ margin: 0px !important;
+ padding: 0px;
+
+ li {
+ display: block;
+ margin: 0px !important;
+ padding: 3px;
+ list-style: none;
+
+ span.as_link {
+ font-weight: 500;
+ color: $blue !important;
+ &:hover {
+ color: $yellow !important;
+ text-decoration: none;
+ }
+ }
+
+ span.as_link.gray {
+ font-weight: normal;
+ color: $blue !important;
+
+ &:hover {
+ color: $yellow !important;
+ text-decoration: none;
+ }
+ }
+
+ span.advanced {
+ display: block;
+ font-weight: normal;
+ }
+ }
+
+ li.space {
+ display: none;
+ }
+ }
+ a {
color: $blue !important;
text-decoration: none;
+ &:visited {
+ color: $blue !important;
+ text-decoration: none;
+ }
+ &:hover {
+ color: $yellow !important;
+ text-decoration: none;
+ }
+ }
+ }
+
+ #div_analiza_filtri_right2 {
+ right: 35px;
+ }
+
+ #analiza_right_options {
+ span#filters_span {
+ color: $blue;
+ margin-left: 4px;
}
&:hover {
- color: $yellow !important;
- text-decoration: none;
+ span#filters_span {
+ color: $yellow !important;
+ }
+ }
+ }
+
+ #analiza_right_options2 {
+ &:hover {
+ span#filters_span {
+ color: $yellow !important;
+ }
+ }
+ }
+
+ #div_analiza_filtri_right.analiza {
+ ul {
+ li.space {
+ display: none;
+ }
+ }
+ }
+
+ #div_analiza_filtri_right2.analiza {
+ ul {
+ li.space {
+ display: none;
+ }
}
}
}
- #div_analiza_filtri_right2 {
- right: 35px;
- }
-
- #analiza_right_options {
- span#filters_span {
- color: $blue;
- margin-left: 4px;
- }
- &:hover {
- span#filters_span {
- color: $yellow !important;
- }
- }
- }
-
- #analiza_right_options2 {
- &:hover {
- span#filters_span {
- color: $yellow !important;
- }
- }
- }
-
- #div_analiza_filtri_right.analiza {
- ul {
- li.space {
- display: none;
- }
- }
- }
-
- #div_analiza_filtri_right2.analiza {
- ul {
- li.space {
- display: none;
- }
- }
- }
}
+
+
+
+
+
+
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss
index 74bbdecf8..acd85c858 100644
--- a/resources/sass/admin_new/pages/survey_analysis/basic.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss
@@ -1,14 +1,140 @@
+#div_analiza_data {
+
+ .div_analiza_holder {
+ margin: 32px 0 16px 0;
+
+ .div_analiza_icons {
+ opacity: 0;
+ filter: alpha(opacity=0);
+
+ float: left;
+ z-index: 75;
+ position: relative;
+ margin-top: -20px;
+ padding-bottom: 3px;
+ }
+
+ .div_analiza_scale {
+ opacity: 0;
+ filter: alpha(opacity=0);
+
+ float: right;
+ position: relative;
+ margin-top: -20px;
+ padding-bottom: 3px;
+ }
+
+ table{
+ width: 100%;
+ margin: 0;
+
+ tr{
+ height: auto;
+
+ th,
+ td{
+ box-sizing: border-box;
+ padding: 18px;
+
+ font-size: 14px;
+ line-height: 18px;
+
+ background-color: $white;
+ border: 1px $gray solid;
+
+ table tr td{
+ border: 0;
+ }
+
+ // Prvi stolpec
+ &.anl_w110{
+ width: 112px;
+
+ text-align: center;
+ }
+
+ // Razmik
+ &.cll_clps{
+ padding: 0;
+ line-height: 8px;
+ border: 0 !important;
+ }
+ }
+
+ &.row1{
+ th,
+ td{
+ font-size: 16px;
+ font-weight: 600;
+ line-height: 20px;
+
+ background-color: $light-gray;
+ }
+ }
+
+ &.row2{
+ th,
+ td{
+ font-size: 15px;
+ font-weight: 600;
+ line-height: 19px;
+
+ background-color: $light-gray;
+ }
+ }
+
+ &.row3,
+ &.row4{
+ th,
+ td{
+ background-color: $light-gray;
+ }
+ }
+
+ &.sum{
+
+ td{
+ background: rgba(255, 199, 0, 0.05);
+ }
+ }
+
+ &.sum.all{
+
+ td{
+ background: rgba(255, 199, 0, 0.1);
+ }
+ }
+ }
+
+
+ }
+
+ .div_other_text{
+ margin-top: 32px;
+ }
+ }
+
+
+
+
+
+}
+
+
+
+
+
/*sum vertical checkbox*/
-.anl_bck_2 {
+/*.anl_bck_2 {
background-color: white;
}
.anl_bck {
background-color: $blue;
-}
+}*/
/*plain text*/
-.anl_tbl_inner {
+/*.anl_tbl_inner {
border-spacing: 0px;
padding: 0px;
margin: 0px;
@@ -259,24 +385,6 @@
&:hover {
color: $blue;
}
-}
-.div_analiza_holder {
- margin-top: 20px;
-}
-.div_analiza_icons {
- float: left;
- z-index: 75;
- position: relative;
- margin-top: -20px;
- padding-bottom: 3px;
- opacity: 0;
- filter: alpha(opacity=0);
-}
-.div_analiza_scale {
- float: right;
- position: relative;
- margin-top: -20px;
- padding-bottom: 3px;
- opacity: 0;
- filter: alpha(opacity=0);
-}
\ No newline at end of file
+}*/
+
+