';
$ttestData1 = explode("-", $reportElement['spr1']);
$spr = $ttestData1[1];
@@ -745,7 +757,8 @@ class SurveyCustomReport {
$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
- echo '
';
+ echo '
';
+ echo '
';
}
break;
@@ -756,7 +769,8 @@ class SurveyCustomReport {
$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
- echo '
';
+ echo '
';
+ echo '
';
}
break;
@@ -768,20 +782,22 @@ class SurveyCustomReport {
$checked = ($check1 == $spr.'_'.$sekvenca.'_'.$value || $check2 == $spr.'_'.$sekvenca.'_'.$value) ? true : false;
$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
- echo '
';
+ echo '
';
+ echo '
';
}
break;
case 16: #mcheck
#nardimo inpute za vse opcije
- # poi��emo pripadajo�o sekvenco
+ # poiščemo pripadajočo sekvenco
#nardimo inpute za vse opcije
$option = '1';
foreach ($_spr_data['grids'][$grid]['variables'] as $vid => $variable) {
$checked = ($check1 == $spr.'_'.$variable['sequence'].'_'.$option || $check2 == $spr.'_'.$variable['sequence'].'_'.$option) ? true : false;
$disabled = ($check1 != null && $check2 != null && !$checked) ? ' disabled="disabled"' : '';
- echo '
';
+ echo '
';
+ echo '
';
}
break;
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index 764420b1e..ce2373ce4 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -8778,25 +8778,28 @@ class SurveyChart {
global $site_path;
global $lang;
- echo '
';
- echo '
'.$lang['srv_chart_settings'].'';
-
- //Poravnava texta
- echo '
';
-
- echo '
';
- echo '
';
+ echo '
';
+ //echo '
'.$lang['srv_chart_settings'].'';
+
+
+ echo '
';
+
+
echo '
';
}
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
index 4af44f382..87be3ea6f 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
@@ -256,7 +256,7 @@ class SurveyMultiCrosstabs {
$this->getSelectedVars();
// Zvezdica za creport - ce smo v custom reportu tega ne izpisemo
- if($_GET['m'] != 'analysis_creport'){
+ /*if($_GET['m'] != 'analysis_creport'){
echo '
';
@@ -264,7 +264,7 @@ class SurveyMultiCrosstabs {
SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id);
echo '
';
- }
+ }*/
echo '
';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6cbd02ff6..8195c439d 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -27227,7 +27227,11 @@ iframe#ifmcontentstoprint {
#div_analiza_data.crosstabs #crosstab_tables .table_holder table.table_crosstab table.cell_table > tbody > tr table.cell_table tr td:last-child {
border-right: 0;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend {
+#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder {
+ margin: 16px auto 0 auto;
+}
+
+#crosstab_legend {
display: flex;
align-items: center;
width: fit-content;
@@ -27237,23 +27241,23 @@ iframe#ifmcontentstoprint {
border: 1px solid #E5E5E5;
border-radius: 2px;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line {
+#crosstab_legend .crosstab_legend_line {
display: flex;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line:nth-child(2) {
+#crosstab_legend .crosstab_legend_line:nth-child(2) {
margin-left: 32px;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .title {
+#crosstab_legend .crosstab_legend_line .title {
margin-right: 8px;
font-size: 14px;
line-height: 20px;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak {
+#crosstab_legend .crosstab_legend_line .trak {
display: flex;
align-items: center;
justify-content: center;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder #crosstab_legend .crosstab_legend_line .trak div {
+#crosstab_legend .crosstab_legend_line .trak div {
width: 22px;
height: 22px;
font-weight: 400;
@@ -27261,52 +27265,64 @@ iframe#ifmcontentstoprint {
text-align: center;
line-height: 20px;
}
-#div_analiza_data.crosstabs #crosstab_tables .table_holder .crosstab_chart_holder {
- margin: 16px auto 0 auto;
-}
-#div_analiza_data.crosstabs .ctbChck_sp0 {
+
+.ctbChck_sp0 {
background-color: #fcfcfc !important;
}
-#div_analiza_data.crosstabs .ctbChck_sp1 {
+
+.ctbChck_sp1 {
background-color: #FEFFE3 !important;
}
-#div_analiza_data.crosstabs .ctbChck_sp2 {
+
+.ctbChck_sp2 {
background-color: #FCFFC2 !important;
}
-#div_analiza_data.crosstabs .ctbChck_sp3 {
+
+.ctbChck_sp3 {
background-color: #FBFFA8 !important;
}
-#div_analiza_data.crosstabs .crossCheck_EC {
+
+.crossCheck_EC {
background-color: #FFFAE8 !important;
}
-#div_analiza_data.crosstabs .crossCheck_RE {
+
+.crossCheck_RE {
background-color: #FFF6D1 !important;
}
-#div_analiza_data.crosstabs .crossCheck_SR {
+
+.crossCheck_SR {
background-color: #FFECA2 !important;
}
-#div_analiza_data.crosstabs .crossCheck_AR {
+
+.crossCheck_AR {
background-color: #FFDA46 !important;
}
-#div_analiza_data.crosstabs .rsdl_bck0 {
+
+.rsdl_bck0 {
background-color: white !important;
}
-#div_analiza_data.crosstabs .rsdl_bck1 {
+
+.rsdl_bck1 {
background-color: #fae2e2 !important;
}
-#div_analiza_data.crosstabs .rsdl_bck2 {
+
+.rsdl_bck2 {
background-color: #ff9d9d !important;
}
-#div_analiza_data.crosstabs .rsdl_bck3 {
+
+.rsdl_bck3 {
background-color: #f84242 !important;
}
-#div_analiza_data.crosstabs .rsdl_bck4 {
+
+.rsdl_bck4 {
background-color: #E8F1FF !important;
}
-#div_analiza_data.crosstabs .rsdl_bck5 {
+
+.rsdl_bck5 {
background-color: #B9D5FF !important;
}
-#div_analiza_data.crosstabs .rsdl_bck6 {
+
+.rsdl_bck6 {
background-color: #74ACFF !important;
}
@@ -28091,7 +28107,7 @@ iframe#ifmcontentstoprint {
}
.chart_holder .other_settings,
.tableChart .other_settings {
- margin-top: 50px;
+ margin-top: 70px;
margin-bottom: 20px;
/*height: 60px;*/
}
@@ -28118,9 +28134,22 @@ iframe#ifmcontentstoprint {
.tableChart {
position: relative;
+ padding-bottom: 24px;
}
.tableChart .custom_report_include {
- display: none;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ margin: 0 !important;
+}
+.tableChart .custom_report_include a {
+ text-decoration: none;
+}
+.tableChart .custom_report_include a .faicon:before {
+ vertical-align: 1px;
+}
+.tableChart .custom_report_include {
+ display: none !important;
}
.tableChart .chart_setting_exportLinks {
justify-content: flex-end;
@@ -28440,7 +28469,7 @@ ul.vrednost_sort input[type=text] {
.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head {
cursor: pointer;
display: flex;
- align-items: center;
+ align-items: baseline;
justify-content: space-between;
padding: 8px 8px 8px 16px;
background-color: #F8F8F8;
@@ -28449,6 +28478,10 @@ ul.vrednost_sort input[type=text] {
font-weight: 600;
text-transform: uppercase;
}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head .report_element_icons {
+ display: flex;
+ flex-wrap: nowrap;
+}
.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_head .report_element_icons .faicon:before {
color: #1E88E5;
font-size: 16px;
@@ -28458,11 +28491,33 @@ ul.vrednost_sort input[type=text] {
}
.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings {
display: flex;
+ align-items: center;
padding: 16px 16px 8px 16px;
}
.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings select {
margin: 0 16px 0 0;
}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan {
+ display: flex;
+ flex-direction: column;
+ padding: 8px;
+ max-width: 300px;
+ background-color: #F8F8F8;
+ border: 1px solid #E5E5E5;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span {
+ margin-bottom: 8px;
+ color: #333333;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span label {
+ font-size: 14px;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span.gray {
+ color: #C4C4C4;
+}
+.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_settings #ttestVariablesSpan span:last-of-type {
+ margin-bottom: 0;
+}
.subpage_analysis_creport #anketa_custom_report #custom_report_elements ul#custom_report_sortable li.report_element_standard .report_element .report_element_data {
padding: 16px 16px;
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index df1522536..b5de8317f 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -291,7 +291,7 @@
}
.other_settings {
- margin-top: 50px;
+ margin-top: 70px;
margin-bottom: 20px;
/*height: 60px;*/
@@ -316,9 +316,25 @@
.tableChart{
position: relative;
+ padding-bottom: 24px;
.custom_report_include{
- display: none;
+ position: absolute;
+ bottom: 0;
+ left: 0;
+
+ margin: 0 !important;
+
+ a{
+ text-decoration: none;
+
+ .faicon:before{
+ vertical-align: 1px;
+ }
+ }
+ }
+ .custom_report_include{
+ display: none !important;
}
.chart_setting_exportLinks{
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
index e1e79c6b0..bd82d1fc3 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss
@@ -151,104 +151,104 @@
}
}
- #crosstab_legend{
- display: flex;
- align-items: center;
-
- width: fit-content;
- margin-top: 16px;
- padding: 8px 16px;
-
- background-color: $light-gray;
- border: 1px solid $gray;
- border-radius: 2px;
-
- .crosstab_legend_line{
- display: flex;
-
- &:nth-child(2){
- margin-left: 32px;
- }
-
- .title{
- margin-right: 8px;
-
- font-size: 14px;
- line-height: 20px;
- }
-
- .trak{
- display: flex;
- align-items: center;
- justify-content: center;
-
- div{
- width: 22px;
- height: 22px;
-
- font-weight: 400;
- font-size: 16px;
- text-align: center;
- line-height: 20px;
- }
- }
- }
- }
-
.crosstab_chart_holder{
margin: 16px auto 0 auto;
}
}
}
-
-
- // Barve
- .ctbChck_sp0 {
- background-color: #fcfcfc !important;
- }
- .ctbChck_sp1 {
- background-color: #FEFFE3 !important;
- }
- .ctbChck_sp2 {
- background-color: #FCFFC2 !important;
- }
- .ctbChck_sp3 {
- background-color: #FBFFA8 !important;
- }
- .crossCheck_EC {
- background-color: #FFFAE8 !important;
- }
- .crossCheck_RE {
- background-color: #FFF6D1 !important;
- }
- .crossCheck_SR {
- background-color: #FFECA2 !important;
- }
- .crossCheck_AR {
- background-color: #FFDA46 !important;
- }
- .rsdl_bck0 {
- background-color: white !important;
- }
- .rsdl_bck1 {
- background-color: rgb(250, 226, 226) !important;
- }
- .rsdl_bck2 {
- background-color: rgb(255, 157, 157) !important;
- }
- .rsdl_bck3 {
- background-color: rgb(248, 66, 66) !important;
- }
- .rsdl_bck4 {
- background-color: #E8F1FF !important;
- }
- .rsdl_bck5 {
- background-color: #B9D5FF !important;
- }
- .rsdl_bck6 {
- background-color: #74ACFF !important;
- }
-
+}
+
+
+#crosstab_legend{
+ display: flex;
+ align-items: center;
+
+ width: fit-content;
+ margin-top: 16px;
+ padding: 8px 16px;
+
+ background-color: $light-gray;
+ border: 1px solid $gray;
+ border-radius: 2px;
+
+ .crosstab_legend_line{
+ display: flex;
+
+ &:nth-child(2){
+ margin-left: 32px;
+ }
+
+ .title{
+ margin-right: 8px;
+
+ font-size: 14px;
+ line-height: 20px;
+ }
+
+ .trak{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ div{
+ width: 22px;
+ height: 22px;
+
+ font-weight: 400;
+ font-size: 16px;
+ text-align: center;
+ line-height: 20px;
+ }
+ }
+ }
+}
+
+
+// Barve
+.ctbChck_sp0 {
+ background-color: #fcfcfc !important;
+}
+.ctbChck_sp1 {
+ background-color: #FEFFE3 !important;
+}
+.ctbChck_sp2 {
+ background-color: #FCFFC2 !important;
+}
+.ctbChck_sp3 {
+ background-color: #FBFFA8 !important;
+}
+.crossCheck_EC {
+ background-color: #FFFAE8 !important;
+}
+.crossCheck_RE {
+ background-color: #FFF6D1 !important;
+}
+.crossCheck_SR {
+ background-color: #FFECA2 !important;
+}
+.crossCheck_AR {
+ background-color: #FFDA46 !important;
+}
+.rsdl_bck0 {
+ background-color: white !important;
+}
+.rsdl_bck1 {
+ background-color: rgb(250, 226, 226) !important;
+}
+.rsdl_bck2 {
+ background-color: rgb(255, 157, 157) !important;
+}
+.rsdl_bck3 {
+ background-color: rgb(248, 66, 66) !important;
+}
+.rsdl_bck4 {
+ background-color: #E8F1FF !important;
+}
+.rsdl_bck5 {
+ background-color: #B9D5FF !important;
+}
+.rsdl_bck6 {
+ background-color: #74ACFF !important;
}
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
index e914e0788..218a0dcd2 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss
@@ -163,7 +163,7 @@
cursor: pointer;
display: flex;
- align-items: center;
+ align-items: baseline;
justify-content: space-between;
padding: 8px 8px 8px 16px;
@@ -176,6 +176,8 @@
}
.report_element_icons{
+ display: flex;
+ flex-wrap: nowrap;
.faicon{
@@ -194,12 +196,45 @@
.report_element_settings{
display: flex;
+ align-items: center;
padding: 16px 16px 8px 16px;
select{
margin: 0 16px 0 0;
}
+
+ #ttestVariablesSpan{
+ display: flex;
+ flex-direction: column;
+
+ padding: 8px;
+ max-width: 300px;
+
+ 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);
+ }
+ }
}
.report_element_data{