diff --git a/admin/survey/classes/class.SurveyPostProcess.php b/admin/survey/classes/class.SurveyPostProcess.php index addd99603..caf832f01 100644 --- a/admin/survey/classes/class.SurveyPostProcess.php +++ b/admin/survey/classes/class.SurveyPostProcess.php @@ -203,7 +203,7 @@ class SurveyPostProcess { echo '
'; echo '0?'checked':'').' onclick="return false;">'; echo ''; - echo ''; SurveyAnalysis::Init($this->anketa); $freq = SurveyAnalysis::getFrequencys(); diff --git a/admin/survey/script/postProcess.js b/admin/survey/script/postProcess.js index f7d096dcc..636ea15c3 100644 --- a/admin/survey/script/postProcess.js +++ b/admin/survey/script/postProcess.js @@ -404,7 +404,6 @@ function coding_filter (seq) { }); } - function coding_merge (spr_id, vre_id, usr_id, merge) { if (spr_id > 0 && vre_id > 0 && merge > 0) { diff --git a/public/css/admin_new.css b/public/css/admin_new.css index ac16b4275..db207c44c 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -23295,6 +23295,12 @@ div.subpage_coding .layout_right_item fieldset div#analiza_data { max-width: 932px; overflow-x: scroll; } +div.subpage_coding .layout_right_item fieldset div#analiza_data div.dataFullscreen { + display: none; +} +div.subpage_coding .layout_right_item fieldset div#analiza_data div.dataSettingsBasic { + border: none; +} div.subpage_coding #dataTableScroller, div.subpage_coding #div_analiza_filtri_right { display: none; diff --git a/resources/sass/admin_new/pages/survey_data/calculations.scss b/resources/sass/admin_new/pages/survey_data/calculations.scss index 1d6f0bbc1..4038bcc83 100644 --- a/resources/sass/admin_new/pages/survey_data/calculations.scss +++ b/resources/sass/admin_new/pages/survey_data/calculations.scss @@ -54,7 +54,15 @@ div.subpage_coding { fieldset { div#analiza_data { max-width: 932px; - overflow-x: scroll; + overflow-x: scroll; + + div.dataFullscreen{ + display: none; + } + + div.dataSettingsBasic { + border: none; + } } } }