diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php index d33eb9caf..f2913caaf 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php @@ -208,16 +208,9 @@ class SurveyBreak $SSH -> displayTestDataBar(true); } - /*echo '
'; - SurveyStatusProfiles::displayOnlyValidCheckbox(); - echo '
';*/ - # ali prikazujemo tabele ali grafe $this->break_charts = (isset($this->sessionData['break']['break_show_charts']) && (int)$this->sessionData['break']['break_show_charts'] == 1) ? 1 : 0; - //$this->DisplayLinks(); - //$this->DisplayFilters(); - echo '
'; $this->displayData(); echo '
'; #id="div_break_data" @@ -260,13 +253,18 @@ class SurveyBreak function displayData() { global $lang; - echo '
'; + $variables = $this->getVariableList(2); - - echo ''; - echo $lang['srv_break_label1']; - echo '
'; - echo ''; echo ''; if (count($variables)) { foreach ($variables as $variable) { @@ -279,24 +277,37 @@ class SurveyBreak . $variable['variableNaslov'] . ''; } } - echo ''; # name="breakSpremenljivka" - echo ''; + echo ''; - echo '' ; + echo '
'; + + + // Dodatne nastavitve + echo '
' ; + + echo ''.$lang['settings'].':'; + + echo ''; $this->displayLinePercent(); - $this->displayLineCharts(); // V DELU... - echo ''; + echo ''; + + echo ''; + $this->displayLineCharts(); + echo ''; + + echo '
'; - echo '
'; - echo ''; # id="break_variables" + + echo ''; + + if (isset($this->sessionData['break']['spr']) && (int)$this->sessionData['break']['spr'] > 0 && isset($this->sessionData['break']['seq']) && (int)$this->sessionData['break']['seq'] > 0) { - echo '
'; + + echo '
'; $this->doBreakForSpremenljivka(); echo '
'; # id="breakResults" - } else { - echo '
'; - } + } } /** funkcija vrne seznam primern variabel za crostabe @@ -529,10 +540,10 @@ class SurveyBreak } } } + $this->displayBreak($spr,$frequencys); - - } else { - echo '
'; + } + else { echo '

'.$lang['srv_break_error_note_1'].'

'; } } @@ -578,11 +589,8 @@ class SurveyBreak } function displayBreak($forSpr, $frequencys) { - - + ob_start(); // outer buffer - # če imamo filter spremenljivk ga izpišemo - echo '
'; # če ne uporabljamo privzetega časovnega profila izpišemo opozorilo SurveyTimeProfiles :: printIsDefaultProfile(false); @@ -596,11 +604,14 @@ class SurveyBreak # filtriranje po spremenljivkah $_FILTRED_VARIABLES = SurveyVariablesProfiles::getProfileVariables(SurveyVariablesProfiles::checkDefaultProfile(), true); + + foreach ($this->_HEADERS AS $skey => $spremenljivka) { if ((int)$spremenljivka['hide_system'] == 1 && in_array($spremenljivka['variable'],array('email','ime','priimek','telefon','naziv','drugo'))) { continue; } + $spremenljivka['id'] = $skey; $tip = $spremenljivka['tip']; if ( is_numeric($tip) @@ -614,7 +625,8 @@ class SurveyBreak ) { $this->displayBreakSpremenljivka($forSpr,$frequencys,$spremenljivka); - } else if ( is_numeric($tip) + } + else if ( is_numeric($tip) && ( $tip == 4 #text || $tip == 19 #multitext @@ -622,6 +634,7 @@ class SurveyBreak || $tip == 20 #multi numer* ) && ( count($_FILTRED_VARIABLES) == 0 || (count($_FILTRED_VARIABLES) > 0 && isset($_FILTRED_VARIABLES[$skey]) ) ) ) { + $this->displayBreakSpremenljivka($forSpr,$frequencys,$spremenljivka); } @@ -658,9 +671,10 @@ class SurveyBreak # checkbox case 2: - $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); - break; - #number + $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); + break; + + #number case 7: #ranking case 17: @@ -670,10 +684,11 @@ class SurveyBreak case 20: $this->displayBreakTableNumber($forSpr,$frequencys,$spremenljivka); break ; - + case 19: $this->displayBreakTableText($forSpr,$frequencys,$spremenljivka); break ; + #multicheck case 16: $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); @@ -683,8 +698,6 @@ class SurveyBreak case 21: # po novem besedilo izpisujemo v klasični tabeli $this->displayBreakTableText($forSpr,$frequencys,$spremenljivka); - - #$this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); break; default: @@ -731,27 +744,40 @@ class SurveyBreak # ce imamo vec kot 20 kategorij,izpisujemo samo tiste ki imajo vrednosti $displayAll = (count($options) > 20) ? false : true; - echo '
'; - if (isset($spremenljivka['double']) && $spremenljivka['double'] > 1) { + if (isset($spremenljivka['double']) && $spremenljivka['double'] > 1) { $doubleGridParts = $spremenljivka['double']; $multiply = 1; $isDoubleGrid = true; - } else { + } + else { $doubleGridParts[1]['subtitle'] = ''; $multiply = 2; $isDoubleGrid = false; } - - + # če imamo dvojno tabelo - $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.($multiply*count($sequences)).'"'; + foreach ($doubleGridParts AS $part => $doubleGridTitle) { - echo '
'; + + echo '
'; + + + // Zvezdica za vkljucitev v porocilo + echo '
'; + + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
'; + + # če ni multicheck in multi grid echo ''; + echo ''; echo ''; echo ''; @@ -864,15 +890,13 @@ class SurveyBreak } } } + echo ''; - echo '
';//$forSpremenljivka['grids'][0]['variables'] - + + echo '';//$forSpremenljivka['grids'][0]['variables'] + + echo '
'; } - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - echo '
'; } } @@ -943,11 +967,10 @@ class SurveyBreak } // Ce izrisujemo tabelo else{ - - echo '
'; - echo '
'; + # za multi number naredimo po skupinah if ($tip != 20 ) { + $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.(2*count($sequences)).'"'; @@ -955,8 +978,23 @@ class SurveyBreak if ((int)$this->break_percent > 0) { $break_percentRowSpan = ' rowspan="2"'; } + + echo '
'; + + + // Zvezdica za vkljucitev v porocilo + echo '
'; + + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
'; + + # če ni multicheck in multi grid echo ''; + echo ''; echo ''; echo ''; @@ -975,7 +1013,9 @@ class SurveyBreak echo ''; echo ''; echo ''; + echo ''; + echo ''; foreach ($spremenljivka['grids'] AS $gkey => $grid) { @@ -987,6 +1027,8 @@ class SurveyBreak } } echo ''; + + echo ''; foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { @@ -998,15 +1040,19 @@ class SurveyBreak } echo ''; + foreach ($frequencys AS $fkey => $fkeyFrequency) { foreach ($options AS $oKey => $option) { if ($displayAll || $means[$fkey][$oKey] != null) { + echo ''; + echo ''; echo $forSpremenljivka['options'][$oKey]; echo ''; $css = ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; @@ -1030,8 +1076,12 @@ class SurveyBreak } } + echo ''; + + if ((int)$this->break_percent) { + echo ''; foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { @@ -1049,13 +1099,17 @@ class SurveyBreak } } + echo ''; } } } } + + #dodamo še skupno sumo in povprečje echo ''; + echo ''; @@ -1076,44 +1130,59 @@ class SurveyBreak } } - } + echo ''; + echo '
'; echo $lang[''].'Skupaj'; echo '
'; - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - - #xxxxx - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - - } else if ($tip == 20){ + echo '
'; + } + else if ($tip == 20){ + # za multi number razdelimo na grupe - skupine $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.(2*count($spremenljivka['grids'][0]['variables'])).'"'; + + foreach ($spremenljivka['grids'] AS $gkey => $grid) { // Ce smo v porocilu po meri in ni prava tabela jo preskocimo if(isset($spremenljivka['break_sub_table']['key']) && $spremenljivka['break_sub_table']['key'] != $gkey){ continue; } + + echo '
'; + + echo '
'; + // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
'.$lang['srv_break_table_for']; + echo '
'; + + echo $lang['srv_break_table_for']; echo $spremenljivka['naslov'].' ('; echo $spremenljivka['variable'].') = '; echo $grid['naslov']; echo ' ('.$grid['variable'].')'; - echo ''; + + echo '
'; } + + // Zvezdica za vkljucitev v porocilo + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
'; + echo ''; + #labele echo ''; + echo ''; echo ''; echo ''; @@ -1132,9 +1201,13 @@ class SurveyBreak echo ''; echo ''; echo ''; + echo''; + + #labele echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { echo ''; } echo ''; + + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { echo ''; echo ''; } + echo ''; + + $cnt=0; foreach ($frequencys AS $fkey => $fkeyFrequency) { $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov']; @@ -1187,8 +1266,11 @@ class SurveyBreak } } } + + #dodamo še skupno sumo in povprečje echo ''; + echo ''; @@ -1206,27 +1288,21 @@ class SurveyBreak echo ''; } } + echo ''; + echo '
'; echo $variable['naslov']; @@ -1142,14 +1215,20 @@ class SurveyBreak echo '
Povprečje'.$lang['']; echo 'Št. enot'.$lang['']; echo '
'; echo 'Skupaj'; echo '
'; - - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - echo '
'; + + echo '
'; } - - } - echo '
'; - } - + } + } } + #text - 21: + #multi text - 19: function displayBreakTableText($forSpr,$frequencys,$spremenljivka){ - #text - 21: - #multi text - 19: + $keysCount = count($frequencys); $sequences = explode('_',$spremenljivka['sequences']); $forSpremenljivka = $this->_HEADERS[$forSpr]; @@ -1238,6 +1314,7 @@ class SurveyBreak $totalFreq = array(); $forSequences = array(); $cnt = array(); + foreach ($frequencys AS $fkey => $fkeyFrequency) { $forSequences[] = $fkey; foreach ($forSpremenljivka['options'] AS $oKey => $option) { @@ -1252,119 +1329,127 @@ class SurveyBreak } # če imamo več kot 20 kategorij,izpisujemo samo tiste ki imajo vrednosti - $displayAll = (count($forSpremenljivka['options']) > 20) ? false : true; - - echo '
'; - echo '
'; - # za multi text razdelimo na grupe - skupine - $rowspan = ' rowspan="2"'; - $colspan = ' colspan="'.(count($spremenljivka['grids'][0]['variables'])).'"'; - foreach ($spremenljivka['grids'] AS $gkey => $grid) { - - // Ce smo v porocilu po meri in ni prava tabela jo preskocimo - if(isset($spremenljivka['break_sub_table']['sequence']) && $spremenljivka['break_sub_table']['key'] != $gkey){ - continue; - } - - // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova - if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
'; - if($tip != '21'){ - echo ''; - echo $lang['srv_break_table_for']; - echo $spremenljivka['naslov'].' ('; - echo $spremenljivka['variable'].') = '; - echo $grid['naslov']; - echo ' ('.$grid['variable'].')'; - echo ''; - } - } - - echo ''; - #labele - echo ''; - echo ''; - echo ''; - echo ''; - echo $forSpremenljivka['naslov']; - echo '('.$forSpremenljivka['variable'].')'; - echo ''; - echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; - echo $spremenljivka['naslov']. ' - '; - echo $grid['naslov']; - echo '('.$grid['variable'].')'; - echo ''; - echo ''; - echo ''; - echo''; - #labele - echo ''; - foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; - } - echo ''; - $cntCbx= 0; - foreach ($forSequences AS $fKey => $forSequence) { - $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov']; - $cntCbx++; - foreach ($forSpremenljivka['options'] AS $oKey => $option) { - if ($displayAll || $texts[$forSequence][$oKey] != null) { - if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) { - echo ''; - echo ''; - if ($forSpremenljivka['tip'] == 2) { - echo $cbxLabel; - } else { - echo $forSpremenljivka['options'][$oKey]; - } - echo ''; - foreach ($grid['variables'] AS $vkey => $variable) { - $sequence = $variable['sequence']; - #povprečje - echo ''; - - } - echo ''; - } - } - } - } - echo '
'; - echo $variable['naslov']; - echo '('.$variable['variable'].')'; - echo '('.$variable['sequence'].')'; - echo '
'; - if (count($texts[$forSequence][$oKey][$sequence]) > 0) { - $cnt=1; - $count = count($texts[$forSequence][$oKey][$sequence]); - foreach ($texts[$forSequence][$oKey][$sequence] AS $ky => $units) { - echo '
'; - echo $units['text']; - echo '
'; - $cnt++; - } - } - - - #echo $this->formatNumber($texts[$oKey][$sequence],$this->num_digit_average,''); - echo '
'; - - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - echo '
'; - } + $displayAll = (count($forSpremenljivka['options']) > 20) ? false : true; + + # za multi text razdelimo na grupe - skupine + $rowspan = ' rowspan="2"'; + $colspan = ' colspan="'.(count($spremenljivka['grids'][0]['variables'])).'"'; + + + foreach ($spremenljivka['grids'] AS $gkey => $grid) { + + // Ce smo v porocilu po meri in ni prava tabela jo preskocimo + if(isset($spremenljivka['break_sub_table']['sequence']) && $spremenljivka['break_sub_table']['key'] != $gkey){ + continue; + } + + echo '
'; + + + echo '
'; + + // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova + if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
'; - + if($tip != '21'){ + echo '
'; + + echo $lang['srv_break_table_for']; + echo $spremenljivka['naslov'].' ('; + echo $spremenljivka['variable'].') = '; + echo $grid['naslov']; + echo ' ('.$grid['variable'].')'; + + echo '
'; + } + } + + // Zvezdica za vkljucitev v porocilo + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
'; + + + echo ''; + + #labele + echo ''; + echo ''; + echo ''; + echo ''; + echo $forSpremenljivka['naslov']; + echo '('.$forSpremenljivka['variable'].')'; + echo ''; + echo ''; + echo ''; + + echo ''; + echo ''; + echo ''; + echo $spremenljivka['naslov']. ' - '; + echo $grid['naslov']; + echo '('.$grid['variable'].')'; + echo ''; + echo ''; + echo ''; + echo''; + #labele + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { + echo ''; + } + echo ''; + $cntCbx= 0; + foreach ($forSequences AS $fKey => $forSequence) { + $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov']; + $cntCbx++; + foreach ($forSpremenljivka['options'] AS $oKey => $option) { + if ($displayAll || $texts[$forSequence][$oKey] != null) { + if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) { + echo ''; + echo ''; + if ($forSpremenljivka['tip'] == 2) { + echo $cbxLabel; + } else { + echo $forSpremenljivka['options'][$oKey]; + } + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { + $sequence = $variable['sequence']; + #povprečje + echo ''; + + } + echo ''; + } + } + } + } + + echo '
'; + echo $variable['naslov']; + echo '('.$variable['variable'].')'; + echo '('.$variable['sequence'].')'; + echo '
'; + if (count($texts[$forSequence][$oKey][$sequence]) > 0) { + $cnt=1; + $count = count($texts[$forSequence][$oKey][$sequence]); + foreach ($texts[$forSequence][$oKey][$sequence] AS $ky => $units) { + echo '
'; + echo $units['text']; + echo '
'; + $cnt++; + } + } + + + #echo $this->formatNumber($texts[$oKey][$sequence],$this->num_digit_average,''); + echo '
'; + + echo '
'; + } } function displayCrosstabTable($forSpr,$frequencys,$spremenljivka){ @@ -1410,14 +1495,18 @@ class SurveyBreak // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova if(!isset($spremenljivka['break_sub_table']['sequence']) && ($spremenljivka['tip'] == 16 || $spremenljivka['tip'] == 6) && $this->break_charts != 1){ - echo '
'.$lang['srv_break_table_for']; + + echo '
'; + + echo $lang['srv_break_table_for']; echo $spremenljivka['naslov'].' ('; echo $spremenljivka['variable'].') = '; echo $grid['naslov']; if ($spremenljivka['tip'] != 6) { echo ' ('.$grid['variable'].')'; } - echo ''; + + echo '
'; } $seq2 = $grid['variables'][0]['sequence']; @@ -1439,11 +1528,9 @@ class SurveyBreak $this->SurveyCrosstab->setVariables($seq1,$spr1,$grd1,$seq2,$spr2,$grd2); $this->SurveyCrosstab->displayCrosstabsTable(); } - - echo '
'; } - } + function getMeansFromKey($frequencys) { $sum = 0; if (count($frequencys['valid']) > 0) { @@ -1566,18 +1653,19 @@ class SurveyBreak function displayLinePercent() { global $lang; - echo ''; + + echo 'break_percent == 1 ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ''; } function displayLineCharts() { global $lang; - echo ''; - - echo ' '; - echo ' '; - - echo ''; + echo 'break_charts == 0 ? ' checked="checked" ' : '').' onClick="change_break_charts(this.value)" />'; + echo ''; + + echo 'break_charts == 1 ? ' checked="checked" ' : '').' onClick="change_break_charts(this.value)" />'; + echo ''; } + } \ No newline at end of file diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php index 1f7c311de..259713ac0 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php @@ -747,9 +747,11 @@ class SurveyCrosstabs { global $admin_type; if ($this->getSelectedVariables(1) !== null && $this->getSelectedVariables(2) !== null) { + $variables1 = $this->getSelectedVariables(2); $variables2 = $this->getSelectedVariables(1); $counter = 0; + foreach ($variables1 AS $v_first) { foreach ($variables2 AS $v_second) { @@ -781,19 +783,22 @@ class SurveyCrosstabs { $numColumnPercent = $this->crossChk1 + $this->crossChk2 + $this->crossChk3; $numColumnResidual = $this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR; $tblColumn = max($numColumnPercent,$numColumnResidual); - } else if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { + } + else if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { # imamo samo procente $rowSpan = 2; $numColumnPercent = $this->crossChk1 + $this->crossChk2 + $this->crossChk3; $numColumnResidual = 1; $tblColumn = $numColumnPercent; - } else if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { + } + else if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { # imamo samo residuale $rowSpan = 2; $numColumnPercent = 1; $numColumnResidual = $this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR; $tblColumn = $numColumnResidual; - } else { + } + else { #prikazujemo samo podatke $rowSpan = 1; $numColumnPercent = 1; diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 73a180414..1d597cde5 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5101,6 +5101,10 @@ p, span { cursor: pointer; } +.avg { + text-decoration: overline; +} + /* Only layout styles - position, display, max-width... */ @@ -15508,6 +15512,7 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data .div_analiza_holder, #div_means_data .div_analiza_holder, +#div_break_data .div_analiza_holder, #ttestResults .div_analiza_holder { display: flex; flex-direction: column; @@ -15516,6 +15521,7 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data .div_analiza_holder .analiza_table_top_settings, #div_means_data .div_analiza_holder .analiza_table_top_settings, +#div_break_data .div_analiza_holder .analiza_table_top_settings, #ttestResults .div_analiza_holder .analiza_table_top_settings { display: flex; align-items: center; @@ -15526,45 +15532,53 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons, #div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons, +#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons, #ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_icons { opacity: 0; filter: alpha(opacity=0); } #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before, #div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before, +#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before, #ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before { font-size: 20px; } #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .print_small:before, #div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .print_small:before, +#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .print_small:before, #ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .print_small:before { cursor: pointer; color: #1E88E5; } #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale, #div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale, +#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale, #ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_scale { opacity: 0; filter: alpha(opacity=0); } #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a, #div_means_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a, +#div_break_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a, #ttestResults .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a { text-decoration: none; } #div_analiza_data .div_analiza_holder .div_other_text, #div_means_data .div_analiza_holder .div_other_text, +#div_break_data .div_analiza_holder .div_other_text, #ttestResults .div_analiza_holder .div_other_text { margin-top: 32px; } #div_analiza_data table, #div_means_data table, +#div_break_data table, #ttestResults table { width: 100%; margin: 0; } #div_analiza_data table tr, #div_means_data table tr, +#div_break_data table tr, #ttestResults table tr { height: auto; } @@ -15572,6 +15586,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td, #div_means_data table tr th, #div_means_data table tr td, +#div_break_data table tr th, +#div_break_data table tr td, #ttestResults table tr th, #ttestResults table tr td { box-sizing: border-box; @@ -15586,6 +15602,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td span, #div_means_data table tr th span, #div_means_data table tr td span, +#div_break_data table tr th span, +#div_break_data table tr td span, #ttestResults table tr th span, #ttestResults table tr td span { font-size: 14px; @@ -15604,6 +15622,14 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.img_analysis_p a, #div_means_data table tr td span.img_analysis_f a, #div_means_data table tr td span.img_analysis_f_p a, +#div_break_data table tr th span.span_navedbe a, +#div_break_data table tr th span.img_analysis_p a, +#div_break_data table tr th span.img_analysis_f a, +#div_break_data table tr th span.img_analysis_f_p a, +#div_break_data table tr td span.span_navedbe a, +#div_break_data table tr td span.img_analysis_p a, +#div_break_data table tr td span.img_analysis_f a, +#div_break_data table tr td span.img_analysis_f_p a, #ttestResults table tr th span.span_navedbe a, #ttestResults table tr th span.img_analysis_p a, #ttestResults table tr th span.img_analysis_f a, @@ -15628,6 +15654,14 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.img_analysis_p a span, #div_means_data table tr td span.img_analysis_f a span, #div_means_data table tr td span.img_analysis_f_p a span, +#div_break_data table tr th span.span_navedbe a span, +#div_break_data table tr th span.img_analysis_p a span, +#div_break_data table tr th span.img_analysis_f a span, +#div_break_data table tr th span.img_analysis_f_p a span, +#div_break_data table tr td span.span_navedbe a span, +#div_break_data table tr td span.img_analysis_p a span, +#div_break_data table tr td span.img_analysis_f a span, +#div_break_data table tr td span.img_analysis_f_p a span, #ttestResults table tr th span.span_navedbe a span, #ttestResults table tr th span.img_analysis_p a span, #ttestResults table tr th span.img_analysis_f a span, @@ -15651,6 +15685,14 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.img_analysis_p a span.blue, #div_means_data table tr td span.img_analysis_f a span.blue, #div_means_data table tr td span.img_analysis_f_p a span.blue, +#div_break_data table tr th span.span_navedbe a span.blue, +#div_break_data table tr th span.img_analysis_p a span.blue, +#div_break_data table tr th span.img_analysis_f a span.blue, +#div_break_data table tr th span.img_analysis_f_p a span.blue, +#div_break_data table tr td span.span_navedbe a span.blue, +#div_break_data table tr td span.img_analysis_p a span.blue, +#div_break_data table tr td span.img_analysis_f a span.blue, +#div_break_data table tr td span.img_analysis_f_p a span.blue, #ttestResults table tr th span.span_navedbe a span.blue, #ttestResults table tr th span.img_analysis_p a span.blue, #ttestResults table tr th span.img_analysis_f a span.blue, @@ -15674,6 +15716,14 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.img_analysis_p a span.active, #div_means_data table tr td span.img_analysis_f a span.active, #div_means_data table tr td span.img_analysis_f_p a span.active, +#div_break_data table tr th span.span_navedbe a span.active, +#div_break_data table tr th span.img_analysis_p a span.active, +#div_break_data table tr th span.img_analysis_f a span.active, +#div_break_data table tr th span.img_analysis_f_p a span.active, +#div_break_data table tr td span.span_navedbe a span.active, +#div_break_data table tr td span.img_analysis_p a span.active, +#div_break_data table tr td span.img_analysis_f a span.active, +#div_break_data table tr td span.img_analysis_f_p a span.active, #ttestResults table tr th span.span_navedbe a span.active, #ttestResults table tr th span.img_analysis_p a span.active, #ttestResults table tr th span.img_analysis_f a span.active, @@ -15688,6 +15738,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_icons, #div_means_data table tr th.cell_icons, #div_means_data table tr td.cell_icons, +#div_break_data table tr th.cell_icons, +#div_break_data table tr td.cell_icons, #ttestResults table tr th.cell_icons, #ttestResults table tr td.cell_icons { width: 110px; @@ -15697,6 +15749,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_var, #div_means_data table tr th.cell_var, #div_means_data table tr td.cell_var, +#div_break_data table tr th.cell_var, +#div_break_data table tr td.cell_var, #ttestResults table tr th.cell_var, #ttestResults table tr td.cell_var { width: 110px; @@ -15707,6 +15761,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_var a, #div_means_data table tr th.cell_var a, #div_means_data table tr td.cell_var a, +#div_break_data table tr th.cell_var a, +#div_break_data table tr td.cell_var a, #ttestResults table tr th.cell_var a, #ttestResults table tr td.cell_var a { color: #333333; @@ -15716,6 +15772,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_question, #div_means_data table tr th.cell_question, #div_means_data table tr td.cell_question, +#div_break_data table tr th.cell_question, +#div_break_data table tr td.cell_question, #ttestResults table tr th.cell_question, #ttestResults table tr td.cell_question { width: auto; @@ -15725,6 +15783,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_subquestion, #div_means_data table tr th.cell_subquestion, #div_means_data table tr td.cell_subquestion, +#div_break_data table tr th.cell_subquestion, +#div_break_data table tr td.cell_subquestion, #ttestResults table tr th.cell_subquestion, #ttestResults table tr td.cell_subquestion { width: 260px; @@ -15733,6 +15793,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_info, #div_means_data table tr th.cell_info, #div_means_data table tr td.cell_info, +#div_break_data table tr th.cell_info, +#div_break_data table tr td.cell_info, #ttestResults table tr th.cell_info, #ttestResults table tr td.cell_info { width: 115px; @@ -15742,6 +15804,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_value, #div_means_data table tr th.cell_value, #div_means_data table tr td.cell_value, +#div_break_data table tr th.cell_value, +#div_break_data table tr td.cell_value, #ttestResults table tr th.cell_value, #ttestResults table tr td.cell_value { width: 115px; @@ -15751,6 +15815,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_noVerBorder, #div_means_data table tr th.cell_noVerBorder, #div_means_data table tr td.cell_noVerBorder, +#div_break_data table tr th.cell_noVerBorder, +#div_break_data table tr td.cell_noVerBorder, #ttestResults table tr th.cell_noVerBorder, #ttestResults table tr td.cell_noVerBorder { border-top: 0 !important; @@ -15760,6 +15826,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_noBorder, #div_means_data table tr th.cell_noBorder, #div_means_data table tr td.cell_noBorder, +#div_break_data table tr th.cell_noBorder, +#div_break_data table tr td.cell_noBorder, #ttestResults table tr th.cell_noBorder, #ttestResults table tr td.cell_noBorder { border: 0 !important; @@ -15768,6 +15836,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_empty, #div_means_data table tr th.cell_empty, #div_means_data table tr td.cell_empty, +#div_break_data table tr th.cell_empty, +#div_break_data table tr td.cell_empty, #ttestResults table tr th.cell_empty, #ttestResults table tr td.cell_empty { background-color: #FFFFFF !important; @@ -15777,6 +15847,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_space, #div_means_data table tr th.cell_space, #div_means_data table tr td.cell_space, +#div_break_data table tr th.cell_space, +#div_break_data table tr td.cell_space, #ttestResults table tr th.cell_space, #ttestResults table tr td.cell_space { padding: 0; @@ -15788,6 +15860,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td.cell_noPadding, #div_means_data table tr th.cell_noPadding, #div_means_data table tr td.cell_noPadding, +#div_break_data table tr th.cell_noPadding, +#div_break_data table tr td.cell_noPadding, #ttestResults table tr th.cell_noPadding, #ttestResults table tr td.cell_noPadding { padding: 0 !important; @@ -15796,6 +15870,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td table.cell_table, #div_means_data table tr th table.cell_table, #div_means_data table tr td table.cell_table, +#div_break_data table tr th table.cell_table, +#div_break_data table tr td table.cell_table, #ttestResults table tr th table.cell_table, #ttestResults table tr td table.cell_table { width: 100%; @@ -15804,6 +15880,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td table.cell_table tr td, #div_means_data table tr th table.cell_table tr td, #div_means_data table tr td table.cell_table tr td, +#div_break_data table tr th table.cell_table tr td, +#div_break_data table tr td table.cell_table tr td, #ttestResults table tr th table.cell_table tr td, #ttestResults table tr td table.cell_table tr td { padding: 4px 16px; @@ -15814,6 +15892,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr td table.cell_table tr:first-of-type td, #div_means_data table tr th table.cell_table tr:first-of-type td, #div_means_data table tr td table.cell_table tr:first-of-type td, +#div_break_data table tr th table.cell_table tr:first-of-type td, +#div_break_data table tr td table.cell_table tr:first-of-type td, #ttestResults table tr th table.cell_table tr:first-of-type td, #ttestResults table tr td table.cell_table tr:first-of-type td { border-bottom: 1px #E5E5E5 dashed; @@ -15822,6 +15902,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row1 td, #div_means_data table tr.row1 th, #div_means_data table tr.row1 td, +#div_break_data table tr.row1 th, +#div_break_data table tr.row1 td, #ttestResults table tr.row1 th, #ttestResults table tr.row1 td { font-size: 16px; @@ -15833,6 +15915,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row1 td span, #div_means_data table tr.row1 th span, #div_means_data table tr.row1 td span, +#div_break_data table tr.row1 th span, +#div_break_data table tr.row1 td span, #ttestResults table tr.row1 th span, #ttestResults table tr.row1 td span { font-size: 16px; @@ -15843,6 +15927,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 td, #div_means_data table tr.row2 th, #div_means_data table tr.row2 td, +#div_break_data table tr.row2 th, +#div_break_data table tr.row2 td, #ttestResults table tr.row2 th, #ttestResults table tr.row2 td { font-size: 15px; @@ -15854,6 +15940,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 td span, #div_means_data table tr.row2 th span, #div_means_data table tr.row2 td span, +#div_break_data table tr.row2 th span, +#div_break_data table tr.row2 td span, #ttestResults table tr.row2 th span, #ttestResults table tr.row2 td span { font-size: 15px; @@ -15864,6 +15952,8 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 td.cell_value, #div_means_data table tr.row2 th.cell_value, #div_means_data table tr.row2 td.cell_value, +#div_break_data table tr.row2 th.cell_value, +#div_break_data table tr.row2 td.cell_value, #ttestResults table tr.row2 th.cell_value, #ttestResults table tr.row2 td.cell_value { text-align: right; @@ -15876,6 +15966,10 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr.row3 td, #div_means_data table tr.row4 th, #div_means_data table tr.row4 td, +#div_break_data table tr.row3 th, +#div_break_data table tr.row3 td, +#div_break_data table tr.row4 th, +#div_break_data table tr.row4 td, #ttestResults table tr.row3 th, #ttestResults table tr.row3 td, #ttestResults table tr.row4 th, @@ -15889,6 +15983,10 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr.row3 td.cell_grid, #div_means_data table tr.row4 th.cell_grid, #div_means_data table tr.row4 td.cell_grid, +#div_break_data table tr.row3 th.cell_grid, +#div_break_data table tr.row3 td.cell_grid, +#div_break_data table tr.row4 th.cell_grid, +#div_break_data table tr.row4 td.cell_grid, #ttestResults table tr.row3 th.cell_grid, #ttestResults table tr.row3 td.cell_grid, #ttestResults table tr.row4 th.cell_grid, @@ -15901,32 +15999,38 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data table tr.row_question td, #div_means_data table tr.row_question td, +#div_break_data table tr.row_question td, #ttestResults table tr.row_question td { font-weight: 600; background-color: #F2F2F2; } #div_analiza_data table tr.row_missing td, #div_means_data table tr.row_missing td, +#div_break_data table tr.row_missing td, #ttestResults table tr.row_missing td { background: rgba(255, 199, 0, 0.05); } #div_analiza_data table tr.row_missing.row_sum td, #div_means_data table tr.row_missing.row_sum td, +#div_break_data table tr.row_missing.row_sum td, #ttestResults table tr.row_missing.row_sum td { background: rgba(255, 199, 0, 0.05); } #div_analiza_data table tr.row_sum td, #div_means_data table tr.row_sum td, +#div_break_data table tr.row_sum td, #ttestResults table tr.row_sum td { background: rgba(255, 199, 0, 0.05); } #div_analiza_data table tr.row_sum td.cell_missing, #div_means_data table tr.row_sum td.cell_missing, +#div_break_data table tr.row_sum td.cell_missing, #ttestResults table tr.row_sum td.cell_missing { text-align: center; } #div_analiza_data table tr.row_sum td.cell_missing span, #div_means_data table tr.row_sum td.cell_missing span, +#div_break_data table tr.row_sum td.cell_missing span, #ttestResults table tr.row_sum td.cell_missing span { cursor: pointer; color: #1E88E5; @@ -15934,41 +16038,49 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data table tr.row_sum td.cell_missing span:hover, #div_means_data table tr.row_sum td.cell_missing span:hover, +#div_break_data table tr.row_sum td.cell_missing span:hover, #ttestResults table tr.row_sum td.cell_missing span:hover { color: #0059ab; } #div_analiza_data table tr.row_sum td.cell_missing span:hover .faicon:before, #div_means_data table tr.row_sum td.cell_missing span:hover .faicon:before, +#div_break_data table tr.row_sum td.cell_missing span:hover .faicon:before, #ttestResults table tr.row_sum td.cell_missing span:hover .faicon:before { color: #0059ab; } #div_analiza_data table tr.row_sum td.cell_missing span .faicon, #div_means_data table tr.row_sum td.cell_missing span .faicon, +#div_break_data table tr.row_sum td.cell_missing span .faicon, #ttestResults table tr.row_sum td.cell_missing span .faicon { margin-right: 8px; } #div_analiza_data table tr.row_sum td.cell_missing span .faicon:before, #div_means_data table tr.row_sum td.cell_missing span .faicon:before, +#div_break_data table tr.row_sum td.cell_missing span .faicon:before, #ttestResults table tr.row_sum td.cell_missing span .faicon:before { font-size: 12px; } #div_analiza_data table tr.row_sum_all td, #div_means_data table tr.row_sum_all td, +#div_break_data table tr.row_sum_all td, #ttestResults table tr.row_sum_all td { background: rgba(255, 199, 0, 0.1); } #div_analiza_data table tr.row_sum_all td.cell_var, #div_means_data table tr.row_sum_all td.cell_var, +#div_break_data table tr.row_sum_all td.cell_var, #ttestResults table tr.row_sum_all td.cell_var { border-right: 0; } #div_analiza_data table tr.row_sum_all td.cell_question, #div_means_data table tr.row_sum_all td.cell_question, +#div_break_data table tr.row_sum_all td.cell_question, #ttestResults table tr.row_sum_all td.cell_question { border-left: 0; } #div_analiza_data table tr.row_bottom td, #div_means_data table tr.row_bottom td, +#div_break_data table tr.row_bottom td, #ttestResults table tr.row_bottom td { background-color: #F8F8F8; } @@ -17021,51 +17133,54 @@ iframe#ifmcontentstoprint { text-align: center; } -.break_chart_holder { - margin: 30px 0 30px 0; +#break_variables { + display: flex; + justify-content: center; +} +#break_variables .title { + margin-bottom: 4px; +} +#break_variables .breakDropdownHolder { + display: flex; + flex-direction: column; + margin-right: 64px; +} +#break_variables .breakDropdownHolder button { + width: 190px; + margin-top: 16px; +} +#break_variables .breakSubSetting { + display: flex; + flex-direction: column; +} +#break_variables .breakSubSetting .setting_line { + margin-bottom: 6px; } -.avg { - text-decoration: overline; +#breakResults { + margin-top: 64px; } - -#breakSpremenljivkaSpan select { - width: 220px; +#breakResults #crosstab_legend { + display: none; } - -div.breakTableDiv { - margin-top: 10px; +#breakResults .table_holder { + margin-bottom: 64px; } -div.breakTableDiv table { - border-top: 1px solid #E5E5E5; - border-left: 1px solid #E5E5E5; - border-collapse: collapse; - border-spacing: 0; - text-align: center; +#breakResults .tableChart { + margin: 0 auto 16px auto; } -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; +#breakResults .table_title { + position: absolute; + font-size: 16px; + font-weight: 600; } -div.breakTableDiv table td { - border-right: 1px solid #E5E5E5; - border-bottom: 1px solid #E5E5E5; - padding: 5px; - min-width: 70px; - font-weight: normal; +#breakResults .custom_report_include { + display: flex; + justify-content: flex-end; + margin-bottom: 8px; } -div.breakTableDiv table th.sub { - background-color: #F8F8F8; -} -div.breakTableDiv table th.strong { - font-weight: bold; -} -div.breakTableDiv table td.strong { - font-weight: bold; +#breakResults .custom_report_include a { + text-decoration: none; } /*editing chart labels in popup*/ diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index 0fcb9d6d4..9034fd8b6 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -46,4 +46,8 @@ p,span { .pointer { cursor: pointer; +} + +.avg { + text-decoration: overline; } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss index b2bab620b..0d3615dae 100644 --- a/resources/sass/admin_new/pages/survey_analysis/basic.scss +++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss @@ -1,5 +1,6 @@ #div_analiza_data, #div_means_data, +#div_break_data, #ttestResults{ .div_analiza_holder { 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 a9b696b6e..8edd2aab9 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_break.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_break.scss @@ -1,46 +1,65 @@ -.break_chart_holder { - margin: 30px 0 30px 0; + +#break_variables{ + display: flex; + justify-content: center; + + .title{ + margin-bottom: 4px; + } + + .breakDropdownHolder{ + display: flex; + flex-direction: column; + + margin-right: 64px; + + button{ + width: 190px; + margin-top: 16px; + } + } + + .breakSubSetting{ + display: flex; + flex-direction: column; + + .setting_line{ + margin-bottom: 6px; + } + } } -.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; - } - } + +#breakResults{ + margin-top: 64px; + + #crosstab_legend{ + display: none; + } + + .table_holder{ + margin-bottom: 64px; + } + + .tableChart{ + margin: 0 auto 16px auto; + } + + .table_title{ + position: absolute; + + font-size: 16px; + font-weight: 600; + } + + .custom_report_include{ + display: flex; + justify-content: flex-end; + + margin-bottom: 8px; + + a{ + text-decoration: none; + } + } }