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

Redesign - analize - ttest

Browse Source
This commit is contained in:
pero1203 2022-02-04 11:20:34 +01:00
parent 153f0677fe
commit 36f0e9aec5
6 changed files with 541 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
admin/survey/classes/surveyAnalysis/class.SurveyTTest.php
View File

@ -168,17 +168,11 @@ class SurveyTTest
$SSH = new SurveyStaticHtml($this->sid); $SSH = new SurveyStaticHtml($this->sid);
$SSH -> displayTestDataBar(true); $SSH -> displayTestDataBar(true);
} }
/*echo '<div id="dataOnlyValid">';
SurveyStatusProfiles::displayOnlyValidCheckbox();
echo '</div>';*/
//$this->DisplayLinks();
echo '<div id="ttest_variables">'; echo '<div id="ttest_variables">';
$this->DisplayVariables(); $this->DisplayVariables();
echo '</div>'; # id="ttest_variables" echo '</div>'; # id="ttest_variables"
echo '<br class="clr">';
echo '<div id="ttestResults">'; echo '<div id="ttestResults">';
$this->variableChange(); $this->variableChange();
echo '</div>'; # id="ttestResults" echo '</div>'; # id="ttestResults"
@ -273,11 +267,12 @@ class SurveyTTest
$variables = $this->getVariableList(2); $variables = $this->getVariableList(2);
echo '<span id="ttestSpremenljivkaSpan" class="floatLeft">';
echo $lang['srv_ttest_label1'];
echo '<br />';
echo '<select id="ttestSpremenljivka" name="ttestSpremenljivka" onchange="ttestSpremenljivkaChange();" autocomplete="off">'; echo '<div id="ttestSpremenljivkaSpan" class="ttestLeftHolder">';
echo '<span class="title">'.$lang['srv_ttest_label1'].':</span>';
echo '<select id="ttestSpremenljivka" name="ttestSpremenljivka" class="dropdown large" onchange="ttestSpremenljivkaChange();" autocomplete="off">';
echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select1_option'] . '</option>'; echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select1_option'] . '</option>';
if (count($variables)) { if (count($variables)) {
foreach ($variables as $variable) { foreach ($variables as $variable) {
@ -292,8 +287,8 @@ class SurveyTTest
.$variable['variableNaslov'] . '</option>'; .$variable['variableNaslov'] . '</option>';
} }
} }
echo '</select>'; # name="ttestSpremenljivka" echo '</select>';
echo '<br class="clr"/><br/>';
#.(count($this->sessionData['ttest']['sub_conditions']) == 2?'':'class="active"'). #.(count($this->sessionData['ttest']['sub_conditions']) == 2?'':'class="active"').
$_active = $this->checkSubConditionsActive(); $_active = $this->checkSubConditionsActive();
if ($this->sessionData['ttest']['spr2'] > 0) { if ($this->sessionData['ttest']['spr2'] > 0) {
@ -303,14 +298,17 @@ class SurveyTTest
} else { } else {
echo '<div id="ttestVariablesSpan" style="display:none" '.($_active < 2 ? ' class="active"' : '').'></div>'; echo '<div id="ttestVariablesSpan" style="display:none" '.($_active < 2 ? ' class="active"' : '').'></div>';
} }
echo '</span>';
echo '</div>';
$cntSubConditionsActive = $this->checkSubConditionsActive(); $cntSubConditionsActive = $this->checkSubConditionsActive();
echo '<span class="floatLeft spaceRight">&nbsp;</span>';
echo '<span id="ttestNumerusSpan" class="floatLeft'.($cntSubConditionsActive == 2 ? '' : ' gray').'">'; #gray echo '<div id="ttestNumerusSpan" class="ttestRightHolder '.($cntSubConditionsActive == 2 ? '' : ' gray').'">';
echo $lang['srv_ttest_label2'];
echo '<br />'; echo '<span class="title">'.$lang['srv_ttest_label2'].':</span>';
echo '<select id="ttestNumerus" name="ttestNumerus" onchange="ttestVariableChange();" autocomplete="off" '.($cntSubConditionsActive == 2 ? '' : ' disabled="disabled"').'>'; #
echo '<select id="ttestNumerus" name="ttestNumerus" class="dropdown large" onchange="ttestVariableChange();" autocomplete="off" '.($cntSubConditionsActive == 2 ? '' : ' disabled="disabled"').'>'; #
echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select2_option'] . '</option>'; echo '<option value="0" selected="selected" >'. $lang['srv_ttest_select2_option'] . '</option>';
if (count($numerus)) { if (count($numerus)) {
foreach ($numerus as $variable) { foreach ($numerus as $variable) {
@ -325,16 +323,27 @@ class SurveyTTest
. $variable['variableNaslov'] . '</option>'; . $variable['variableNaslov'] . '</option>';
} }
} }
echo '</select>'; # name="ttestSpremenljivka" echo '</select>';
echo '</span>';
echo '</div>';
echo '<br /><span style="margin-left: 30px;">'; echo '<div class="ttestSubSetting">';
echo '<label><input id="showChart" type="checkbox" onchange="showTableChart(\'ttest\');" '.($this->sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'>'.$lang['srv_show_chart'].'</label>';
echo '<span class="title">'.$lang['settings'].':</span>';
echo '<span class="setting_line">';
echo ' <input id="showChart" type="checkbox" onchange="showTableChart(\'ttest\');" '.($this->sessionData['ttest_charts']['showChart']==true?' checked="checked"':'' ).'><label for="showChart">'.$lang['srv_show_chart'].'</label>';
echo '</span>'; echo '</span>';
echo '<span style="margin-left: 30px;"><a href="https://www.1ka.si/d/sl/pomoc/prirocniki/ttest?from1ka=1" target="_blank">';
echo $lang['srv_ttest_interpretacija_note']; echo '<span class="setting_line">';
echo '</a></span>'; echo ' <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/ttest?from1ka=1" target="_blank">';
echo $lang['srv_ttest_interpretacija_note'];
echo ' </a>';
echo Help::display('srv_ttest_interpretation'); echo Help::display('srv_ttest_interpretation');
echo '</span>';
echo '</div>';
// Shranimo spremenjene nastavitve v bazo // Shranimo spremenjene nastavitve v bazo
@ -539,16 +548,17 @@ class SurveyTTest
if (isset($this->sessionData['ttest']['spr2']) && $this->sessionData['ttest']['spr2'] != 0){ if (isset($this->sessionData['ttest']['spr2']) && $this->sessionData['ttest']['spr2'] != 0){
$_spr = explode('_',$this->sessionData['ttest']['spr2']); $_spr = explode('_',$this->sessionData['ttest']['spr2']);
#$spr = $_spr[0];
$spr = $this->sessionData['ttest']['spr2']; $spr = $this->sessionData['ttest']['spr2'];
if (isset($this->sessionData['ttest']['grid2'])){ if (isset($this->sessionData['ttest']['grid2'])){
$grid = $this->sessionData['ttest']['grid2']; $grid = $this->sessionData['ttest']['grid2'];
} }
# poiščemo pripadajoče variable # poiščemo pripadajoče variable
$_spr_data = $this->_HEADERS[$this->sessionData['ttest']['spr2']]; $_spr_data = $this->_HEADERS[$this->sessionData['ttest']['spr2']];
echo $lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov'];
echo '<br/>'; echo '<span class="title">'.$lang['srv_ttest_kategories_note'].' ('.$_spr_data['variable'].') '.$_spr_data['naslov'].'</span>';
switch ($_spr_data['tip']) { switch ($_spr_data['tip']) {
case 1: #radio case 1: #radio
case 3: #dropdown case 3: #dropdown
@ -556,31 +566,42 @@ class SurveyTTest
#nardimo inpute za vse opcije #nardimo inpute za vse opcije
$sekvenca = $_spr_data['sequences']; $sekvenca = $_spr_data['sequences'];
foreach ($_spr_data['options'] as $value => $option) { foreach ($_spr_data['options'] as $value => $option) {
echo '<label '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>('.$value.') - '.$option.'</label><br/>'; echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'gray' : '').'">';
echo ' <input name="subTtest" id="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>';
echo ' <label for="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'">('.$value.') - '.$option.'</label>';
echo '</span>';
} }
break; break;
case 2: #checkbox case 2: #checkbox
#nardimo inpute za vse opcije #nardimo inpute za vse opcije
$option = '1'; $option = '1';
foreach ($_spr_data['grids'][0]['variables'] as $vid => $variable) { foreach ($_spr_data['grids'][0]['variables'] as $vid => $variable) {
echo '<label '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option. '" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>'; echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'gray' : '').'">';
echo ' <input name="subTtest" id="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>';
echo ' <label for="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'">('.$variable['variable'].') - '.$variable['naslov'].'</label>';
echo '</span>';
} }
break; break;
case 6: #mgrid case 6: #mgrid
#nardimo inpute za vse opcije #nardimo inpute za vse opcije
$sekvenca = $this->sessionData['ttest']['seq2']; $sekvenca = $this->sessionData['ttest']['seq2'];
foreach ($_spr_data['options'] as $value => $option) { foreach ($_spr_data['options'] as $value => $option) {
//$sekvenca = $_spr_data['grids'][$value]['variables'][0]['sequence']; echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'gray' : '').'">';
echo '<label '.($this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>('.$value.') - '.$option.'</label><br/>'; echo ' <input name="subTtest" id="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'" type="checkbox" value="'.$spr.'_'.$sekvenca.'_'.$value.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$sekvenca.'_'.$value).'/>';
echo ' <label for="subTtest_'.$spr.'_'.$sekvenca.'_'.$value.'">('.$value.') - '.$option.'</label>';
echo '</span>';
} }
break; break;
case 16: #mcheck case 16: #mcheck
#nardimo inpute za vse opcije #nardimo inpute za vse opcije
# poiščemo pripadajočo sekvenco # poiščemo pripadajočo sekvenco
#nardimo inpute za vse opcije #nardimo inpute za vse opcije
$option = '1'; $option = '1';
foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) { foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) {
echo '<label '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'class="gray"' : '').'><input name="subTtest" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>('.$variable['variable'].') - '.$variable['naslov'].'</label><br/>'; echo '<span class="setting_line '.($this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option) == ' disabled="disabled"' ? 'gray' : '').'">';
echo ' <input name="subTtest" id="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'" type="checkbox" value="'.$spr.'_'.$variable['sequence'].'_'.$option.'" onchange="ttestVariableChange();"'.$this->checkboxSubCondition($spr.'_'.$variable['sequence'].'_'.$option).'/>';
echo ' <label for="subTtest_'.$spr.'_'.$variable['sequence'].'_'.$option.'">('.$variable['variable'].') - '.$variable['naslov'].'</label>';
echo '</span>';
} }
break; break;
@ -608,17 +629,13 @@ class SurveyTTest
if (count($this->sessionData['ttest']['sub_conditions']) > 1 ) { if (count($this->sessionData['ttest']['sub_conditions']) > 1 ) {
$variables1 = $this->getSelectedVariables(); $variables1 = $this->getSelectedVariables();
if (count($variables1) > 0) { if (count($variables1) > 0) {
// ikone za izvoz // ikone za izvoz
$this->displayExport(); $this->displayExport();
foreach ($variables1 AS $v_first) { foreach ($variables1 AS $v_first) {
$ttest = null; // Zvezdica za vkljucitev v porocilo
/*$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
$spid1 = $this->sessionData['ttest']['variabla'][0]['spr']; $spid1 = $this->sessionData['ttest']['variabla'][0]['spr'];
$seq1 = $this->sessionData['ttest']['variabla'][0]['seq']; $seq1 = $this->sessionData['ttest']['variabla'][0]['seq'];
$grid1 = $this->sessionData['ttest']['variabla'][0]['grd']; $grid1 = $this->sessionData['ttest']['variabla'][0]['grd'];
@ -632,6 +649,11 @@ class SurveyTTest
$spr1 = $seq2.'-'.$spid2.'-'.$grid2.'-'.$sub1.'-'.$sub2; $spr1 = $seq2.'-'.$spid2.'-'.$grid2.'-'.$sub1.'-'.$sub2;
$spr2 = $seq1.'-'.$spid1.'-'.$grid1; $spr2 = $seq1.'-'.$spid1.'-'.$grid1;
SurveyAnalysis::addCustomReportElement($type=7, $sub_type=0, $spr1, $spr2); 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 // Izrisemo graf za tabelo
if(isset($this->sessionData['ttest_charts']['showChart']) && $this->sessionData['ttest_charts']['showChart'] == true){ 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']; $grid1 = $this->sessionData['ttest']['variabla'][0]['grd'];
if (is_array($ttest) && count($ttest) > 0 && (int)$seq1 > 0) { if (is_array($ttest) && count($ttest) > 0 && (int)$seq1 > 0) {
if ($this->isArchive == false) { if ($this->isArchive == false) {
echo '<div id="displayFilterNotes">'; echo '<div id="displayFilterNotes">';
# če ne uporabljamo privzetega časovnega profila izpišemo opozorilo # če ne uporabljamo privzetega časovnega profila izpišemo opozorilo
SurveyTimeProfiles :: printIsDefaultProfile(); SurveyTimeProfiles :: printIsDefaultProfile();
# če imamo filter ifov ga izpišemo
# če imamo filter ifov ga izpišemo
SurveyConditionProfiles:: getConditionString($doNewLine ); SurveyConditionProfiles:: getConditionString($doNewLine );
# če imamo filter spremenljivk ga izpišemo
# če imamo filter spremenljivk ga izpišemo
SurveyVariablesProfiles:: getProfileString($doNewLine, true); SurveyVariablesProfiles:: getProfileString($doNewLine, true);
SurveyDataSettingProfiles :: getVariableTypeNote($doNewLine ); SurveyDataSettingProfiles :: getVariableTypeNote($doNewLine );
# če rekodiranje
# če rekodiranje
$SR = new SurveyRecoding($this->sid); $SR = new SurveyRecoding($this->sid);
$SR -> getProfileString(); $SR -> getProfileString();
echo '</div>'; echo '</div>';
echo '<br class="clr" />';
} }
$spr_data_1 = $this->_HEADERS[$spid1]; $spr_data_1 = $this->_HEADERS[$spid1];
if ($grid1 == 'undefined') { if ($grid1 == 'undefined') {
@ -1025,7 +1053,8 @@ class SurveyTTest
} }
} }
} }
} else { }
else {
# imamo subgrid # imamo subgrid
$sprLabel1 = '('.$spr_data_1['grids'][$grid1]['variable'].') '. $spr_data_1['grids'][$grid1]['naslov']; $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']); $sprLabel2 = trim($this->sessionData['ttest']['label2']);
$label1 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][0]); $label1 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][0]);
$label2 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][1]); $label2 = $this->getVariableLabels($this->sessionData['ttest']['sub_conditions'][1]);
echo '<table border="0" class="ttestTable">';
echo '<tr>';
echo '<table class="table_ttest">';
echo '<tr class="row1">';
#labele #labele
echo '<td class="lightGreen" rowspan="2" >'; echo '<td class="cell_question" rowspan="2" >';
echo '<span class="anl_variabla">'; echo ' <span class="anl_variabla">';
echo '<a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid2.'\'); return false;">'; echo ' <a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid2.'\'); return false;">';
echo $sprLabel2.'</a>'; echo $sprLabel2;
echo '</span>'; echo ' </a>';
echo ' </span>';
echo '</td>'; echo '</td>';
echo '<td class="lightGreen" colspan="9">'; echo '<td class="cell_question" colspan="9">';
echo '<span class="anl_variabla">'; echo ' <span class="anl_variabla">';
echo '<a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid1.'\'); return false;">'; echo ' <a href="#" onclick="showspremenljivkaSingleVarPopup(\''.$spid1.'\'); return false;">';
echo $sprLabel1.'</a>'; echo $sprLabel1;
echo '</span>'; echo ' </a>';
echo ' </span>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>';
#echo '<th colspan="2">&nbsp;</th>';
echo '<tr class="row2">';
#frekvenca #frekvenca
echo '<th >n</th>'; echo '<td class="cell_value">n</td>';
#povprečje #povprečje
echo '<th><span class="avg">x</span></th>'; echo '<td class="cell_value"><span class="avg">x</span></td>';
#varianca #varianca
echo '<th>s&#178;</th>'; echo '<td class="cell_value">s&#178;</td>';
#standardna napaka #standardna napaka
echo '<th>se(<span class="avg">x</span>)</th>'; echo '<td class="cell_value">se(<span class="avg">x</span>)</td>';
#margini #margini
echo '<th>&#177;1,96&#215;se(<span class="avg">x</span>)</th>'; echo '<td class="cell_value">&#177;1,96&#215;se(<span class="avg">x</span>)</td>';
#d #d
echo '<th>d</th>'; echo '<td class="cell_value">d</td>';
#sed #sed
echo '<th>se(d)</th>'; echo '<td class="cell_value">se(d)</td>';
#signifikanca #signifikanca
echo '<th>Sig.</th>'; echo '<td class="cell_value">Sig.</td>';
#ttest #ttest
echo '<th>t</th>'; echo '<td class="cell_value">t</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
#labele #labele
echo '<td class="cell_question">'.$label1.'</td>';
echo '<td class="lightGreen">'.$label1.'</td>';
#frekvenca #frekvenca
echo '<td>'.$this->formatNumber($ttest[1]['n'],0).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['n'],0).'</td>';
#povprečje #povprečje
echo '<td>'.$this->formatNumber($ttest[1]['x'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['x'],3).'</td>';
#varianca #varianca
echo '<td>'.$this->formatNumber($ttest[1]['s2'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['s2'],3).'</td>';
#standardna napaka #standardna napaka
echo '<td>'.$this->formatNumber($ttest[1]['se'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['se'],3).'</td>';
#margini #margini
echo '<td>'.$this->formatNumber($ttest[1]['margin'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[1]['margin'],3).'</td>';
#d #d
echo '<td rowspan="2">'.$this->formatNumber($ttest['d'],3).'</td>'; echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['d'],3).'</td>';
#sed #sed
echo '<td rowspan="2">'.$this->formatNumber($ttest['sed'],3).'</td>'; echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['sed'],3).'</td>';
#sig #sig
echo '<td rowspan="2">'.$this->formatNumber($ttest['sig'],3).'</td>'; echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['sig'],3).'</td>';
#ttest #ttest
echo '<td rowspan="2">'.$this->formatNumber($ttest['t'],3).'</td>'; echo '<td class="cell_value" rowspan="2">'.$this->formatNumber($ttest['t'],3).'</td>';
echo '</tr>'; echo '</tr>';
echo '<tr>'; echo '<tr>';
#labele #labele
echo '<td class="lightGreen">'.$label2.'</td>'; echo '<td class="cell_question">'.$label2.'</td>';
#frekvenca #frekvenca
echo '<td>'.$this->formatNumber($ttest[2]['n'],0).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['n'],0).'</td>';
#povprečje #povprečje
echo '<td>'.$this->formatNumber($ttest[2]['x'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['x'],3).'</td>';
#varianca #varianca
echo '<td>'.$this->formatNumber($ttest[2]['s2'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['s2'],3).'</td>';
#standardna napaka #standardna napaka
echo '<td>'.$this->formatNumber($ttest[2]['se'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['se'],3).'</td>';
#margini #margini
echo '<td>'.$this->formatNumber($ttest[2]['margin'],3).'</td>'; echo '<td class="cell_value">'.$this->formatNumber($ttest[2]['margin'],3).'</td>';
echo '</tr>'; echo '</tr>';
echo '</table>'; echo '</table>';
} }

10
admin/survey/script/ttest.js
View File

@ -17,6 +17,7 @@ function ttestSpremenljivkaChange() {
$('#ttestNumerusSpan').addClass('gray'); $('#ttestNumerusSpan').addClass('gray');
} }
function ttestVariableChange() { function ttestVariableChange() {
// prvi dropdown // prvi dropdown
var seq = new Array(); var seq = new Array();
var spr = new Array(); var spr = new Array();
@ -24,6 +25,7 @@ function ttestVariableChange() {
$('#ttestNumerus').each(function(index,el) { $('#ttestNumerus').each(function(index,el) {
spr.push($(el).val()); spr.push($(el).val());
}); });
// omogočimo // omogočimo
$('#ttestNumerus').attr('disabled',false).focus().attr('size', 1); $('#ttestNumerus').attr('disabled',false).focus().attr('size', 1);
$('#ttestNumerusSpan').removeClass('gray'); $('#ttestNumerusSpan').removeClass('gray');
@ -40,11 +42,13 @@ function ttestVariableChange() {
var seq2 = $("#ttestSpremenljivka option:selected").attr('seq2'); var seq2 = $("#ttestSpremenljivka option:selected").attr('seq2');
var label2 = $("#ttestSpremenljivka option:selected").html(); var label2 = $("#ttestSpremenljivka option:selected").html();
// variable iz checkboxov // variable iz checkboxov
var sub_conditions = new Array(); var sub_conditions = new Array();
$('#ttestVariablesSpan input:checked').each(function(index,el) { $('#ttestVariablesSpan input:checked').each(function(index,el) {
sub_conditions.push($(el).val()); 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() { $("#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 // preverimo da samo dva izbrana checkboxa
var cnt = $("input[name=subTtest]:checked").length; var cnt = $("input[name=subTtest]:checked").length;
@ -54,9 +58,9 @@ function ttestVariableChange() {
$(this).attr("disabled", true); $(this).attr("disabled", true);
$(this).parent().addClass("gray"); $(this).parent().addClass("gray");
}); });
$("#ttestVariablesSpan").removeClass('active'); $("#ttestVariablesSpan").removeClass('active');
}
} else if (cnt < 2) { else if (cnt < 2) {
// onemogočimo // onemogočimo
$('#ttestNumerus').attr('disabled',true); $('#ttestNumerus').attr('disabled',true);
$('#ttestNumerusSpan').addClass('gray'); $('#ttestNumerusSpan').addClass('gray');

374
public/css/admin_new.css
View File

@ -15507,14 +15507,16 @@ textarea#addusers, textarea#addusers_note {
} }
#div_analiza_data .div_analiza_holder, #div_analiza_data .div_analiza_holder,
#div_means_data .div_analiza_holder { #div_means_data .div_analiza_holder,
#ttestResults .div_analiza_holder {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow-x: auto; overflow-x: auto;
margin: 0 0 64px 0; margin: 0 0 64px 0;
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings, #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; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -15523,45 +15525,55 @@ textarea#addusers, textarea#addusers_note {
font-size: 16px; font-size: 16px;
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons, #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; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before, #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; font-size: 20px;
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .print_small:before, #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; cursor: pointer;
color: #1E88E5; color: #1E88E5;
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale, #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; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
} }
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a, #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; text-decoration: none;
} }
#div_analiza_data .div_analiza_holder .div_other_text, #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; margin-top: 32px;
} }
#div_analiza_data table, #div_analiza_data table,
#div_means_data table { #div_means_data table,
#ttestResults table {
width: 100%; width: 100%;
margin: 0; margin: 0;
} }
#div_analiza_data table tr, #div_analiza_data table tr,
#div_means_data table tr { #div_means_data table tr,
#ttestResults table tr {
height: auto; height: auto;
} }
#div_analiza_data table tr th, #div_analiza_data table tr th,
#div_analiza_data table tr td, #div_analiza_data table tr td,
#div_means_data table tr th, #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; box-sizing: border-box;
padding: 18px; padding: 18px;
font-size: 14px; font-size: 14px;
@ -15573,7 +15585,9 @@ textarea#addusers, textarea#addusers_note {
#div_analiza_data table tr th span, #div_analiza_data table tr th span,
#div_analiza_data table tr td span, #div_analiza_data table tr td span,
#div_means_data table tr th 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; font-size: 14px;
line-height: 18px; 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.span_navedbe a,
#div_means_data table tr td span.img_analysis_p 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 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; color: #333333;
text-decoration: none; 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.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_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 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; 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, #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.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_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 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; 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, #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.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_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 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; font-weight: 600;
} }
#div_analiza_data table tr th.cell_icons, #div_analiza_data table tr th.cell_icons,
#div_analiza_data table tr td.cell_icons, #div_analiza_data table tr td.cell_icons,
#div_means_data table tr th.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; width: 110px;
text-align: center; text-align: center;
} }
#div_analiza_data table tr th.cell_var, #div_analiza_data table tr th.cell_var,
#div_analiza_data table tr td.cell_var, #div_analiza_data table tr td.cell_var,
#div_means_data table tr th.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; width: 110px;
min-width: 110px; min-width: 110px;
text-align: center; 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 th.cell_var a,
#div_analiza_data table tr td.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 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; color: #333333;
text-decoration: none; text-decoration: none;
} }
#div_analiza_data table tr th.cell_question, #div_analiza_data table tr th.cell_question,
#div_analiza_data table tr td.cell_question, #div_analiza_data table tr td.cell_question,
#div_means_data table tr th.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; width: auto;
text-align: left; text-align: left;
} }
#div_analiza_data table tr th.cell_subquestion, #div_analiza_data table tr th.cell_subquestion,
#div_analiza_data table tr td.cell_subquestion, #div_analiza_data table tr td.cell_subquestion,
#div_means_data table tr th.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; width: 260px;
} }
#div_analiza_data table tr th.cell_info, #div_analiza_data table tr th.cell_info,
#div_analiza_data table tr td.cell_info, #div_analiza_data table tr td.cell_info,
#div_means_data table tr th.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; width: 115px;
text-align: left; text-align: left;
} }
#div_analiza_data table tr th.cell_value, #div_analiza_data table tr th.cell_value,
#div_analiza_data table tr td.cell_value, #div_analiza_data table tr td.cell_value,
#div_means_data table tr th.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; width: 115px;
text-align: right; text-align: right;
} }
#div_analiza_data table tr th.cell_noVerBorder, #div_analiza_data table tr th.cell_noVerBorder,
#div_analiza_data table tr td.cell_noVerBorder, #div_analiza_data table tr td.cell_noVerBorder,
#div_means_data table tr th.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-top: 0 !important;
border-bottom: 0 !important; border-bottom: 0 !important;
} }
#div_analiza_data table tr th.cell_noBorder, #div_analiza_data table tr th.cell_noBorder,
#div_analiza_data table tr td.cell_noBorder, #div_analiza_data table tr td.cell_noBorder,
#div_means_data table tr th.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; border: 0 !important;
} }
#div_analiza_data table tr th.cell_empty, #div_analiza_data table tr th.cell_empty,
#div_analiza_data table tr td.cell_empty, #div_analiza_data table tr td.cell_empty,
#div_means_data table tr th.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; background-color: #FFFFFF !important;
border: 0 !important; border: 0 !important;
} }
#div_analiza_data table tr th.cell_space, #div_analiza_data table tr th.cell_space,
#div_analiza_data table tr td.cell_space, #div_analiza_data table tr td.cell_space,
#div_means_data table tr th.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; padding: 0;
line-height: 8px; line-height: 8px;
background-color: #FFFFFF !important; 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 th.cell_noPadding,
#div_analiza_data table tr td.cell_noPadding, #div_analiza_data table tr td.cell_noPadding,
#div_means_data table tr th.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; padding: 0 !important;
} }
#div_analiza_data table tr th table.cell_table, #div_analiza_data table tr th table.cell_table,
#div_analiza_data table tr td 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 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%; width: 100%;
} }
#div_analiza_data table tr th table.cell_table tr td, #div_analiza_data table tr th table.cell_table tr td,
#div_analiza_data table tr td 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 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; padding: 4px 16px;
text-align: center; text-align: center;
border: 0; 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 th table.cell_table tr:first-of-type td,
#div_analiza_data table tr td 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 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; border-bottom: 1px #E5E5E5 dashed;
} }
#div_analiza_data table tr.row1 th, #div_analiza_data table tr.row1 th,
#div_analiza_data table tr.row1 td, #div_analiza_data table tr.row1 td,
#div_means_data table tr.row1 th, #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-size: 16px;
font-weight: 600; font-weight: 600;
line-height: 20px; 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 th span,
#div_analiza_data table tr.row1 td span, #div_analiza_data table tr.row1 td span,
#div_means_data table tr.row1 th 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-size: 16px;
font-weight: 600; font-weight: 600;
line-height: 20px; 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 th,
#div_analiza_data table tr.row2 td, #div_analiza_data table tr.row2 td,
#div_means_data table tr.row2 th, #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-size: 15px;
font-weight: 600; font-weight: 600;
line-height: 19px; 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 th span,
#div_analiza_data table tr.row2 td span, #div_analiza_data table tr.row2 td span,
#div_means_data table tr.row2 th 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-size: 15px;
font-weight: 600; font-weight: 600;
line-height: 19px; 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 th.cell_value,
#div_analiza_data table tr.row2 td.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 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; text-align: right;
white-space: nowrap; 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 th,
#div_means_data table tr.row3 td, #div_means_data table tr.row3 td,
#div_means_data table tr.row4 th, #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; background-color: #F8F8F8;
} }
#div_analiza_data table tr.row3 th.cell_grid, #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 th.cell_grid,
#div_means_data table tr.row3 td.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 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; height: 52px;
padding-top: 8px; padding-top: 8px;
padding-bottom: 8px; padding-bottom: 8px;
@ -15806,62 +15900,76 @@ textarea#addusers, textarea#addusers_note {
background-color: #F2F2F2; background-color: #F2F2F2;
} }
#div_analiza_data table tr.row_question td, #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; font-weight: 600;
background-color: #F2F2F2; background-color: #F2F2F2;
} }
#div_analiza_data table tr.row_missing td, #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); background: rgba(255, 199, 0, 0.05);
} }
#div_analiza_data table tr.row_missing.row_sum td, #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); background: rgba(255, 199, 0, 0.05);
} }
#div_analiza_data table tr.row_sum td, #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); background: rgba(255, 199, 0, 0.05);
} }
#div_analiza_data table tr.row_sum td.cell_missing, #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; text-align: center;
} }
#div_analiza_data table tr.row_sum td.cell_missing span, #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; cursor: pointer;
color: #1E88E5; color: #1E88E5;
transition: 0.2s; transition: 0.2s;
} }
#div_analiza_data table tr.row_sum td.cell_missing span:hover, #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; color: #0059ab;
} }
#div_analiza_data table tr.row_sum td.cell_missing span:hover .faicon:before, #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; color: #0059ab;
} }
#div_analiza_data table tr.row_sum td.cell_missing span .faicon, #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; margin-right: 8px;
} }
#div_analiza_data table tr.row_sum td.cell_missing span .faicon:before, #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; font-size: 12px;
} }
#div_analiza_data table tr.row_sum_all td, #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); background: rgba(255, 199, 0, 0.1);
} }
#div_analiza_data table tr.row_sum_all td.cell_var, #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; border-right: 0;
} }
#div_analiza_data table tr.row_sum_all td.cell_question, #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; border-left: 0;
} }
#div_analiza_data table tr.row_bottom td, #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; background-color: #F8F8F8;
} }
@ -16716,66 +16824,102 @@ iframe#ifmcontentstoprint {
display: none; display: none;
} }
.ttest_chart_holder { #ttest_variables {
margin-left: 0px; display: flex;
justify-content: center;
} }
#ttest_variables .title {
table.ttestTable { margin-bottom: 4px;
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 { #ttest_variables .ttestLeftHolder,
min-width: 80px; #ttest_variables .ttestRightHolder {
padding: 3px; display: flex;
margin: 0px; flex-direction: column;
text-align: center; margin-right: 64px;
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
} }
table.ttestTable th { #ttest_variables .ttestLeftHolder button,
min-width: 80px; #ttest_variables .ttestRightHolder button {
padding: 3px; width: 190px;
margin: 0px; margin-top: 16px;
text-align: center;
border-bottom: 1px solid #E5E5E5;
border-right: 1px solid #E5E5E5;
background-color: #F8F8F8;
} }
table.ttestTable th.lightGreen { #ttest_variables #ttestVariablesSpan {
background-color: #F8F8F8; display: flex;
} flex-direction: column;
table.ttestTable td.lightGreen { margin-top: 16px;
background-color: #F8F8F8; padding: 8px;
}
#ttestNumerusSpan select {
width: 220px;
}
#ttestSpremenljivkaSpan select {
width: 220px;
}
#ttestVariablesSpan {
background-color: #F8F8F8;
border: 1px solid #F8F8F8;
margin-bottom: 10px;
padding: 5px;
max-width: 400px; max-width: 400px;
border-radius: 4px; background-color: #F8F8F8;
-moz-border-radius: 4px 4px 4px 4px; border: 1px solid #E5E5E5;
-webkit-border-radius: 4px; }
#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 { #ttestResults {
background-color: #FFC700; display: flex;
border: 1px solid #FFC700; 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 { #div_means_dropdowns {
@ -16837,15 +16981,13 @@ table.ttestTable td.lightGreen {
margin-top: 64px; margin-top: 64px;
} }
#div_means_data .means_table_holder { #div_means_data .means_table_holder {
margin-bottom: 16px; margin-bottom: 48px;
border-bottom: 1px #E5E5E5 solid;
} }
#div_means_data .means_table_holder:last-child { #div_means_data .means_table_holder:last-child {
margin-bottom: 0; margin-bottom: 0;
border: 0;
} }
#div_means_data .tableChart { #div_means_data .tableChart {
margin: 16px auto; margin: 0 auto 16px auto;
} }
#div_means_data .custom_report_include { #div_means_data .custom_report_include {
display: flex; display: flex;
@ -16856,7 +16998,7 @@ table.ttestTable td.lightGreen {
text-decoration: none; text-decoration: none;
} }
#div_means_data table.table_means { #div_means_data table.table_means {
margin: 0; margin: 0 0 16px 0;
padding: 0; padding: 0;
} }
#div_means_data table.table_means tr.row2 td.cell_value { #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 { #div_means_data table.table_means tr td.cell_value {
text-align: center; 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 { .break_chart_holder {
margin: 30px 0 30px 0; margin: 30px 0 30px 0;

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

@ -1,5 +1,6 @@
#div_analiza_data, #div_analiza_data,
#div_means_data{ #div_means_data,
#ttestResults{
.div_analiza_holder { .div_analiza_holder {
display: flex; display: flex;

29
resources/sass/admin_new/pages/survey_analysis/page_means.scss
View File

@ -57,17 +57,15 @@
margin-top: 64px; margin-top: 64px;
.means_table_holder{ .means_table_holder{
margin-bottom: 16px; margin-bottom: 48px;
border-bottom: 1px $gray solid;
&:last-child{ &:last-child{
margin-bottom: 0; margin-bottom: 0;
border: 0;
} }
} }
.tableChart{ .tableChart{
margin: 16px auto; margin: 0 auto 16px auto;
} }
.custom_report_include{ .custom_report_include{
@ -82,7 +80,7 @@
} }
table.table_means{ table.table_means{
margin: 0; margin: 0 0 16px 0;
padding: 0; padding: 0;
tr{ 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;
}
}
}
}
} }
} }

197
resources/sass/admin_new/pages/survey_analysis/page_ttest.scss
View File

@ -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; #ttestResults{
border-left: 1px solid $gray; display: flex;
border-spacing: 0px; flex-direction: column;
padding: 0px;
margin: 0px; margin-top: 64px;
border-collapse: collapse;
table-layout: auto; .means_table_holder{
font-size: 120%; margin-bottom: 48px;
td {
min-width: 80px; &:last-child{
padding: 3px; margin-bottom: 0;
margin: 0px; }
text-align: center; }
border-bottom: 1px solid $gray;
border-right: 1px solid $gray; .tableChart{
} margin: 16px auto 0 auto;
th { }
min-width: 80px;
padding: 3px; .custom_report_include{
margin: 0px; display: flex;
text-align: center; justify-content: flex-end;
border-bottom: 1px solid $gray;
border-right: 1px solid $gray; margin-bottom: 8px;
background-color: $light-gray;
} a{
th.lightGreen { text-decoration: none;
background-color: $light-gray; }
} }
td.lightGreen {
background-color: $light-gray; table.table_ttest{
} margin: 0 0 16px 0;
} padding: 0;
#ttestNumerusSpan {
select { tr{
width: 220px;
} &.row1{
}
#ttestSpremenljivkaSpan { }
select {
width: 220px; &.row2{
}
} td.cell_value{
#ttestVariablesSpan { font-size: 14px;
background-color: $light-gray; font-weight: 400;
border: 1px solid $light-gray;
margin-bottom: 10px; background-color: $light-gray2;
padding: 5px;
max-width: 400px; span{
border-radius: 4px; font-size: 14px;
-moz-border-radius: 4px 4px 4px 4px; font-weight: 400;
-webkit-border-radius: 4px; }
} }
#ttestVariablesSpan.active { }
background-color: $yellow;
border: 1px solid $yellow; 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;
}
}
}
}
} }