From ec366dd89f542fcfa71f8f1b295ce19e5172af70 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Tue, 1 Feb 2022 13:03:56 +0100 Subject: [PATCH] Redesign - analize - crosstab - V DELU --- admin/survey/SurveyAdmin.php | 4 +- .../surveyAnalysis/class.SurveyCrosstabs.php | 756 +++++++-------- admin/survey/script/crosstab.js | 20 +- admin/survey/script/script_analiza.js | 2 +- public/css/admin_new.css | 912 ++++++++++++++++++ .../pages/survey_analysis/basic.scss | 1 + .../pages/survey_analysis/page_break.scss | 46 + .../pages/survey_analysis/page_crosstab.scss | 211 ++++ .../pages/survey_analysis/page_means.scss | 70 ++ .../survey_analysis/page_multicrosstab.scss | 339 +++++++ .../pages/survey_analysis/page_ttest.scss | 61 ++ 11 files changed, 2011 insertions(+), 411 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c842792d2..3f1257c47 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -2906,9 +2906,7 @@ class SurveyAdmin SurveyAnalysis::Init($this->anketa); SurveyAnalysis::DisplayFilters(); - if ($_GET['m'] == M_ANALYSIS_CROSSTAB) { - echo '
'; - } + echo '
'; SurveyAnalysis::Display(); echo '
'; // div_analiza_data diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php index 9703b1f0e..a9e375b63 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php @@ -371,29 +371,33 @@ class SurveyCrosstabs { * */ function Display() { + global $lang; + # preberemo prednastavljene variable iz seje, če obstajajo $this->presetVariables(); if ($this->dataFileStatus == FILE_STATUS_NO_DATA - || $this->dataFileStatus == FILE_STATUS_NO_FILE - || $this->dataFileStatus == FILE_STATUS_SRV_DELETED){ + || $this->dataFileStatus == FILE_STATUS_NO_FILE + || $this->dataFileStatus == FILE_STATUS_SRV_DELETED){ + return false; } - global $lang; - # polovimo nastavtve missing profila - //$this->missingProfileData = SurveyMissingProfiles::getProfile($this->currentMissingProfile); + echo '
'; + // Izbira spremenljivk echo '
'; $resultIsCheckbox = $this->DisplayDropdows(); echo '
'; - echo '
' ; + + // Nastavitve + echo '
' ; $this->displayLinePercent(); $this->displayResidual(); $this->displayShowChart(); if ( $resultIsCheckbox['is_check']) { - echo '
'; + echo '
'; echo 'crossNavVsEno == 0 ? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. ''; echo 'crossNavVsEno == 1? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. @@ -401,36 +405,36 @@ class SurveyCrosstabs { echo '
'; } echo '
'; + + echo '
'; - - $this->displayExport(); - $this->displayCrosstabCheckboxes(); - echo '
'; + + // Tabele + echo '
'; $this->displayCrosstabsTables(); echo '
'; } function DisplayDropdows() { global $lang; + $variables = $this->getVariableList(); $multiple = true; - echo '
'; + + echo '
'; # iz header datoteke preberemo spremenljivke #js: $("#crosstab_variable_1, #crosstab_variable_2").live('click', function() {}) if (count($this->variabla1) > 0) { - $br=null; - echo $lang['srv_crosstab_label1'].'
'; - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } + + echo '
'.$lang['srv_crosstab_label1'].'
'; foreach($this->variabla1 AS $_key => $variabla1) { - echo $_br; - echo ''; + + echo '
'; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { @@ -448,41 +452,49 @@ class SurveyCrosstabs { } echo ''; + + // Gumb odstrani + echo '
'; if (count($this->variabla1) > 1) { - echo ''; - } else { - #echo ' '; - } + echo ''; + } + echo '
'; - $_br = '
 '; - echo ''; + echo '
'; + } + + if ((int)$this->variabla1['0']['seq'] > 0) { + echo ''; } - $_br = null; } echo '
'; + + echo '
'; - echo '
'; + if ($this->isSelectedBothVariables()) { - echo ''; - } else { - echo ''; + echo ''; + } + else { + echo ''; } + echo '
'; + echo '
'; - echo $lang['srv_crosstab_label2'].'
'; + + echo '
'.$lang['srv_crosstab_label2'].'
'; + # za vsako novo spremenljivko 2 nardimo svoj select if (count($this->variabla2) > 0) { - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } - + foreach($this->variabla2 AS $_key => $variabla2) { - echo $_br; - echo ''; + + echo '
'; - echo ''; - if (count($this->variabla2) > 1) { - echo ''; - } else { - echo ' '; - } - $_br = '
 '; - echo ''; + echo ''; + + // Gumb odstrani + echo '
'; + if (count($this->variabla2) > 1) { + echo ''; + } + echo '
'; + + echo '
'; + } + + if ((int)$this->variabla1['0']['seq'] > 0) { + echo ''; } } + echo '
'; + # če je katera od variabel checkbox, ponudimo možnodt izbire ali po enotah ali po navedbah $is_check = false; if (count($this->variabla2) > 0) { @@ -550,10 +570,12 @@ class SurveyCrosstabs { if ($which == '1') { - echo '
'; - echo ' '; - echo ''; + + # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { echo ''; } @@ -568,18 +590,25 @@ class SurveyCrosstabs { } echo ''; - echo ''; - - } else { - echo '
'; - echo ' '; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ((int)$this->variabla1['0']['seq'] > 0) { echo ''; - } else { + } + else { # če druga variabla ni izbrana dodamo tekst za izbiro druge variable echo ''; } @@ -593,8 +622,15 @@ class SurveyCrosstabs { . $variable['variableNaslov'] .$variable['sequence']. ''; } + echo ''; - echo ''; + + // Gumb odstrani + echo '
'; + echo ' '; + echo '
'; + + echo '
'; } } /** @@ -603,83 +639,58 @@ class SurveyCrosstabs { function displayCrosstabCheckboxes () { global $lang; - echo '
isSelectedBothVariables() && $this->doColor ? '' : ' class="hidden"').'>' ; + echo '
isSelectedBothVariables() && $this->doColor ? '' : ' class="hidden"').'>' ; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - //echo ''; - echo ''; - echo '
-      +'.$lang['srv_more'].'
'; - echo ''; - echo ''; - echo Help :: display('srv_crosstab_residual'); - echo ''; - - echo ''; - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
'.$lang['srv_analiza_crosstab_adjs_residual_long'].':    +-
  '.$lang['srv_crosstab_residual_3_0'].'  
  '.$lang['srv_crosstab_residual_2_0'].'  
  '.$lang['srv_crosstab_residual_1_0'].'  
'; - //echo ''.$lang['srv_residual_link_faq'].''; - echo ''; - echo ''.$lang['srv_less'].''; - echo ''; - echo Help :: display('srv_crosstab_residual'); - echo ''; - echo ''; - - - echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    
'; - echo ''; - echo ''; - echo Help :: display('srv_crosstab_residual2'); - echo ''; - - echo ''; - - - echo ''; + echo '
'; + + echo ''.$lang['srv_analiza_crosstab_adjs_residual_short'].' '.Help :: display('srv_crosstab_residual').':'; + + echo '
'; + echo '
-
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
+
'; + echo '
'; + + echo '
'; + + + /*echo '
'; + + echo ''.Help :: display('srv_crosstab_residual').''; + + echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
'.$lang['srv_analiza_crosstab_adjs_residual_long'].':    +-
  '.$lang['srv_crosstab_residual_3_0'].'  
  '.$lang['srv_crosstab_residual_2_0'].'  
  '.$lang['srv_crosstab_residual_1_0'].'  
'; + + echo '
';*/ + + + echo '
'; + + echo ''.$lang['srv_analiza_crosstab_residuals'].' '.Help::display('srv_crosstab_residual2').':'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; - echo '
'; } public function displayCrosstabsTables() { @@ -713,9 +724,9 @@ class SurveyCrosstabs { $this->_CURRENT_LOOP = $loop; echo '

'.$lang['srv_zanka_note'].$loop['text'].'

'; $this->displayCrosstabsTable(); - echo '
'; } - } else { + } + else { $this->displayCrosstabsTable(); } } @@ -848,111 +859,93 @@ class SurveyCrosstabs { $sub_q2 .= ''; $sub_q2 .= '' . NEW_LINE; } - # izrišemo tabelo - # najprej izrišemo naslovne vrstice - #echo ''; - echo $_br.'
'; -# $_br = '
'; -# echo '
'.$sub_q1. '
==>
'. $sub_q2.'

'; + + # izrišemo tabelo + echo '
'; + + # hi2 + if ($this->displayHi2 == true) { + echo '
'; + echo 'Χ2 = '; + echo $this->formatNumber($crosstabs['hi2'], 3, ''); + echo '
'; + } + + # najprej izrišemo naslovne vrstice #Zadnja kolona: Če imamo vodoravno checkboxe in gledamo enote, potem kolono s summo malo razmaknemo if ( $crosstabs['isCheckbox']['spr1'] == true && $this->crossNavVsEno == true) { $addVerticalSpace = 1; - } else { + } + else { $addVerticalSpace = 0; } - - # hi2 - if ($this->displayHi2 == true) { - echo 'Χ2 = '; - echo $this->formatNumber($crosstabs['hi2'], 3, ''); - } - echo '
'; + echo '
'; - if ($this->fromBreak == false) { - echo ''; - #echo ''; - echo ''; - if (count($crosstabs['options1']) > 0 ) { - $_width_percent = round(100 / count($crosstabs['options1'],2)); - foreach ($crosstabs['options1'] as $ckey1 =>$crossVariabla) { - echo ''; - } - } - if ($addVerticalSpace == 1) { - echo ''; - } - echo ''; - echo ''; - } - echo ''; - echo ''; + + echo ''; - #} echo ''; - echo ''; - echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break-u dodamo še povprečja - echo ''; + echo ''; } + echo ''; - echo ''; + + + echo ''; + $col_cnt=0; if (count($crosstabs['options1']) > 0 ) { foreach ($crosstabs['options1'] as $ckey1 =>$crossVariabla) { $col_cnt++; + #ime variable - //$css_backX = 'rsdl_bck_variable'.($col_cnt & 1); - $css_backX = ' rsdl_bck_variable1'; - echo ''; } } $col_cnt++; - //$css_backX = 'rsdl_bck_variable'.($col_cnt & 1); - if ($addVerticalSpace == 1) { - echo ''; - } - $css_backX = ' rsdl_bck_variable1'; - - echo ''; + + echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break-u dodamo še povprečja - echo ''; + echo ''; } + echo ''; + $cntY = 0; if (count($crosstabs['options2']) > 0) { foreach ($crosstabs['options2'] as $ckey2 =>$crossVariabla2) { $cntY++; - echo ''; + + echo ''; - - //$css_backY = 'rsdl_bck_variable'.($cntY & 1); - $css_backY = ' rsdl_bck_variable1'; - - echo ''; foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo ''; - echo ''; - } - echo '
'; - #if ($cntY == 1) { - # ime variable - #echo ''; + echo '
'; echo $sub_q2; - #echo ''; + + echo ''; echo $sub_q1; echo '   
'; + echo ''; + echo $crossVariabla['naslov']; + # če ni tekstovni odgovor dodamo key if ($crossVariabla['type'] != 't' && $show_variables_values == true) { if ($crossVariabla['vr_id'] == null ) { echo '
( '.$ckey1.' )'; - } else { + } + else { echo '
( '.$crossVariabla['vr_id'].' )'; } } + echo '		 ' . $lang['srv_analiza_crosstab_skupaj'] . '' . $lang['srv_analiza_crosstab_skupaj'] . '' . $lang['srv_analiza_crosstab_average'] . '' . $lang['srv_analiza_crosstab_average'] . '
'; + echo ''; echo $crossVariabla2['naslov']; # če ni tekstovni odgovor dodamo key @@ -967,148 +960,145 @@ class SurveyCrosstabs { echo ''; - # celica z vebino - { - # prikazujemo eno ali več od: frekvenc, odstotkov, residualov - echo ''; - if ($this->crossChk0) { - # izpišemo frekvence crostabov - echo ''; - echo ''; + echo ''; + } + # izpisemo residuale + if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { + # sirina celice v % + if ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 4 ) + $css_width = ' ctb_w25p'; + elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 3 ) + $css_width = ' ctb_w33p'; + elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 2 ) + $css_width = ' ctb_w50p'; + else + $css_width = ''; + $css_bt = ( $this->crossChk0 || ($this->crossChk1 && $this->crossChk2 && $this->crossChk3)) ? 'anl_dash_bt' : ''; + echo ''; + + echo ''; + echo ''; + } + echo '
'; - echo ((int)$crosstabs_value[$ckey1][$ckey2] > 0) ? $crosstabs_value[$ckey1][$ckey2] : 0; - # .$crossTab[$crossVariabla1[cell_id]][$ckey2] - # + + # celica z vebino + echo ''; + + # prikazujemo eno ali več od: frekvenc, odstotkov, residualov + echo ''; - echo ''; - echo ''; - } - - if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { - # sirina celice v % - if ( ($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 3 ) - $css_width = ' ctb_w33p'; - elseif (($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 2 ) - $css_width = ' ctb_w50p'; - else - $css_width = ''; - $css_bt = ( $this->crossChk0 ) ? 'anl_dash_bt' : ''; - # izpisemo procente - echo ''; - echo ''; - echo '
'; + if ($this->crossChk0) { + # izpišemo frekvence crostabov + echo '
'; - echo ''; - $col=0; - - if ($this->crossChk1) { - #procent vrstica - $col++; + echo ''; + + echo ''; + } + + if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { + # sirina celice v % + if ( ($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 3 ) + $css_width = ' ctb_w33p'; + elseif (($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 2 ) + $css_width = ' ctb_w50p'; + else + $css_width = ''; + $css_bt = ( $this->crossChk0 ) ? 'anl_dash_bt' : ''; + # izpisemo procente + echo ''; + echo ''; - } - if ($this->crossChk2) { - #procent stolpec - $col++; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp2' : 'ctbChck_sp0'; - echo ''; + } + if ($this->crossChk3) { + #procent skupni + $col++; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp3' : 'ctbChck_sp0'; + echo ''; - echo ''; - echo ''; - } - # izpisemo residuale - if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { - # sirina celice v % - if ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 4 ) - $css_width = ' ctb_w25p'; - elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 3 ) - $css_width = ' ctb_w33p'; - elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 2 ) - $css_width = ' ctb_w50p'; - else - $css_width = ''; - $css_bt = ( $this->crossChk0 || ($this->crossChk1 && $this->crossChk2 && $this->crossChk3)) ? 'anl_dash_bt' : ''; - echo ''; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaSkupna'], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; + } + echo ''; + echo '
'; + echo ((int)$crosstabs_value[$ckey1][$ckey2] > 0) ? $crosstabs_value[$ckey1][$ckey2] : 0; + echo '
'; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp1' : 'ctbChck_sp0'; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - echo ''; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaVrstica'][$ckey2], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo ''; + echo ''; + echo ''; + $col=0; + + if ($this->crossChk1) { + #procent vrstica + $col++; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaStolpec'][$ckey1], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo ''; - } - if ($this->crossChk3) { - #procent skupni - $col++; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp1' : 'ctbChck_sp0'; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + echo ''; + } + if ($this->crossChk2) { + #procent stolpec + $col++; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp2' : 'ctbChck_sp0'; + echo ''; - } - echo ''; - echo '
'; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaVrstica'][$ckey2], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaSkupna'], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo '
'; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaStolpec'][$ckey1], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo '
'; + + echo '
'; + echo ''; + echo ''; + $col=0; + + if ($this->crossChkEC) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_EC' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkRE) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_RE' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkSR) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_SR' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkAR) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_AR' : 'ctbChck_sp0'; + echo ''; + } + echo ''; + echo '
'; + echo $this->formatNumber($crosstabs['exC'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['res'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['stR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['adR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo '
'; + echo '
'; - echo '		'; - echo ''; - echo ''; - $col=0; - - if ($this->crossChkEC) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_EC' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkRE) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_RE' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkSR) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_SR' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkAR) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_AR' : 'ctbChck_sp0'; - echo ''; - } - echo ''; - echo '
'; - echo $this->formatNumber($crosstabs['exC'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['res'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['stR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['adR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo '
'; - echo '
'; - } # konec celice z vsebino echo ''; } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ' '; - } // vedno rišemo zadnji stolpec. - echo ''; + echo ''; echo ''; if ($this->crossChk0) { echo ''; - echo ''; @@ -1127,21 +1117,21 @@ class SurveyCrosstabs { echo ''; if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; $css_border = ($this->crossChk1 ? ' anl_dash_bl ' : ''); - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; $css_border = ($this->crossChk1 || $this->crossChk2 ? ' anl_dash_bl ' : ''); - echo ''; } @@ -1153,13 +1143,15 @@ class SurveyCrosstabs { echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break dodamo še povprečja - echo ''; } echo ''; } } + + #Zadnja vrstica. Če imamo navpično checkboxe in gledamo enote, potem vrstico z summo malo razmaknemo $cssBT = 'anl_bt'; if ( $crosstabs['isCheckbox']['spr2'] == true && $this->crossNavVsEno == true) { @@ -1167,12 +1159,10 @@ class SurveyCrosstabs { echo ''; - } echo ''; + $cssBT = ''; } @@ -1183,13 +1173,13 @@ class SurveyCrosstabs { // skupni sestevki po stolpcih if (count($crosstabs['options1']) > 0) foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo '
'; + echo ''; # suma po vrsticah echo (int)$crosstabs['sumaVrstica'][$ckey2]; echo '
'; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaVrstica'][$ckey2] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaVrstica'][$ckey2] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( $crosstabs['avgVrstica'][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'), ''); echo '
 '; echo ' '; echo ' '; - if ($addVerticalSpace == 1) { - echo '  '; echo '
'; + echo ''; { # prikazujemo eno od treh možnosti echo ''; if ($this->crossChk0) { echo ''; - echo ''; @@ -1201,20 +1191,20 @@ class SurveyCrosstabs { echo ''; if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; } @@ -1224,18 +1214,14 @@ class SurveyCrosstabs { } echo ''; } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ''; - } # zadnja celica z skupno sumo - echo '
'; + echo ''; # suma po stolpcih echo (int)$crosstabs['sumaStolpec'][$ckey1]; echo '
'; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaStolpec'][$ckey1] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaStolpec'][$ckey1] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ' '; + echo ''; { echo ''; if ($this->crossChk0) { echo ''; - echo ''; @@ -1248,20 +1234,20 @@ class SurveyCrosstabs { if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; $css_border = ($this->crossChk2 || $this->crossChk3) ? ' anl_dash_br' : ''; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; $css_border = ($this->crossChk3) ? ' anl_dash_br' : ''; - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; } @@ -1286,15 +1272,11 @@ class SurveyCrosstabs { // skupni sestevki po stolpcih if (count($crosstabs['options1']) > 0) { foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo ''; } } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ''; - } # zadnja celica z skupno sumo echo ''; @@ -1306,66 +1288,36 @@ class SurveyCrosstabs { } echo '
'; + echo ''; # skupna suma echo (int)$crosstabs['sumaSkupna']; echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( $crosstabs['avgStolpec'][$ckey1], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'), ''); echo '  
'; + // Zvezdica za vkljucitev v porocilo $spr2 = $v_first['seq'].'-'.$v_first['spr'].'-'.$v_first['grd']; $spr1 = $v_second['seq'].'-'.$v_second['spr'].'-'.$v_second['grd']; SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=5, $sub_type=0, $spr1, $spr2); - #SurveyAnalysis::addCustomReportElement($type=5, $sub_type=0, $spr1, $spr2); + + // Izrisemo legendo + $this->displayCrosstabCheckboxes(); + + // Izrisemo graf za tabelo if($this->showChart && !$this->fromBreak){ $tableChart = new SurveyTableChart($this->sid, $this, 'crosstab', $counter); $tableChart->display(); } + + echo ''; $counter++; } } - } else { + } + else { # crostab variables not set echo $lang['srv_crosstab_note0']; - #print_r("Crosstab variables not set!"); } } - /** - * @desc prikaze izvoz za PDF/RTF - */ - function displayExport () { - # z javascriptom prikažemo ikonce za arhiviranje, emaijlanje arhivov, pdf, rtf, excel... - if ($this->isSelectedBothVariables()) { - $data1 = ''; - $data2 = ''; - - foreach($this->variabla1 as $var1){ - $data1 .= implode(',', array_values($var1)).','; - } - $data1 = substr($data1, 0, -1); - - foreach($this->variabla2 as $var2){ - $data2 .= implode(',', array_values($var2)).','; - } - $data2 = substr($data2, 0, -1); - - $href_print = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); - $href_pdf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); - $href_rtf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_rtf&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); - $href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_xls&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); - echo ''; - - } - - } - /** kadar kličemo iz Break, ali pri radio grupi dodamo še povprečje po stolpcih * * @param unknown_type $showBottomAverage @@ -1887,7 +1839,6 @@ class SurveyCrosstabs { } - /** Sestavi array nepravilnih odgovorov * */ @@ -2565,8 +2516,10 @@ class SurveyCrosstabs { $this->displaySessionInspectCheckbox(); } + function displaySessionInspectCheckbox() { global $lang; + echo 'enableInspect == true ? ' checked="checekd"' : '').' onClick="changeSessionInspect();">'.$lang['srv_inspect_setting']; echo Help :: display('srv_crosstab_inspect'); } @@ -2575,10 +2528,15 @@ class SurveyCrosstabs { function displayLinePercent() { global $lang; - echo 'crossChk1 == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; - echo ''; - echo 'doColor == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; - echo ''; + echo '
'; + echo ' crossChk1 == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ' '; + echo '
'; + + echo '
'; + echo ' doColor == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ' '; + echo '
'; } function displayResidual(){ @@ -2586,15 +2544,19 @@ class SurveyCrosstabs { $selected = ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR == 4) ? true : false; - echo ''; - echo ''; + echo '
'; + echo ' '; + echo ' '; + echo '
'; } function displayShowChart() { global $lang; - echo 'showChart == true ? ' checked="checked" ' : '') . ' />'; - echo ''; + echo '
'; + echo ' showChart == true ? ' checked="checked" ' : '') . ' />'; + echo ' '; + echo '
'; } function presetVariables() { diff --git a/admin/survey/script/crosstab.js b/admin/survey/script/crosstab.js index 02719effb..4bf608d28 100644 --- a/admin/survey/script/crosstab.js +++ b/admin/survey/script/crosstab.js @@ -108,7 +108,7 @@ function change_crosstab (action) { var crossNavVsEno = $('#crossNavVsEno1').is(':checked') ? '1' : '0'; $("#crosstab_drobdowns").fadeTo(100, 0.2); - $("#crosstab_table").fadeTo(100, 0.2); + $("#crosstab_tables").fadeTo(100, 0.2); $("#crosstab_drobdowns").load("ajax.php?t=crosstab&a=changeDropdown", {anketa:srv_meta_anketa_id, sequence1:sequence1, sequence2:sequence2, spr1:spr1, spr2:spr2 , crossNavVsEno:crossNavVsEno, grid1:grid1, grid2:grid2}, function() { if (isNaN(spr1) && isNaN(spr2)) { @@ -117,7 +117,7 @@ function change_crosstab (action) { }); } else { $("#crosstab_drobdowns").fadeTo(100, 1); - $("#crosstab_table").fadeTo(100, 1); + $("#crosstab_tables").fadeTo(100, 1); } }); @@ -125,7 +125,7 @@ function change_crosstab (action) { function change_crosstab_cb () { $("#crosstab_drobdowns").fadeTo(100, 0.2); - $("#crosstab_table").fadeTo(100, 0.2); + $("#crosstab_tables").fadeTo(100, 0.2); // prebereomo dropdown variabli @@ -149,12 +149,12 @@ function change_crosstab_cb () { var crossNavVsEno = $('#crossNavVsEno1').is(':checked') ? '1' : '0'; - $("#crosstab_table").load("ajax.php?t=crosstab&a=change_cb", {anketa:srv_meta_anketa_id, sequence1:sequence1, sequence2:sequence2, + $("#crosstab_tables").load("ajax.php?t=crosstab&a=change_cb", {anketa:srv_meta_anketa_id, sequence1:sequence1, sequence2:sequence2, //crossChk0:crossChk0, crossChk1:crossChk1, crossChk2:crossChk2, crossChk3:crossChk3, //crossChkEC:crossChkEC, crossChkRE:crossChkRE,crossChkSR:crossChkSR,crossChkAR:crossChkAR, doColor:doColor, spr1:spr1, spr2:spr2, crossNavVsEno:crossNavVsEno, grid1:grid1, grid2:grid2 }, function () { $("#crosstab_drobdowns").fadeTo(100, 1); - $("#crosstab_table").fadeTo(100, 1); + $("#crosstab_tables").fadeTo(100, 1); }); } @@ -203,7 +203,7 @@ function doInspectFromCrosstab(el,event) { function doArchiveCrosstab() { //preverimo ali obstaja vsebina crosstaba - if ($("#crosstab_table").length > 0 && $("#crosstab_table").html() != '') { + if ($("#crosstab_tables").length > 0 && $("#crosstab_tables").html() != '') { $("#fullscreen").load('ajax.php?a=doArchiveAnaliza', {anketa: srv_meta_anketa_id, podstran: srv_meta_podstran}, function() { $('#fade').fadeTo('slow', 1); @@ -215,8 +215,8 @@ function doArchiveCrosstab() { } function createArchiveCrosstabBeforeEmail() { //preverimo ali obstaja vsebina crosstaba - if ($("#crosstab_table").length > 0 && $("#crosstab_table").html() != '') { - var content = $("#crosstab_table").html(); + if ($("#crosstab_tables").length > 0 && $("#crosstab_tables").html() != '') { + var content = $("#crosstab_tables").html(); //global replace var regex = new RegExp('ct_inspect', "g"); content = content.replace(regex, ''); @@ -245,8 +245,8 @@ function createArchiveCrosstabBeforeEmail() { } function submitArchiveCrosstabs() { //preverimo ali obstaja vsebina crosstaba - if ($("#crosstab_table").length > 0 && $("#crosstab_table").html() != '') { - var content = $("#crosstab_table").html(); + if ($("#crosstab_tables").length > 0 && $("#crosstab_tables").html() != '') { + var content = $("#crosstab_tables").html(); //global replace var regex = new RegExp('ct_inspect', "g"); content = content.replace(regex, ''); diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js index ae1b2c283..850d10a07 100644 --- a/admin/survey/script/script_analiza.js +++ b/admin/survey/script/script_analiza.js @@ -777,7 +777,7 @@ function show_single_percent(id,status) { function printAnaliza(ime) { if(ime == 'Crosstab') - var divToPrint=document.getElementById('crosstab_table'); + var divToPrint=document.getElementById('crosstab_tables'); else if(ime == 'MultiCrosstab') var divToPrint=document.getElementById('mc_holder'); else if(ime == 'Means') diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 5cbddd1f0..d86c44ca0 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -15248,6 +15248,7 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_space { padding: 0; line-height: 8px; + background-color: #FFFFFF !important; border: 0 !important; } #div_analiza_data table tr th.cell_noPadding, @@ -15740,6 +15741,917 @@ iframe#ifmcontentstoprint { background-color: #FFFFFF; } +#div_analiza_data.crosstabs { + display: flex; + flex-direction: column; +} +#div_analiza_data.crosstabs .crosstab_top_holder { + display: flex; + align-self: center; + flex-wrap: wrap; + margin-bottom: 16px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns { + display: flex; + margin-right: 64px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder { + display: flex; + flex-direction: column; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder .title, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder .title { + margin-bottom: 4px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder .variabla_line, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder .variabla_line { + display: flex; + align-items: center; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder .variabla_line .faicon, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder .variabla_line .faicon { + cursor: pointer; + margin-left: 8px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder .variabla_line .faicon::before, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder .variabla_line .faicon::before { + color: #1E88E5; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossLeftHolder button, +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossRightHolder button { + width: 190px; + margin-top: 16px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder { + margin: 38px 32px 0 32px; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder .faicon { + cursor: pointer; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder .faicon::before { + color: #1E88E5; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_drobdowns #crossImgHolder .faicon.gray::before { + color: #E5E5E5; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_settings { + display: flex; + flex-direction: column; +} +#div_analiza_data.crosstabs .crosstab_top_holder #crosstab_settings .setting_line { + margin-bottom: 6px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder { + margin-top: 16px; + padding-bottom: 16px; + border-bottom: 1px #E5E5E5 solid; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder:last-child { + border-bottom: 0; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder .hi2 { + margin-bottom: 8px; + font-weight: 600; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder table.table_crosstab td.cell_var { + width: 260px; + text-align: left; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder table.table_crosstab td.cell_question a { + text-decoration: none; + color: #333333; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder table.table_crosstab td.cell_value { + text-align: center; + padding: 4px 8px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder .custom_report_include { + margin-top: 16px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder .custom_report_include a { + text-decoration: none; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend { + display: flex; + flex-direction: column; + margin-top: 16px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line { + display: flex; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line:nth-child(2) { + margin-top: 16px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .title { + margin-right: 16px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak { + display: flex; + align-items: center; + justify-content: center; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak div { + width: 22px; + height: 22px; + font-weight: 600; + font-size: 20px; + text-align: center; + line-height: 18px; +} +#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder { + margin: 16px auto 0 auto; +} +#div_analiza_data.crosstabs .ctbChck_sp0 { + background-color: #fcfcfc !important; +} +#div_analiza_data.crosstabs .ctbChck_sp1 { + background-color: #FEFFE3 !important; +} +#div_analiza_data.crosstabs .ctbChck_sp2 { + background-color: #FCFFC2 !important; +} +#div_analiza_data.crosstabs .ctbChck_sp3 { + background-color: #FBFFA8 !important; +} +#div_analiza_data.crosstabs .crossCheck_EC { + background-color: #FFFAE8 !important; +} +#div_analiza_data.crosstabs .crossCheck_RE { + background-color: #FFF6D1 !important; +} +#div_analiza_data.crosstabs .crossCheck_SR { + background-color: #FFECA2 !important; +} +#div_analiza_data.crosstabs .crossCheck_AR { + background-color: #FFDA46 !important; +} +#div_analiza_data.crosstabs .rsdl_bck0 { + background-color: white !important; +} +#div_analiza_data.crosstabs .rsdl_bck1 { + background-color: #fae2e2 !important; +} +#div_analiza_data.crosstabs .rsdl_bck2 { + background-color: #ff9d9d !important; +} +#div_analiza_data.crosstabs .rsdl_bck3 { + background-color: #f84242 !important; +} +#div_analiza_data.crosstabs .rsdl_bck4 { + background-color: #E8F1FF !important; +} +#div_analiza_data.crosstabs .rsdl_bck5 { + background-color: #B9D5FF !important; +} +#div_analiza_data.crosstabs .rsdl_bck6 { + background-color: #74ACFF !important; +} + +#mc_holder { + overflow: hidden; + margin-top: 20px; + min-height: 500px; +} +#mc_holder .mc_table_bottom_settings { + clear: none; + float: right; + border-collapse: collapse; + margin: 0 2% 15px 0; + width: 72%; +} +#mc_holder .custom_report_include { + clear: none; + float: left; + border-collapse: collapse; + margin: 0 2% 15px 0; +} + +/*drag list of questions*/ +#spr_list { + float: left; + overflow: auto; + position: fixed; + width: 20%; + max-height: 450px; + margin: 15px 0 15px 1%; + background-color: white; + border: 1px solid silver; + border-radius: 7px; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px; +} +#spr_list ul { + padding: 0; + padding: 5px 0; + z-index: 1; +} + +.mc_draggable { + width: 180px; + margin: 10px 15px; + padding: 8px; + list-style: none; + border: 1px #E5E5E5 dashed; +} +.mc_draggable:hover { + background-color: #E5E5E5; + cursor: pointer; +} + +/*title of table*/ +.mc_table_title { + float: right; + table-layout: fixed; + width: 70%; + min-height: 15px; + margin: 15px 2% 15px 0; + padding: 5px 1%; + font-size: 16px; + font-weight: bold; + border-collapse: collapse; +} +.mc_table_title:hover { + cursor: text; + background-color: #E5E5E5; +} +.mc_table_title .multicrosstab_title_inline:focus { + outline: none; +} + +.mc_table_title.writing { + background-color: #E5E5E5; + outline: 1px dashed #E5E5E5; +} + +/*multicrosstab table*/ +.mc_table { + float: right; + table-layout: fixed; + width: 72%; + margin: 15px 2% 15px 0; + border-collapse: collapse; +} +.mc_table tr { + height: 40px; +} +.mc_table tr td { + border: 1px #E5E5E5 solid; + text-align: center; +} +.mc_table tr td table.mc_inner_cell { + width: 100%; + height: 100%; + border-collapse: collapse; +} +.mc_table tr td table.mc_inner_cell tr { + width: 100%; + height: auto; +} +.mc_table tr td table.mc_inner_cell tr td { + border: 0; + border-top: 1px dashed #E5E5E5; + width: 100%; +} +.mc_table tr td table.mc_inner_cell tr:first-child td { + border: 0; +} +.mc_table tr td .delete_var { + display: none; + position: absolute; + width: 16px; + height: 16px; + margin: -25px 0 0 0; + background-image: url("../../../admin/survey/img_0/cross.png"); +} +.mc_table tr td.borderless { + border: 0; +} +.mc_table tr td.spr { + cursor: pointer; + font-weight: bold; + background-color: #E5E5E5; +} +.mc_table tr td.var { + background-color: #E5E5E5; +} +.mc_table tr td.sums { + color: #FFC700; +} +.mc_table tr td.data { + background-color: #F9F9F7; +} +.mc_table tr td.crossCheck_EC { + background-color: #FFFAE8; +} +.mc_table tr td.crossCheck_RE { + background-color: #FFFAE8; +} +.mc_table tr td.crossCheck_SR { + background-color: #FFECA2; +} +.mc_table tr td.crossCheck_AR { + background-color: #FFDA46; +} +.mc_table tr td.rsdl_bck0 { + background-color: white; +} +.mc_table tr td.rsdl_bck1 { + background-color: #FFE8E8; +} +.mc_table tr td.rsdl_bck2 { + background-color: #FFD1D1; +} +.mc_table tr td.rsdl_bck3 { + background-color: #FF8B8B; +} +.mc_table tr td.rsdl_bck4 { + background-color: #E8F1FF; +} +.mc_table tr td.rsdl_bck5 { + background-color: #B9D5FF; +} +.mc_table tr td.rsdl_bck6 { + background-color: #74ACFF; +} +.mc_table tr td.white { + background-color: white; +} +.mc_table tr td.red { + background-color: #FFD1D1; +} +.mc_table tr td.blue { + background-color: #E8F1FF; +} +.mc_table tr td.drophover { + background-color: #FFC700 !important; +} +.mc_table tr td.empty { + border: 1px dashed #E5E5E5; + font-weight: normal; +} +.mc_table tr td.empty.droppable { + color: #FFC700; + border: 1px dashed #FFC700; + background-color: #FFC700; +} + +/*settings links in top left corner*/ +.mc_settings_links { + float: none; + display: inline-block; + position: relative; + width: auto; + left: 200px; + padding: 3px 5px; + margin: 0 40px 0 0; + background-color: #E5E5E5; + border: 1px solid silver; + border-radius: 3px; + -moz-border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px; +} +.mc_settings_links ul { + margin: 0 !important; + padding: 0; +} +.mc_settings_links ul li { + display: inline-block; + list-style: none outside none; + margin: 0 !important; + padding: 2px 1px; + vertical-align: middle; +} +.mc_settings_links ul li > span { + vertical-align: middle; + cursor: pointer; +} +.mc_settings_links ul li.space { + background: url("../../../admin/survey/img_0/navigation/nav-control-bg.png") no-repeat scroll center top transparent; + line-height: 17px; + padding: 0 5px; + width: 7px; +} + +/*table settings popup*/ +.mc_table_settings { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + display: none; + position: fixed; + top: 200px; + left: calc(50% - 200px); + z-index: 999; + width: 400px; +} +.mc_table_settings .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +.mc_table_settings .popup_close:hover { + color: #333333; +} +.mc_table_settings .popup_close a { + color: #777777; + text-decoration: none; +} +.mc_table_settings .popup_close a:hover { + color: #333333; +} +.mc_table_settings h2, +.mc_table_settings .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +.mc_table_settings p { + line-height: 20px; +} +.mc_table_settings .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +.mc_table_settings .button_holder button:last-child { + margin-right: 0; +} +.mc_table_settings.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: ""; + font-size: 14px; + color: #FFC700; +} +.mc_table_settings #mcSettingsButtons { + position: absolute; + bottom: 15px; + right: 10px; +} +.mc_table_settings #delez { + width: 300px; + margin: 5px 10px 0px 60px; +} +.mc_table_settings form { + padding: 10px; +} +.mc_table_settings fieldset { + margin: 0px 0px 10px 0px; + border: 0; + border-top: 1px solid #1E88E5; +} +.mc_table_settings legend { + color: #1E88E5; + font-size: 13px; + font-weight: 500; + margin: 0; + padding: 0 10px; +} + +/*tables list popup*/ +#div_mc_tables { + display: none; + width: 350px; + height: 280px; +} +#div_mc_tables #mc_tables_left { + margin-bottom: 10px; +} + +#mc_tables { + cursor: pointer; + width: 99%; + height: 160px; + display: inline-block; + border: 1px solid gray; +} +#mc_tables .option { + padding: 1px; +} +#mc_tables .active { + background-color: #1E88E5; + color: white; + border-bottom: 1px solid #E5E5E5; +} + +/*new table popup*/ +#newMCTable { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + display: none; + position: fixed; + left: calc(50% - 275px); + top: 40vh; + z-index: 999; + margin: 10px; + width: 550px; +} +#newMCTable .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +#newMCTable .popup_close:hover { + color: #333333; +} +#newMCTable .popup_close a { + color: #777777; + text-decoration: none; +} +#newMCTable .popup_close a:hover { + color: #333333; +} +#newMCTable h2, +#newMCTable .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +#newMCTable p { + line-height: 20px; +} +#newMCTable .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +#newMCTable .button_holder button:last-child { + margin-right: 0; +} +#newMCTable.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: ""; + font-size: 14px; + color: #FFC700; +} + +/*rename table popup*/ +#renameMCTable { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + display: none; + position: fixed; + left: calc(50% - 275px); + top: 40vh; + z-index: 999; + margin: 10px; + width: 550px; +} +#renameMCTable .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +#renameMCTable .popup_close:hover { + color: #333333; +} +#renameMCTable .popup_close a { + color: #777777; + text-decoration: none; +} +#renameMCTable .popup_close a:hover { + color: #333333; +} +#renameMCTable h2, +#renameMCTable .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +#renameMCTable p { + line-height: 20px; +} +#renameMCTable .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +#renameMCTable .button_holder button:last-child { + margin-right: 0; +} +#renameMCTable.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: ""; + font-size: 14px; + color: #FFC700; +} + +/*delete table popup*/ +#deleteMCTable { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + display: none; + position: fixed; + left: calc(50% - 275px); + top: 40vh; + z-index: 999; + margin: 10px; + width: 550px; +} +#deleteMCTable .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +#deleteMCTable .popup_close:hover { + color: #333333; +} +#deleteMCTable .popup_close a { + color: #777777; + text-decoration: none; +} +#deleteMCTable .popup_close a:hover { + color: #333333; +} +#deleteMCTable h2, +#deleteMCTable .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +#deleteMCTable p { + line-height: 20px; +} +#deleteMCTable .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +#deleteMCTable .button_holder button:last-child { + margin-right: 0; +} +#deleteMCTable.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: ""; + font-size: 14px; + color: #FFC700; +} + +.report_element_data table.mc_table { + float: left; + width: 100%; +} +.report_element_data .mc_table tr td.spr { + cursor: auto; +} +.report_element_data .mc_table tr td.drophover { + background-color: #FFC700 !important; +} +.report_element_data .mc_table tr td.empty { + display: none; +} +.report_element_data .mc_table tr.last { + display: none; +} + +.mc_table_legend { + clear: none; + float: right; + border-collapse: collapse; + padding: 5px 10px; + line-height: 18px; + border: 1px solid #E5E5E5; + background-color: #F9F9F7; +} + +.ttest_chart_holder { + margin-left: 0px; +} + +table.ttestTable { + border-top: 1px solid #E5E5E5; + border-left: 1px solid #E5E5E5; + border-spacing: 0px; + padding: 0px; + margin: 0px; + border-collapse: collapse; + table-layout: auto; + font-size: 120%; +} +table.ttestTable td { + min-width: 80px; + padding: 3px; + margin: 0px; + text-align: center; + border-bottom: 1px solid #E5E5E5; + border-right: 1px solid #E5E5E5; +} +table.ttestTable th { + min-width: 80px; + padding: 3px; + margin: 0px; + text-align: center; + border-bottom: 1px solid #E5E5E5; + border-right: 1px solid #E5E5E5; + background-color: #F8F8F8; +} +table.ttestTable th.lightGreen { + background-color: #F8F8F8; +} +table.ttestTable td.lightGreen { + background-color: #F8F8F8; +} + +#ttestNumerusSpan select { + width: 220px; +} + +#ttestSpremenljivkaSpan select { + width: 220px; +} + +#ttestVariablesSpan { + background-color: #F8F8F8; + border: 1px solid #F8F8F8; + margin-bottom: 10px; + padding: 5px; + max-width: 400px; + border-radius: 4px; + -moz-border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px; +} + +#ttestVariablesSpan.active { + background-color: #FFC700; + border: 1px solid #FFC700; +} + +.space_means_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#means_add_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#means_remove { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#div_means_data { + margin-top: 10px; +} + +#meansLeftDropdowns { + float: left; + padding-right: 10px; +} +#meansLeftDropdowns select { + width: 240px; + font-size: 12px; +} +#meansLeftDropdowns select option { + overflow: hidden; + font-size: 12px; +} + +#meansRightDropdowns { + float: left; + padding-right: 10px; +} +#meansRightDropdowns select { + width: 240px; + font-size: 12px; +} +#meansRightDropdowns select option { + overflow: hidden; + font-size: 12px; +} + +.space_means_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#means_add_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#means_remove { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#meansImgHolder { + float: left; + padding: 0px 3px; + display: inline-block; +} + +.break_chart_holder { + margin: 30px 0 30px 0; +} + +.avg { + text-decoration: overline; +} + +#breakSpremenljivkaSpan select { + width: 220px; +} + +div.breakTableDiv { + margin-top: 10px; +} +div.breakTableDiv table { + border-top: 1px solid #E5E5E5; + border-left: 1px solid #E5E5E5; + border-collapse: collapse; + border-spacing: 0; + text-align: center; +} +div.breakTableDiv table th { + border-right: 1px solid #E5E5E5; + border-bottom: 1px solid #E5E5E5; + padding: 5px; + min-width: 70px; + font-weight: normal; + background-color: #F8F8F8; +} +div.breakTableDiv table td { + border-right: 1px solid #E5E5E5; + border-bottom: 1px solid #E5E5E5; + padding: 5px; + min-width: 70px; + font-weight: normal; +} +div.breakTableDiv table th.sub { + background-color: #F8F8F8; +} +div.breakTableDiv table th.strong { + font-weight: bold; +} +div.breakTableDiv table td.strong { + font-weight: bold; +} + /*editing chart labels in popup*/ table#grids td { padding: 0 5px; diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss index c3b5292d0..fb37df4ed 100644 --- a/resources/sass/admin_new/pages/survey_analysis/basic.scss +++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss @@ -136,6 +136,7 @@ &.cell_space{ padding: 0; line-height: 8px; + background-color: $white !important; border: 0 !important; } diff --git a/resources/sass/admin_new/pages/survey_analysis/page_break.scss b/resources/sass/admin_new/pages/survey_analysis/page_break.scss index e69de29bb..a9b696b6e 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_break.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_break.scss @@ -0,0 +1,46 @@ + +.break_chart_holder { + margin: 30px 0 30px 0; +} +.avg { + text-decoration: overline; +} +#breakSpremenljivkaSpan { + select { + width: 220px; + } +} +div.breakTableDiv { + margin-top: 10px; + table { + border-top: 1px solid $gray; + border-left: 1px solid $gray; + border-collapse: collapse; + border-spacing: 0; + text-align: center; + th { + border-right: 1px solid $gray; + border-bottom: 1px solid $gray; + padding: 5px; + min-width: 70px; + font-weight: normal; + background-color: $light-gray; + } + td { + border-right: 1px solid $gray; + border-bottom: 1px solid $gray; + padding: 5px; + min-width: 70px; + font-weight: normal; + } + th.sub { + background-color: $light-gray; + } + th.strong { + font-weight: bold; + } + td.strong { + font-weight: bold; + } + } +} diff --git a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss index e69de29bb..ddd228b97 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss @@ -0,0 +1,211 @@ + +#div_analiza_data.crosstabs{ + display: flex; + flex-direction: column; + + .crosstab_top_holder{ + display: flex; + align-self: center; + flex-wrap: wrap; + + margin-bottom: 16px; + + #crosstab_drobdowns{ + display: flex; + margin-right: 64px; + + #crossLeftHolder, + #crossRightHolder{ + display: flex; + flex-direction: column; + + .title{ + margin-bottom: 4px; + } + + .variabla_line{ + display: flex; + align-items: center; + + .faicon{ + cursor: pointer; + margin-left: 8px; + + &::before{ + color: $blue; + } + } + } + + button{ + width: 190px; + margin-top: 16px; + } + } + + #crossImgHolder { + margin: 38px 32px 0 32px; + + .faicon{ + cursor: pointer; + + &::before{ + color: $blue; + } + + &.gray::before{ + color: $gray; + } + + } + } + } + + #crosstab_settings{ + display: flex; + flex-direction: column; + + .setting_line{ + margin-bottom: 6px; + } + } + + } + + #crosstab_tables{ + + .table_holder{ + margin-top: 16px; + padding-bottom: 16px; + + border-bottom: 1px $gray solid; + + &:last-child{ + border-bottom: 0; + } + + .hi2{ + margin-bottom: 8px; + font-weight: 600; + } + + table.table_crosstab{ + + td.cell_var{ + width: 260px; + text-align: left; + } + + td.cell_question{ + a{ + text-decoration: none; + color: $black; + } + } + + td.cell_value{ + text-align: center; + padding: 4px 8px; + } + } + + .custom_report_include{ + margin-top: 16px; + + a{ + text-decoration: none; + } + } + + #crosstab_legend{ + display: flex; + flex-direction: column; + + margin-top: 16px; + + .crosstab_legend_line{ + display: flex; + + &:nth-child(2){ + margin-top: 16px; + } + + .title{ + margin-right: 16px; + } + + .trak{ + display: flex; + align-items: center; + justify-content: center; + + div{ + width: 22px; + height: 22px; + + font-weight: 600; + font-size: 20px; + text-align: center; + line-height: 18px; + } + } + } + } + + .crosstab_chart_holder{ + margin: 16px auto 0 auto; + } + } + } + + + // Barve + .ctbChck_sp0 { + background-color: #fcfcfc !important; + } + .ctbChck_sp1 { + background-color: #FEFFE3 !important; + } + .ctbChck_sp2 { + background-color: #FCFFC2 !important; + } + .ctbChck_sp3 { + background-color: #FBFFA8 !important; + } + .crossCheck_EC { + background-color: #FFFAE8 !important; + } + .crossCheck_RE { + background-color: #FFF6D1 !important; + } + .crossCheck_SR { + background-color: #FFECA2 !important; + } + .crossCheck_AR { + background-color: #FFDA46 !important; + } + .rsdl_bck0 { + background-color: white !important; + } + .rsdl_bck1 { + background-color: rgb(250, 226, 226) !important; + } + .rsdl_bck2 { + background-color: rgb(255, 157, 157) !important; + } + .rsdl_bck3 { + background-color: rgb(248, 66, 66) !important; + } + .rsdl_bck4 { + background-color: #E8F1FF !important; + } + .rsdl_bck5 { + background-color: #B9D5FF !important; + } + .rsdl_bck6 { + background-color: #74ACFF !important; + } + +} + + diff --git a/resources/sass/admin_new/pages/survey_analysis/page_means.scss b/resources/sass/admin_new/pages/survey_analysis/page_means.scss index e69de29bb..6f6678855 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_means.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_means.scss @@ -0,0 +1,70 @@ + +.space_means_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} +#means_add_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} +#means_remove { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} + +#div_means_data { + margin-top: 10px; +} +#meansLeftDropdowns { + float: left; + padding-right: 10px; + select { + width: 240px; + font-size: 12px; + option { + overflow: hidden; + font-size: 12px; + } + } +} +#meansRightDropdowns { + float: left; + padding-right: 10px; + select { + width: 240px; + font-size: 12px; + option { + overflow: hidden; + font-size: 12px; + } + } +} +.space_means_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} +#means_add_new { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} +#means_remove { + text-align: center; + vertical-align: middle; + display: inline-block; + width: 20px; +} +#meansImgHolder { + float: left; + padding: 0px 3px; + display: inline-block; +} diff --git a/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss index e69de29bb..5d42012d5 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss @@ -0,0 +1,339 @@ + +#mc_holder { + overflow: hidden; + margin-top: 20px; + min-height: 500px; + .mc_table_bottom_settings { + clear: none; + float: right; + border-collapse: collapse; + margin: 0 2% 15px 0; + width: 72%; + } + .custom_report_include { + clear: none; + float: left; + border-collapse: collapse; + margin: 0 2% 15px 0; + } +} +/*drag list of questions*/ +#spr_list { + float: left; + overflow: auto; + position: fixed; + width: 20%; + max-height: 450px; + margin: 15px 0 15px 1%; + background-color: white; + border: 1px solid silver; + border-radius: 7px; + -moz-border-radius: 7px 7px 7px 7px; + -webkit-border-radius: 7px; + ul { + padding: 0; + padding: 5px 0; + z-index: 1; + } +} +.mc_draggable { + width: 180px; + margin: 10px 15px; + padding: 8px; + list-style: none; + border: 1px $gray dashed; + &:hover { + background-color: $gray; + cursor: pointer; + } +} +/*title of table*/ +.mc_table_title { + float: right; + table-layout: fixed; + width: 70%; + min-height: 15px; + margin: 15px 2% 15px 0; + padding: 5px 1%; + font-size: 16px; + font-weight: bold; + border-collapse: collapse; + &:hover { + cursor: text; + background-color: $gray; + } + .multicrosstab_title_inline:focus { + outline: none; + } +} +.mc_table_title.writing { + background-color: $gray; + outline: 1px dashed $gray; +} +/*multicrosstab table*/ +.mc_table { + float: right; + table-layout: fixed; + width: 72%; + margin: 15px 2% 15px 0; + border-collapse: collapse; + tr { + height: 40px; + td { + border: 1px $gray solid; + text-align: center; + table.mc_inner_cell { + width: 100%; + height: 100%; + border-collapse: collapse; + tr { + width: 100%; + height: auto; + td { + border: 0; + border-top: 1px dashed $gray; + width: 100%; + } + &:first-child { + td { + border: 0; + } + } + } + } + .delete_var { + display: none; + position: absolute; + width: 16px; + height: 16px; + margin: -25px 0 0 0; + background-image: url("../../../admin/survey/img_0/cross.png"); + } + } + td.borderless { + border: 0; + } + td.spr { + cursor: pointer; + font-weight: bold; + background-color: $gray; + } + td.var { + background-color: $gray; + } + td.sums { + color: $yellow; + } + td.data { + background-color: #F9F9F7; + } + td.crossCheck_EC { + background-color: #FFFAE8; + } + td.crossCheck_RE { + background-color: #FFFAE8; + } + td.crossCheck_SR { + background-color: #FFECA2; + } + td.crossCheck_AR { + background-color: #FFDA46; + } + td.rsdl_bck0 { + background-color: white; + } + td.rsdl_bck1 { + background-color: #FFE8E8; + } + td.rsdl_bck2 { + background-color: #FFD1D1; + } + td.rsdl_bck3 { + background-color: #FF8B8B; + } + td.rsdl_bck4 { + background-color: #E8F1FF; + } + td.rsdl_bck5 { + background-color: #B9D5FF; + } + td.rsdl_bck6 { + background-color: #74ACFF; + } + td.white { + background-color: white; + } + td.red { + background-color: #FFD1D1; + } + td.blue { + background-color: #E8F1FF; + } + td.drophover { + background-color: $yellow !important; + } + td.empty { + border: 1px dashed $gray; + font-weight: normal; + } + td.empty.droppable { + color: $yellow; + border: 1px dashed $yellow; + background-color: $yellow; + } + } +} +/*settings links in top left corner*/ +.mc_settings_links { + float: none; + display: inline-block; + position: relative; + width: auto; + left: 200px; + padding: 3px 5px; + margin: 0 40px 0 0; + background-color: $gray; + border: 1px solid silver; + border-radius: 3px; + -moz-border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px; + ul { + margin: 0 !important; + padding: 0; + li { + display: inline-block; + list-style: none outside none; + margin: 0 !important; + padding: 2px 1px; + vertical-align: middle; + >span { + vertical-align: middle; + cursor: pointer; + } + } + li.space { + background: url("../../../admin/survey/img_0/navigation/nav-control-bg.png") no-repeat scroll center top transparent; + line-height: 17px; + padding: 0 5px; + width: 7px; + } + } +} +/*table settings popup*/ +.mc_table_settings { + @include popup_general(); + + display: none; + position: fixed; + top: 200px; + left: calc(50% - 200px); + z-index: 999; + width: 400px; + + #mcSettingsButtons { + position: absolute; + bottom: 15px; + right: 10px; + } + #delez { + width: 300px; + margin: 5px 10px 0px 60px; + } + form { + padding: 10px; + } + fieldset { + margin: 0px 0px 10px 0px; + border: 0; + border-top: 1px solid $blue; + } + legend { + color: $blue; + font-size: 13px; + font-weight: 500; + margin: 0; + padding: 0 10px; + } +} +/*tables list popup*/ +#div_mc_tables { + display: none; + + width: 350px; + height: 280px; + + #mc_tables_left { + margin-bottom: 10px; + } +} +#mc_tables { + cursor: pointer; + width: 99%; + height: 160px; + display: inline-block; + border: 1px solid gray; + .option { + padding: 1px; + } + .active { + background-color: $blue; + color: white; + border-bottom: 1px solid $gray; + } +} +@mixin small_popup_multicross(){ + @include popup_general(); + + display: none; + position: fixed; + left: calc(50% - 275px); + top: 40vh; + z-index: 999; + + margin: 10px; + width: 550px; + +} +/*new table popup*/ +#newMCTable { + @include small_popup_multicross(); +} +/*rename table popup*/ +#renameMCTable { + @include small_popup_multicross(); +} +/*delete table popup*/ +#deleteMCTable { + @include small_popup_multicross(); +} +.report_element_data { + table.mc_table { + float: left; + width: 100%; + } + .mc_table { + tr { + td.spr { + cursor: auto; + } + td.drophover { + background-color: $yellow !important; + } + td.empty { + display: none; + } + } + tr.last { + display: none; + } + } +} +.mc_table_legend { + clear: none; + float: right; + border-collapse: collapse; + padding: 5px 10px; + line-height: 18px; + border: 1px solid $gray; + background-color: #F9F9F7; +} diff --git a/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss b/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss index e69de29bb..3f4af6b3c 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss @@ -0,0 +1,61 @@ + +.ttest_chart_holder { + margin-left: 0px; +} +table.ttestTable { + border-top: 1px solid $gray; + border-left: 1px solid $gray; + border-spacing: 0px; + padding: 0px; + margin: 0px; + border-collapse: collapse; + table-layout: auto; + font-size: 120%; + td { + min-width: 80px; + padding: 3px; + margin: 0px; + text-align: center; + border-bottom: 1px solid $gray; + border-right: 1px solid $gray; + } + th { + min-width: 80px; + padding: 3px; + margin: 0px; + text-align: center; + border-bottom: 1px solid $gray; + border-right: 1px solid $gray; + background-color: $light-gray; + } + th.lightGreen { + background-color: $light-gray; + } + td.lightGreen { + background-color: $light-gray; + } +} +#ttestNumerusSpan { + select { + width: 220px; + } +} +#ttestSpremenljivkaSpan { + select { + width: 220px; + } +} +#ttestVariablesSpan { + background-color: $light-gray; + border: 1px solid $light-gray; + margin-bottom: 10px; + padding: 5px; + max-width: 400px; + border-radius: 4px; + -moz-border-radius: 4px 4px 4px 4px; + -webkit-border-radius: 4px; +} +#ttestVariablesSpan.active { + background-color: $yellow; + border: 1px solid $yellow; +}