From 36f0e9aec56666c24d00a296ba65cd7be9d42b83 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 4 Feb 2022 11:20:34 +0100 Subject: [PATCH] Redesign - analize - ttest --- .../surveyAnalysis/class.SurveyTTest.php | 230 ++++++----- admin/survey/script/ttest.js | 10 +- public/css/admin_new.css | 374 ++++++++++++------ .../pages/survey_analysis/basic.scss | 3 +- .../pages/survey_analysis/page_means.scss | 29 +- .../pages/survey_analysis/page_ttest.scss | 197 ++++++--- 6 files changed, 541 insertions(+), 302 deletions(-) diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php index 3314c6bee..27b27ac3d 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyTTest.php @@ -168,17 +168,11 @@ class SurveyTTest $SSH = new SurveyStaticHtml($this->sid); $SSH -> displayTestDataBar(true); } - - /*echo '
'; - SurveyStatusProfiles::displayOnlyValidCheckbox(); - echo '
';*/ - - //$this->DisplayLinks(); - + echo '
'; $this->DisplayVariables(); echo '
'; # id="ttest_variables" - echo '
'; + echo '
'; $this->variableChange(); echo '
'; # id="ttestResults" @@ -273,11 +267,12 @@ class SurveyTTest $variables = $this->getVariableList(2); - echo ''; - echo $lang['srv_ttest_label1']; - echo '
'; - echo ''; echo ''; if (count($variables)) { foreach ($variables as $variable) { @@ -292,8 +287,8 @@ class SurveyTTest .$variable['variableNaslov'] . ''; } } - echo ''; # name="ttestSpremenljivka" - echo '

'; + echo ''; + #.(count($this->sessionData['ttest']['sub_conditions']) == 2?'':'class="active"'). $_active = $this->checkSubConditionsActive(); if ($this->sessionData['ttest']['spr2'] > 0) { @@ -303,14 +298,17 @@ class SurveyTTest } else { echo ''; } - echo ''; + + echo ''; + $cntSubConditionsActive = $this->checkSubConditionsActive(); - echo ' '; - echo ''; #gray - echo $lang['srv_ttest_label2']; - echo '
'; - echo ''; # echo ''; if (count($numerus)) { foreach ($numerus as $variable) { @@ -325,16 +323,27 @@ class SurveyTTest . $variable['variableNaslov'] . ''; } } - echo ''; # name="ttestSpremenljivka" - echo ''; + echo ''; + + echo ''; + - echo '
'; - echo ''; + echo '
'; + + echo ''.$lang['settings'].':'; + + echo ''; + echo ' sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'>'; echo ''; - echo ''; - echo $lang['srv_ttest_interpretacija_note']; - echo ''; + + echo ''; + echo ' '; + echo $lang['srv_ttest_interpretacija_note']; + echo ' '; echo Help::display('srv_ttest_interpretation'); + echo ''; + + echo '
'; // Shranimo spremenjene nastavitve v bazo @@ -539,16 +548,17 @@ class SurveyTTest if (isset($this->sessionData['ttest']['spr2']) && $this->sessionData['ttest']['spr2'] != 0){ $_spr = explode('_',$this->sessionData['ttest']['spr2']); - #$spr = $_spr[0]; $spr = $this->sessionData['ttest']['spr2']; if (isset($this->sessionData['ttest']['grid2'])){ $grid = $this->sessionData['ttest']['grid2']; } + # poiščemo pripadajoče variable $_spr_data = $this->_HEADERS[$this->sessionData['ttest']['spr2']]; - echo $lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov']; - echo '
'; + + echo ''.$lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov'].''; + switch ($_spr_data['tip']) { case 1: #radio case 3: #dropdown @@ -556,31 +566,42 @@ class SurveyTTest #nardimo inpute za vse opcije $sekvenca = $_spr_data['sequences']; foreach ($_spr_data['options'] as $value => $option) { - echo '
'; + echo ''; + echo ' checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>'; + echo ' '; + echo ''; } break; - case 2: #checkbox + case 2: #checkbox #nardimo inpute za vse opcije $option = '1'; foreach ($_spr_data['grids'][0]['variables'] as $vid => $variable) { - echo '
'; + echo ''; + echo ' checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>'; + echo ' '; + echo ''; } break; - case 6: #mgrid + case 6: #mgrid #nardimo inpute za vse opcije $sekvenca = $this->sessionData['ttest']['seq2']; foreach ($_spr_data['options'] as $value => $option) { - //$sekvenca = $_spr_data['grids'][$value]['variables'][0]['sequence']; - echo '
'; + echo ''; + echo ' checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>'; + echo ' '; + echo ''; } break; - case 16: #mcheck + case 16: #mcheck #nardimo inpute za vse opcije # poiščemo pripadajočo sekvenco #nardimo inpute za vse opcije $option = '1'; foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) { - echo '
'; + echo ''; + echo ' checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>'; + echo ' '; + echo ''; } break; @@ -608,17 +629,13 @@ class SurveyTTest if (count($this->sessionData['ttest']['sub_conditions']) > 1 ) { $variables1 = $this->getSelectedVariables(); if (count($variables1) > 0) { + // ikone za izvoz $this->displayExport(); + foreach ($variables1 AS $v_first) { - $ttest = null; - /*$ttest = $this->createTTestOld($v_first, $this->sessionData['ttest']['sub_conditions']); - $this->displayTtestTable($ttest);*/ - $ttest = $this->createTTest($v_first, $this->sessionData['ttest']['sub_conditions']); - $this->displayTtestTable($ttest); - - // Zvezdica za vkljucitev v porocilo + // Zvezdica za vkljucitev v porocilo $spid1 = $this->sessionData['ttest']['variabla'][0]['spr']; $seq1 = $this->sessionData['ttest']['variabla'][0]['seq']; $grid1 = $this->sessionData['ttest']['variabla'][0]['grd']; @@ -632,6 +649,11 @@ class SurveyTTest $spr1 = $seq2.'-'.$spid2.'-'.$grid2.'-'.$sub1.'-'.$sub2; $spr2 = $seq1.'-'.$spid1.'-'.$grid1; SurveyAnalysis::addCustomReportElement($type=7, $sub_type=0, $spr1, $spr2); + + // Tabela + $ttest = null; + $ttest = $this->createTTest($v_first, $this->sessionData['ttest']['sub_conditions']); + $this->displayTtestTable($ttest); // Izrisemo graf za tabelo if(isset($this->sessionData['ttest_charts']['showChart']) && $this->sessionData['ttest_charts']['showChart'] == true){ @@ -995,22 +1017,28 @@ class SurveyTTest $grid1 = $this->sessionData['ttest']['variabla'][0]['grd']; if (is_array($ttest) && count($ttest) > 0 && (int)$seq1 > 0) { + if ($this->isArchive == false) { + echo '
'; + # če ne uporabljamo privzetega časovnega profila izpišemo opozorilo SurveyTimeProfiles :: printIsDefaultProfile(); - # če imamo filter ifov ga izpišemo + + # če imamo filter ifov ga izpišemo SurveyConditionProfiles:: getConditionString($doNewLine ); - # če imamo filter spremenljivk ga izpišemo + + # če imamo filter spremenljivk ga izpišemo SurveyVariablesProfiles:: getProfileString($doNewLine, true); SurveyDataSettingProfiles :: getVariableTypeNote($doNewLine ); - # če rekodiranje + + # če rekodiranje $SR = new SurveyRecoding($this->sid); $SR -> getProfileString(); + echo '
'; - - echo '
'; } + $spr_data_1 = $this->_HEADERS[$spid1]; if ($grid1 == 'undefined') { @@ -1025,7 +1053,8 @@ class SurveyTTest } } } - } else { + } + else { # imamo subgrid $sprLabel1 = '('.$spr_data_1['grids'][$grid1]['variable'].') '. $spr_data_1['grids'][$grid1]['naslov']; } @@ -1035,84 +1064,101 @@ class SurveyTTest $sprLabel2 = trim($this->sessionData['ttest']['label2']); $label1 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][0]); $label2 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][1]); - echo ''; - echo ''; + + + echo '
'; + + + echo ''; + #labele - echo ''; - echo ''; + echo ''; - echo ''; - #echo ''; + + + echo ''; + #frekvenca - echo ''; + echo ''; #povprečje - echo ''; + echo ''; #varianca - echo ''; + echo ''; #standardna napaka - echo ''; + echo ''; #margini - echo ''; + echo ''; #d - echo ''; + echo ''; #sed - echo ''; + echo ''; #signifikanca - echo ''; + echo ''; #ttest - echo ''; + echo ''; + echo ''; + echo ''; - #labele - - echo ''; + #labele + echo ''; #frekvenca - echo ''; + echo ''; #povprečje - echo ''; + echo ''; #varianca - echo ''; + echo ''; #standardna napaka - echo ''; + echo ''; #margini - echo ''; + echo ''; #d - echo ''; + echo ''; #sed - echo ''; + echo ''; #sig - echo ''; + echo ''; #ttest - echo ''; + echo ''; + echo ''; + echo ''; + #labele - echo ''; + echo ''; #frekvenca - echo ''; + echo ''; #povprečje - echo ''; + echo ''; #varianca - echo ''; + echo ''; #standardna napaka - echo ''; + echo ''; #margini - echo ''; + echo ''; + echo ''; + + echo '
'; - echo ''; - echo ''; - echo $sprLabel2.''; - echo ''; + echo ''; + echo ' '; + echo ' '; + echo $sprLabel2; + echo ' '; + echo ' '; echo ''; - echo ''; - echo ''; - echo $sprLabel1.''; - echo ''; + echo ''; + echo ' '; + echo ' '; + echo $sprLabel1; + echo ' '; + echo ' '; echo '
 
nnxxs²s²se(x)se(x)±1,96×se(x)±1,96×se(x)ddse(d)se(d)Sig.Sig.tt
'.$label1.''.$label1.''.$this->formatNumber($ttest[1]['n'],0).''.$this->formatNumber($ttest[1]['n'],0).''.$this->formatNumber($ttest[1]['x'],3).''.$this->formatNumber($ttest[1]['x'],3).''.$this->formatNumber($ttest[1]['s2'],3).''.$this->formatNumber($ttest[1]['s2'],3).''.$this->formatNumber($ttest[1]['se'],3).''.$this->formatNumber($ttest[1]['se'],3).''.$this->formatNumber($ttest[1]['margin'],3).''.$this->formatNumber($ttest[1]['margin'],3).''.$this->formatNumber($ttest['d'],3).''.$this->formatNumber($ttest['d'],3).''.$this->formatNumber($ttest['sed'],3).''.$this->formatNumber($ttest['sed'],3).''.$this->formatNumber($ttest['sig'],3).''.$this->formatNumber($ttest['sig'],3).''.$this->formatNumber($ttest['t'],3).''.$this->formatNumber($ttest['t'],3).'
'.$label2.''.$label2.''.$this->formatNumber($ttest[2]['n'],0).''.$this->formatNumber($ttest[2]['n'],0).''.$this->formatNumber($ttest[2]['x'],3).''.$this->formatNumber($ttest[2]['x'],3).''.$this->formatNumber($ttest[2]['s2'],3).''.$this->formatNumber($ttest[2]['s2'],3).''.$this->formatNumber($ttest[2]['se'],3).''.$this->formatNumber($ttest[2]['se'],3).''.$this->formatNumber($ttest[2]['margin'],3).''.$this->formatNumber($ttest[2]['margin'],3).'
'; } diff --git a/admin/survey/script/ttest.js b/admin/survey/script/ttest.js index 52ec5e0c2..69a79ed16 100644 --- a/admin/survey/script/ttest.js +++ b/admin/survey/script/ttest.js @@ -17,6 +17,7 @@ function ttestSpremenljivkaChange() { $('#ttestNumerusSpan').addClass('gray'); } function ttestVariableChange() { + // prvi dropdown var seq = new Array(); var spr = new Array(); @@ -24,6 +25,7 @@ function ttestVariableChange() { $('#ttestNumerus').each(function(index,el) { spr.push($(el).val()); }); + // omogočimo $('#ttestNumerus').attr('disabled',false).focus().attr('size', 1); $('#ttestNumerusSpan').removeClass('gray'); @@ -40,11 +42,13 @@ function ttestVariableChange() { var seq2 = $("#ttestSpremenljivka option:selected").attr('seq2'); var label2 = $("#ttestSpremenljivka option:selected").html(); + // variable iz checkboxov var sub_conditions = new Array(); $('#ttestVariablesSpan input:checked').each(function(index,el) { sub_conditions.push($(el).val()); }); + $("#ttestResults").load("ajax.php?t=ttest&a=variableChange", {anketa:srv_meta_anketa_id, sub_conditions:sub_conditions, spr:spr, seq:seq, grd:grd, spr2:spr2, seq2:seq2, grid2:grid2, label2:label2}, function() { // preverimo da samo dva izbrana checkboxa var cnt = $("input[name=subTtest]:checked").length; @@ -54,9 +58,9 @@ function ttestVariableChange() { $(this).attr("disabled", true); $(this).parent().addClass("gray"); }); - $("#ttestVariablesSpan").removeClass('active'); - - } else if (cnt < 2) { + $("#ttestVariablesSpan").removeClass('active'); + } + else if (cnt < 2) { // onemogočimo $('#ttestNumerus').attr('disabled',true); $('#ttestNumerusSpan').addClass('gray'); diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 215e3e997..73a180414 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -15507,14 +15507,16 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data .div_analiza_holder, -#div_means_data .div_analiza_holder { +#div_means_data .div_analiza_holder, +#ttestResults .div_analiza_holder { display: flex; flex-direction: column; overflow-x: auto; margin: 0 0 64px 0; } #div_analiza_data .div_analiza_holder .analiza_table_top_settings, -#div_means_data .div_analiza_holder .analiza_table_top_settings { +#div_means_data .div_analiza_holder .analiza_table_top_settings, +#ttestResults .div_analiza_holder .analiza_table_top_settings { display: flex; align-items: center; justify-content: space-between; @@ -15523,45 +15525,55 @@ textarea#addusers, textarea#addusers_note { font-size: 16px; } #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_means_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_means_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_means_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_means_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_means_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_means_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_means_data table, +#ttestResults table { width: 100%; margin: 0; } #div_analiza_data table tr, -#div_means_data table tr { +#div_means_data table tr, +#ttestResults table tr { height: auto; } #div_analiza_data table tr th, #div_analiza_data table tr td, #div_means_data table tr th, -#div_means_data table tr td { +#div_means_data table tr td, +#ttestResults table tr th, +#ttestResults table tr td { box-sizing: border-box; padding: 18px; font-size: 14px; @@ -15573,7 +15585,9 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr th span, #div_analiza_data table tr td span, #div_means_data table tr th span, -#div_means_data table tr td span { +#div_means_data table tr td span, +#ttestResults table tr th span, +#ttestResults table tr td span { font-size: 14px; line-height: 18px; } @@ -15589,7 +15603,15 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.span_navedbe a, #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_means_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, +#ttestResults table tr th span.img_analysis_f_p a, +#ttestResults table tr td span.span_navedbe a, +#ttestResults table tr td span.img_analysis_p a, +#ttestResults table tr td span.img_analysis_f a, +#ttestResults table tr td span.img_analysis_f_p a { color: #333333; text-decoration: none; } @@ -15605,7 +15627,15 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.span_navedbe a span, #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_means_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, +#ttestResults table tr th span.img_analysis_f_p a span, +#ttestResults table tr td span.span_navedbe a span, +#ttestResults table tr td span.img_analysis_p a span, +#ttestResults table tr td span.img_analysis_f a span, +#ttestResults table tr td span.img_analysis_f_p a span { font-weight: 400; } #div_analiza_data table tr th span.span_navedbe a span.blue, #div_analiza_data table tr th span.img_analysis_p a span.blue, #div_analiza_data table tr th span.img_analysis_f a span.blue, #div_analiza_data table tr th span.img_analysis_f_p a span.blue, @@ -15620,7 +15650,15 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.span_navedbe a span.blue, #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_means_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, +#ttestResults table tr th span.img_analysis_f_p a span.blue, +#ttestResults table tr td span.span_navedbe a span.blue, +#ttestResults table tr td span.img_analysis_p a span.blue, +#ttestResults table tr td span.img_analysis_f a span.blue, +#ttestResults table tr td span.img_analysis_f_p a span.blue { color: #1E88E5; } #div_analiza_data table tr th span.span_navedbe a span.active, #div_analiza_data table tr th span.img_analysis_p a span.active, #div_analiza_data table tr th span.img_analysis_f a span.active, #div_analiza_data table tr th span.img_analysis_f_p a span.active, @@ -15635,20 +15673,32 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr td span.span_navedbe a span.active, #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_means_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, +#ttestResults table tr th span.img_analysis_f_p a span.active, +#ttestResults table tr td span.span_navedbe a span.active, +#ttestResults table tr td span.img_analysis_p a span.active, +#ttestResults table tr td span.img_analysis_f a span.active, +#ttestResults table tr td span.img_analysis_f_p a span.active { font-weight: 600; } #div_analiza_data table tr th.cell_icons, #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_means_data table tr td.cell_icons, +#ttestResults table tr th.cell_icons, +#ttestResults table tr td.cell_icons { width: 110px; text-align: center; } #div_analiza_data table tr th.cell_var, #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_means_data table tr td.cell_var, +#ttestResults table tr th.cell_var, +#ttestResults table tr td.cell_var { width: 110px; min-width: 110px; text-align: center; @@ -15656,61 +15706,79 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr th.cell_var a, #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_means_data table tr td.cell_var a, +#ttestResults table tr th.cell_var a, +#ttestResults table tr td.cell_var a { color: #333333; text-decoration: none; } #div_analiza_data table tr th.cell_question, #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_means_data table tr td.cell_question, +#ttestResults table tr th.cell_question, +#ttestResults table tr td.cell_question { width: auto; text-align: left; } #div_analiza_data table tr th.cell_subquestion, #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_means_data table tr td.cell_subquestion, +#ttestResults table tr th.cell_subquestion, +#ttestResults table tr td.cell_subquestion { width: 260px; } #div_analiza_data table tr th.cell_info, #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_means_data table tr td.cell_info, +#ttestResults table tr th.cell_info, +#ttestResults table tr td.cell_info { width: 115px; text-align: left; } #div_analiza_data table tr th.cell_value, #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_means_data table tr td.cell_value, +#ttestResults table tr th.cell_value, +#ttestResults table tr td.cell_value { width: 115px; text-align: right; } #div_analiza_data table tr th.cell_noVerBorder, #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_means_data table tr td.cell_noVerBorder, +#ttestResults table tr th.cell_noVerBorder, +#ttestResults table tr td.cell_noVerBorder { border-top: 0 !important; border-bottom: 0 !important; } #div_analiza_data table tr th.cell_noBorder, #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_means_data table tr td.cell_noBorder, +#ttestResults table tr th.cell_noBorder, +#ttestResults table tr td.cell_noBorder { border: 0 !important; } #div_analiza_data table tr th.cell_empty, #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_means_data table tr td.cell_empty, +#ttestResults table tr th.cell_empty, +#ttestResults table tr td.cell_empty { background-color: #FFFFFF !important; border: 0 !important; } #div_analiza_data table tr th.cell_space, #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_means_data table tr td.cell_space, +#ttestResults table tr th.cell_space, +#ttestResults table tr td.cell_space { padding: 0; line-height: 8px; background-color: #FFFFFF !important; @@ -15719,19 +15787,25 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr th.cell_noPadding, #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_means_data table tr td.cell_noPadding, +#ttestResults table tr th.cell_noPadding, +#ttestResults table tr td.cell_noPadding { padding: 0 !important; } #div_analiza_data table tr th table.cell_table, #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_means_data table tr td table.cell_table, +#ttestResults table tr th table.cell_table, +#ttestResults table tr td table.cell_table { width: 100%; } #div_analiza_data table tr th table.cell_table tr td, #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_means_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; text-align: center; border: 0; @@ -15739,13 +15813,17 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr th table.cell_table tr:first-of-type td, #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_means_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; } #div_analiza_data table tr.row1 th, #div_analiza_data table tr.row1 td, #div_means_data table tr.row1 th, -#div_means_data table tr.row1 td { +#div_means_data table tr.row1 td, +#ttestResults table tr.row1 th, +#ttestResults table tr.row1 td { font-size: 16px; font-weight: 600; line-height: 20px; @@ -15754,7 +15832,9 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row1 th span, #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_means_data table tr.row1 td span, +#ttestResults table tr.row1 th span, +#ttestResults table tr.row1 td span { font-size: 16px; font-weight: 600; line-height: 20px; @@ -15762,7 +15842,9 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 th, #div_analiza_data table tr.row2 td, #div_means_data table tr.row2 th, -#div_means_data table tr.row2 td { +#div_means_data table tr.row2 td, +#ttestResults table tr.row2 th, +#ttestResults table tr.row2 td { font-size: 15px; font-weight: 600; line-height: 19px; @@ -15771,7 +15853,9 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 th span, #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_means_data table tr.row2 td span, +#ttestResults table tr.row2 th span, +#ttestResults table tr.row2 td span { font-size: 15px; font-weight: 600; line-height: 19px; @@ -15779,7 +15863,9 @@ textarea#addusers, textarea#addusers_note { #div_analiza_data table tr.row2 th.cell_value, #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_means_data table tr.row2 td.cell_value, +#ttestResults table tr.row2 th.cell_value, +#ttestResults table tr.row2 td.cell_value { text-align: right; white-space: nowrap; } @@ -15789,7 +15875,11 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr.row3 th, #div_means_data table tr.row3 td, #div_means_data table tr.row4 th, -#div_means_data table tr.row4 td { +#div_means_data table tr.row4 td, +#ttestResults table tr.row3 th, +#ttestResults table tr.row3 td, +#ttestResults table tr.row4 th, +#ttestResults table tr.row4 td { background-color: #F8F8F8; } #div_analiza_data table tr.row3 th.cell_grid, @@ -15798,7 +15888,11 @@ textarea#addusers, textarea#addusers_note { #div_means_data table tr.row3 th.cell_grid, #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_means_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, +#ttestResults table tr.row4 td.cell_grid { height: 52px; padding-top: 8px; padding-bottom: 8px; @@ -15806,62 +15900,76 @@ textarea#addusers, textarea#addusers_note { background-color: #F2F2F2; } #div_analiza_data table tr.row_question td, -#div_means_data table tr.row_question td { +#div_means_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_means_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_means_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_means_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_means_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_means_data table tr.row_sum td.cell_missing span, +#ttestResults table tr.row_sum td.cell_missing span { cursor: pointer; color: #1E88E5; transition: 0.2s; } #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_means_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_means_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_means_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_means_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_means_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_means_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_means_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_means_data table tr.row_bottom td, +#ttestResults table tr.row_bottom td { background-color: #F8F8F8; } @@ -16716,66 +16824,102 @@ iframe#ifmcontentstoprint { display: none; } -.ttest_chart_holder { - margin-left: 0px; +#ttest_variables { + display: flex; + justify-content: center; } - -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%; +#ttest_variables .title { + margin-bottom: 4px; } -table.ttestTable td { - min-width: 80px; - padding: 3px; - margin: 0px; - text-align: center; - border-bottom: 1px solid #E5E5E5; - border-right: 1px solid #E5E5E5; +#ttest_variables .ttestLeftHolder, +#ttest_variables .ttestRightHolder { + display: flex; + flex-direction: column; + margin-right: 64px; } -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; +#ttest_variables .ttestLeftHolder button, +#ttest_variables .ttestRightHolder button { + width: 190px; + margin-top: 16px; } -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; +#ttest_variables #ttestVariablesSpan { + display: flex; + flex-direction: column; + margin-top: 16px; + padding: 8px; max-width: 400px; - border-radius: 4px; - -moz-border-radius: 4px 4px 4px 4px; - -webkit-border-radius: 4px; + background-color: #F8F8F8; + border: 1px solid #E5E5E5; +} +#ttest_variables #ttestVariablesSpan span { + margin-bottom: 8px; + color: #333333; +} +#ttest_variables #ttestVariablesSpan span label { + font-size: 14px; +} +#ttest_variables #ttestVariablesSpan span.gray { + color: #C4C4C4; +} +#ttest_variables #ttestVariablesSpan span:last-of-type { + margin-bottom: 0; +} +#ttest_variables .ttestSubSetting { + display: flex; + flex-direction: column; +} +#ttest_variables .ttestSubSetting .setting_line { + margin-bottom: 6px; } -#ttestVariablesSpan.active { - background-color: #FFC700; - border: 1px solid #FFC700; +#ttestResults { + display: flex; + flex-direction: column; + margin-top: 64px; +} +#ttestResults .means_table_holder { + margin-bottom: 48px; +} +#ttestResults .means_table_holder:last-child { + margin-bottom: 0; +} +#ttestResults .tableChart { + margin: 16px auto 0 auto; +} +#ttestResults .custom_report_include { + display: flex; + justify-content: flex-end; + margin-bottom: 8px; +} +#ttestResults .custom_report_include a { + text-decoration: none; +} +#ttestResults table.table_ttest { + margin: 0 0 16px 0; + padding: 0; +} +#ttestResults table.table_ttest tr.row2 td.cell_value { + font-size: 14px; + font-weight: 400; + background-color: #F2F2F2; +} +#ttestResults table.table_ttest tr.row2 td.cell_value span { + font-size: 14px; + font-weight: 400; +} +#ttestResults table.table_ttest tr td { + border: 1px #E5E5E5 solid; +} +#ttestResults table.table_ttest tr td.cell_var { + width: 260px; + text-align: left; +} +#ttestResults table.table_ttest tr td.cell_question a { + text-decoration: none; + color: #333333; +} +#ttestResults table.table_ttest tr td.cell_value { + text-align: center; } #div_means_dropdowns { @@ -16837,15 +16981,13 @@ table.ttestTable td.lightGreen { margin-top: 64px; } #div_means_data .means_table_holder { - margin-bottom: 16px; - border-bottom: 1px #E5E5E5 solid; + margin-bottom: 48px; } #div_means_data .means_table_holder:last-child { margin-bottom: 0; - border: 0; } #div_means_data .tableChart { - margin: 16px auto; + margin: 0 auto 16px auto; } #div_means_data .custom_report_include { display: flex; @@ -16856,7 +16998,7 @@ table.ttestTable td.lightGreen { text-decoration: none; } #div_means_data table.table_means { - margin: 0; + margin: 0 0 16px 0; padding: 0; } #div_means_data table.table_means tr.row2 td.cell_value { @@ -16878,18 +17020,6 @@ table.ttestTable td.lightGreen { #div_means_data table.table_means tr td.cell_value { text-align: center; } -#div_means_data table.table_means table.cell_table > tbody > tr { - border-bottom: 1px #E5E5E5 dashed; -} -#div_means_data table.table_means table.cell_table > tbody > tr:last-child { - border-bottom: 0; -} -#div_means_data table.table_means table.cell_table > tbody > tr table.cell_table tr td { - border-right: 1px #FFC700 solid; -} -#div_means_data table.table_means table.cell_table > tbody > tr table.cell_table tr td:last-child { - border-right: 0; -} .break_chart_holder { margin: 30px 0 30px 0; diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss index 9941a2319..b2bab620b 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_means_data, +#ttestResults{ .div_analiza_holder { display: flex; 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 fe299a43d..ed78cb52f 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_means.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_means.scss @@ -57,17 +57,15 @@ margin-top: 64px; .means_table_holder{ - margin-bottom: 16px; - border-bottom: 1px $gray solid; + margin-bottom: 48px; &:last-child{ margin-bottom: 0; - border: 0; } } .tableChart{ - margin: 16px auto; + margin: 0 auto 16px auto; } .custom_report_include{ @@ -82,7 +80,7 @@ } table.table_means{ - margin: 0; + margin: 0 0 16px 0; padding: 0; tr{ @@ -121,26 +119,5 @@ } } } - - - - table.cell_table{ - - > tbody > tr{ - border-bottom: 1px $gray dashed; - - &:last-child{ - border-bottom: 0; - } - - table.cell_table tr td{ - border-right: 1px $yellow solid; - - &:last-child{ - border-right: 0; - } - } - } - } } } 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 3f4af6b3c..f40317262 100644 --- a/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss +++ b/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss @@ -1,61 +1,142 @@ -.ttest_chart_holder { - margin-left: 0px; + +#ttest_variables{ + display: flex; + justify-content: center; + + .title{ + margin-bottom: 4px; + } + + .ttestLeftHolder, + .ttestRightHolder{ + display: flex; + flex-direction: column; + + margin-right: 64px; + + button{ + width: 190px; + margin-top: 16px; + } + } + + #ttestVariablesSpan{ + display: flex; + flex-direction: column; + + margin-top: 16px; + padding: 8px; + max-width: 400px; + + background-color: $light-gray; + border: 1px solid $gray; + + span{ + margin-bottom: 8px; + color: $black; + + label{ + font-size: 14px; + } + + &.gray{ + color: $dark-gray; + } + + &:last-of-type{ + margin-bottom: 0; + } + } + + &.active { + //background-color: rgba(255, 199, 0, 0.05); + } + } + + .ttestSubSetting{ + display: flex; + flex-direction: column; + + .setting_line{ + margin-bottom: 6px; + } + } } -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; + +#ttestResults{ + display: flex; + flex-direction: column; + + margin-top: 64px; + + .means_table_holder{ + margin-bottom: 48px; + + &:last-child{ + margin-bottom: 0; + } + } + + .tableChart{ + margin: 16px auto 0 auto; + } + + .custom_report_include{ + display: flex; + justify-content: flex-end; + + margin-bottom: 8px; + + a{ + text-decoration: none; + } + } + + table.table_ttest{ + margin: 0 0 16px 0; + padding: 0; + + tr{ + + &.row1{ + + } + + &.row2{ + + td.cell_value{ + font-size: 14px; + font-weight: 400; + + background-color: $light-gray2; + + span{ + font-size: 14px; + font-weight: 400; + } + } + } + + td{ + border: 1px $gray solid; + + &.cell_var{ + width: 260px; + text-align: left; + } + + &.cell_question{ + a{ + text-decoration: none; + color: $black; + } + } + + &.cell_value{ + text-align: center; + } + } + } + } }