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

Redesign - analize - dokoncane opisne in frekvence

Browse Source
This commit is contained in:
pero1203 2022-01-28 12:41:43 +01:00
parent 9bcb371ad8
commit 6948c83d76
16 changed files with 902 additions and 684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1211
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

File diff suppressed because it is too large Load Diff

69
admin/survey/script/script_analiza.js
View File

@ -543,7 +543,7 @@ function hideAnalizaSingleVarPopup() {
} }
function show_single_missing(id, what) { function show_single_missing(id, what) {
//
if (what == 0) { if (what == 0) {
$('tr[name=missing_detail_'+id+']').each(function() {$(this).removeClass('displayNone');}); $('tr[name=missing_detail_'+id+']').each(function() {$(this).removeClass('displayNone');});
$("#single_missing_0"+id).hide(); $("#single_missing_0"+id).hide();
@ -553,7 +553,8 @@ function show_single_missing(id, what) {
$("#single_missing_percent_"+id).hide(); $("#single_missing_percent_"+id).hide();
$("#single_missing_title_"+id).hide(); $("#single_missing_title_"+id).hide();
} else { }
else {
$('tr[name=missing_detail_'+id+']').each(function() {$(this).addClass('displayNone');}); $('tr[name=missing_detail_'+id+']').each(function() {$(this).addClass('displayNone');});
$("#single_missing_0"+id).show(); $("#single_missing_0"+id).show();
$("#single_missing_1"+id).hide(); $("#single_missing_1"+id).hide();
@ -561,7 +562,6 @@ function show_single_missing(id, what) {
$("#single_missing_suma_freq_"+id).hide(); $("#single_missing_suma_freq_"+id).hide();
$("#single_missing_percent_"+id).show(); $("#single_missing_percent_"+id).show();
$("#single_missing_title_"+id).show(); $("#single_missing_title_"+id).show();
} }
} }
@ -687,27 +687,6 @@ function renameFilterProfile() {
}); });
} }
/*function showHideRenameFilterProfile(showhide) {
if (showhide=='true') {
//$("#filterProfileCoverDiv").show();
$("#renameFilterProfileDiv").show();
}
else {
//$("#filterProfileCoverDiv").hide();
$("#renameFilterProfileDiv").hide();
}
}
function showHideDeleteFilterProfile(showhide) {
if (showhide=='true') {
//$("#filterProfileCoverDiv").show();
$("#deleteFilterProfileDiv").show();
}
else {
//$("#filterProfileCoverDiv").hide();
$("#deleteFilterProfileDiv").hide();
}
}*/
function toggle_click_missing(what) { function toggle_click_missing(what) {
var variabla = $(what).attr('id').substr(14); // odrezemo prvih 14 znakov : click_missing_ var variabla = $(what).attr('id').substr(14); // odrezemo prvih 14 znakov : click_missing_
@ -718,26 +697,28 @@ function toggle_click_missing(what) {
} }
if (state == 0) { if (state == 0) {
// odstranimo spodnjo polno črto, ostane rdeca crtkana
$("#anl_click_missing_tr_"+variabla).removeClass('anl_bb'); // Odpremo missinge in skupno sumo
$("#anl_click_missing_tr_"+variabla).addClass('anl_dash_red_bb'); $('tr[name=missing_detail_'+variabla+']').each(function() {
// nič od missingov še ni vidno. prikažemo osnovne missinge in skupo sumo $(this).removeClass('displayNone');
$("#click_missing_1_"+variabla).show(); });
$("#click_missing_suma_"+variabla).show();
$(what).attr('value',1); $(what).attr('value', 1);
// skrijemo osnovni link za vklop manjkajocih (manjkajoci)
$("#click_missing_"+variabla).hide(); // Zamenjamo puscico
$("#single_missing_title_"+variabla).show(); $(what).find('.arrow2_d').removeClass('arrow2_d').addClass('arrow2_u');
} else if (state == 1 || state == 2 || state == ""){ }
// dodamo spodnjo polno črto, skrijemo rdeco crtkana else if (state == 1 || state == 2 || state == ""){
$("#anl_click_missing_tr_"+variabla).addClass('anl_bb');
$("#anl_click_missing_tr_"+variabla).removeClass('anl_dash_red_bb'); // Zapremo missinge
// nič od missingov še ni vidno. prikažemo osnovne missinge in skupo sumo $('tr[name=missing_detail_'+variabla+']').each(function() {
$("#click_missing_1_"+variabla).hide(); $(this).addClass('displayNone');
$("#click_missing_suma_"+variabla).hide(); });
$(what).attr('value',0);
$("#click_missing_"+variabla).show(); $(what).attr('value', 0);
$("#single_missing_title_"+variabla).hide();
// Zamenjamo puscico
$(what).find('.arrow2_u').removeClass('arrow2_u').addClass('arrow2_d');
} }
} }

125
public/css/admin_new.css
View File

@ -15141,24 +15141,31 @@ textarea#addusers, textarea#addusers_note {
} }
#div_analiza_data .div_analiza_holder { #div_analiza_data .div_analiza_holder {
margin: 32px 0 16px 0; display: flex;
flex-direction: column;
margin: 0 0 64px 0;
} }
#div_analiza_data .div_analiza_holder .div_analiza_icons { #div_analiza_data .div_analiza_holder .analiza_table_top_settings {
display: flex;
align-items: center;
justify-content: space-between;
height: auto;
margin-bottom: 8px;
font-size: 16px;
}
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
float: left;
z-index: 75;
position: relative;
margin-top: -20px;
padding-bottom: 3px;
} }
#div_analiza_data .div_analiza_holder .div_analiza_scale { #div_analiza_data .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_scale {
opacity: 0; opacity: 0;
filter: alpha(opacity=0); filter: alpha(opacity=0);
float: right; }
position: relative; #div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a {
margin-top: -20px; text-decoration: none;
padding-bottom: 3px;
} }
#div_analiza_data .div_analiza_holder .div_other_text { #div_analiza_data .div_analiza_holder .div_other_text {
margin-top: 32px; margin-top: 32px;
@ -15185,28 +15192,33 @@ textarea#addusers, textarea#addusers_note {
font-size: 14px; font-size: 14px;
line-height: 18px; line-height: 18px;
} }
#div_analiza_data table tr th.col_icons, #div_analiza_data table tr th.cell_icons,
#div_analiza_data table tr td.col_icons { #div_analiza_data table tr td.cell_icons {
width: 110px; width: 110px;
text-align: center; text-align: center;
} }
#div_analiza_data table tr th.col_var, #div_analiza_data table tr th.cell_var,
#div_analiza_data table tr td.col_var { #div_analiza_data table tr td.cell_var {
width: 110px; width: 110px;
text-align: left; text-align: center;
} }
#div_analiza_data table tr th.col_question, #div_analiza_data table tr th.cell_var a,
#div_analiza_data table tr td.col_question { #div_analiza_data 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 {
width: auto; width: auto;
text-align: left; text-align: left;
} }
#div_analiza_data table tr th.col_info, #div_analiza_data table tr th.cell_info,
#div_analiza_data table tr td.col_info { #div_analiza_data table tr td.cell_info {
width: 110px; width: 110px;
text-align: left; text-align: left;
} }
#div_analiza_data table tr th.col_value, #div_analiza_data table tr th.cell_value,
#div_analiza_data table tr td.col_value { #div_analiza_data table tr td.cell_value {
width: 110px; width: 110px;
text-align: right; text-align: right;
} }
@ -15216,11 +15228,6 @@ textarea#addusers, textarea#addusers_note {
line-height: 8px; line-height: 8px;
border: 0 !important; border: 0 !important;
} }
#div_analiza_data table tr th .anl_variabla a,
#div_analiza_data table tr td .anl_variabla a {
color: #333333;
text-decoration: none;
}
#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 {
font-size: 16px; font-size: 16px;
@ -15228,6 +15235,12 @@ textarea#addusers, textarea#addusers_note {
line-height: 20px; line-height: 20px;
background-color: #F8F8F8; background-color: #F8F8F8;
} }
#div_analiza_data table tr.row1 th span,
#div_analiza_data table tr.row1 td span {
font-size: 16px;
font-weight: 600;
line-height: 20px;
}
#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 {
font-size: 15px; font-size: 15px;
@ -15235,9 +15248,11 @@ textarea#addusers, textarea#addusers_note {
line-height: 19px; line-height: 19px;
background-color: #F8F8F8; background-color: #F8F8F8;
} }
#div_analiza_data table tr.row2 th.anl_w70, #div_analiza_data table tr.row2 th span,
#div_analiza_data table tr.row2 td.anl_w70 { #div_analiza_data table tr.row2 td span {
text-align: center; font-size: 15px;
font-weight: 600;
line-height: 19px;
} }
#div_analiza_data table tr.row3 th, #div_analiza_data table tr.row3 th,
#div_analiza_data table tr.row3 td, #div_analiza_data table tr.row4 th, #div_analiza_data table tr.row3 td, #div_analiza_data table tr.row4 th,
@ -15246,13 +15261,46 @@ textarea#addusers, textarea#addusers_note {
} }
#div_analiza_data table tr.row_question td { #div_analiza_data table tr.row_question td {
font-weight: 600; font-weight: 600;
background-color: #F2F2F2;
} }
#div_analiza_data table tr.sum td { #div_analiza_data table tr.row_missing td {
background: rgba(255, 199, 0, 0.05); background: rgba(255, 199, 0, 0.05);
} }
#div_analiza_data table tr.sum.all td { #div_analiza_data table tr.row_missing.row_sum td {
background: rgba(255, 199, 0, 0.05);
}
#div_analiza_data table tr.row_sum td {
background: rgba(255, 199, 0, 0.05);
}
#div_analiza_data table tr.row_sum td.cell_missing {
text-align: center;
}
#div_analiza_data 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 {
color: #0059ab;
}
#div_analiza_data 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 {
margin-right: 8px;
}
#div_analiza_data table tr.row_sum td.cell_missing span .faicon:before {
font-size: 12px;
}
#div_analiza_data 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 {
border-right: 0;
}
#div_analiza_data table tr.row_sum_all td.cell_question {
border-left: 0;
}
.analysis_bottom_settings { .analysis_bottom_settings {
display: flex; display: flex;
@ -15644,10 +15692,17 @@ iframe#ifmcontentstoprint {
margin-right: 0; margin-right: 0;
} }
.analysis_icons_holder > a .faicon:before { .analysis_icons_holder > a .faicon:before {
font-size: 16px; font-size: 14px;
} }
.analysis_icons_holder > a .faicon.an_freq:before, .analysis_icons_holder > a .faicon.an_freqx:before, .analysis_icons_holder > a .faicon.an_stat:before, .analysis_icons_holder > a .faicon.an_sigma:before, .analysis_icons_holder > a .faicon.an_sigmax:before { .analysis_icons_holder > a .faicon.an_freq:before, .analysis_icons_holder > a .faicon.an_freqx:before, .analysis_icons_holder > a .faicon.an_stat:before, .analysis_icons_holder > a .faicon.an_sigma:before, .analysis_icons_holder > a .faicon.an_sigmax:before {
font-size: 22px; font-size: 20px;
}
#div_analiza_data table.table_desc tr td.cell_var {
text-align: left;
}
#div_analiza_data table.table_desc tr.row_question td {
background-color: #FFFFFF;
} }
/*editing chart labels in popup*/ /*editing chart labels in popup*/

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

@ -1,27 +1,38 @@
#div_analiza_data { #div_analiza_data {
.div_analiza_holder { .div_analiza_holder {
margin: 32px 0 16px 0; display: flex;
flex-direction: column;
.div_analiza_icons { margin: 0 0 64px 0;
opacity: 0;
filter: alpha(opacity=0);
float: left; .analiza_table_top_settings{
z-index: 75; display: flex;
position: relative; align-items: center;
margin-top: -20px; justify-content: space-between;
padding-bottom: 3px;
}
.div_analiza_scale { height: auto;
opacity: 0; margin-bottom: 8px;
filter: alpha(opacity=0);
float: right; font-size: 16px;
position: relative;
margin-top: -20px; .div_analiza_icons {
padding-bottom: 3px; opacity: 0;
filter: alpha(opacity=0);
.faicon:before{
font-size: 20px;
}
}
.div_analiza_scale {
opacity: 0;
filter: alpha(opacity=0);
a{
text-decoration: none;
}
}
} }
.div_other_text{ .div_other_text{
@ -58,35 +69,40 @@
} }
// Stolpec z ikonami // Stolpec z ikonami
&.col_icons{ &.cell_icons{
width: 110px; width: 110px;
text-align: center; text-align: center;
} }
// Stolpec z variablo // Stolpec z variablo
&.col_var{ &.cell_var{
width: 110px; width: 110px;
text-align: left; text-align: center;
a{
color: $black;
text-decoration: none;
}
} }
// Stolpec z vprasanjem // Stolpec z vprasanjem
&.col_question{ &.cell_question{
width: auto; width: auto;
text-align: left; text-align: left;
} }
// Stolpec z legendo // Stolpec z legendo
&.col_info{ &.cell_info{
width: 110px; width: 110px;
text-align: left; text-align: left;
} }
// Stolpec z vrednostjo // Stolpec z vrednostjo
&.col_value{ &.cell_value{
width: 110px; width: 110px;
text-align: right; text-align: right;
@ -98,16 +114,9 @@
line-height: 8px; line-height: 8px;
border: 0 !important; border: 0 !important;
} }
// Variabla
.anl_variabla{
a{
color: $black;
text-decoration: none;
}
}
} }
// 1. header vrstica
&.row1{ &.row1{
th, th,
td{ td{
@ -116,9 +125,16 @@
line-height: 20px; line-height: 20px;
background-color: $light-gray; background-color: $light-gray;
span{
font-size: 16px;
font-weight: 600;
line-height: 20px;
}
} }
} }
// 2. header vrstica
&.row2{ &.row2{
th, th,
td{ td{
@ -128,13 +144,15 @@
background-color: $light-gray; background-color: $light-gray;
// Stolpec z vrednostmi span{
&.anl_w70{ font-size: 15px;
text-align: center; font-weight: 600;
line-height: 19px;
} }
} }
} }
// 3. in 4. opcijska header vrstica
&.row3, &.row3,
&.row4{ &.row4{
th, th,
@ -143,32 +161,91 @@
} }
} }
// Vrstica z vprasanjem
&.row_question{ &.row_question{
td{ td{
font-weight: 600; font-weight: 600;
background-color: $light-gray2;
} }
} }
// Vrstica z gridom
&.row_grid{ &.row_grid{
} }
// Vrstica z variablo in vrednostmi
&.row_var{ &.row_var{
} }
&.sum{ // Vrstica z missingi
&.row_missing{
td{ td{
background: rgba(255, 199, 0, 0.05); background: rgba(255, 199, 0, 0.05);
} }
} }
&.sum.all{ // Vrstica s sumo za missinge
&.row_missing.row_sum{
td{
background: rgba(255, 199, 0, 0.05);
}
}
// Vrstica s sumo
&.row_sum{
td{
background: rgba(255, 199, 0, 0.05);
&.cell_missing{
text-align: center;
span{
cursor: pointer;
color: $blue;
transition: 0.2s;
&:hover{
color: $dark-blue;
.faicon:before{
color: $dark-blue;
}
}
.faicon{
margin-right: 8px;
&:before{
font-size: 12px;
}
}
}
}
}
}
// Vrstica s al
&.row_sum_all{
td{ td{
background: rgba(255, 199, 0, 0.1); background: rgba(255, 199, 0, 0.1);
&.cell_var{
border-right: 0;
}
&.cell_question{
border-left: 0;
}
} }
} }
} }

4
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -15,7 +15,7 @@
.faicon{ .faicon{
&:before{ &:before{
font-size: 16px; font-size: 14px;
} }
&.an_freq, &.an_freq,
@ -24,7 +24,7 @@
&.an_sigma, &.an_sigma,
&.an_sigmax{ &.an_sigmax{
&:before{ &:before{
font-size: 22px; font-size: 20px;
} }
} }
} }

0
resources/sass/admin_new/pages/survey_analysis/custom_report.scss → resources/sass/admin_new/pages/survey_analysis/page_break.scss
View File

0
resources/sass/admin_new/pages/survey_analysis/charts.scss → resources/sass/admin_new/pages/survey_analysis/page_charts.scss
View File

0
resources/sass/admin_new/pages/survey_analysis/freq.scss → resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
View File

0
resources/sass/admin_new/pages/survey_analysis/sums.scss → resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
View File

11
resources/sass/admin_new/pages/survey_analysis/page_desc.scss Normal file
View File

@ -0,0 +1,11 @@
#div_analiza_data table.table_desc{
tr td.cell_var{
text-align: left;
}
tr.row_question td{
background-color: $white;
}
}

0
resources/sass/admin_new/pages/survey_analysis/page_freq.scss Normal file
View File

0
resources/sass/admin_new/pages/survey_analysis/page_means.scss Normal file
View File

0
resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss Normal file
View File

0
resources/sass/admin_new/pages/survey_analysis/page_sums.scss Normal file
View File

0
resources/sass/admin_new/pages/survey_analysis/page_ttest.scss Normal file
View File

15
resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss
View File

@ -2,9 +2,14 @@
@import "preview"; @import "preview";
@import "icons"; @import "icons";
@import "sums"; @import "page_sums";
@import "freq"; @import "page_freq";
@import "page_desc";
@import "page_crosstab";
@import "page_multicrosstab";
@import "page_ttest";
@import "page_means";
@import "page_break";
@import "charts"; @import "page_charts";
@import "page_custom_report";
@import "custom_report";