From 707c3ebe11a4cdf1a9081116caa4f131f9882e7c Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 14 Apr 2022 00:41:42 +0200 Subject: [PATCH 1/6] [Redizajn 1KA] - Status --> Neodgovor spremenljivke --> Spremenljivke - zadnji popravki --- admin/survey/classes/tracking/CrossRoad.php | 2 +- lang/2.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 9a6ea6a5e..129a7cfe1 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -72,7 +72,7 @@ class CrossRoad { $first_action = NAVI_STATUS; $second_action = NAVI_STATUS_OSNOVNI; - $layout_width = 'narrow'; + $layout_width = 'wide'; if ($_GET['m'] == 'advanced') $layout_width = 'fullwidth'; diff --git a/lang/2.php b/lang/2.php index 4d953ca2c..633c82e99 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6635,11 +6635,11 @@ $lang = array ( 'srv_para_breaks_value_bruto_short' => 'GBR
[%]', 'srv_para_breaks_value_neto_short' => 'NBR
[%]', 'srv_para_breaks_graph_title' => 'Graphical representation of the Break rate (%)', - 'srv_para_show_question_advanced' => 'Question', + 'srv_para_show_question_advanced' => 'Label', 'srv_para_show_show_graph_advanced' => 'Graph', - 'srv_para_show_question_basic' => 'Question', + 'srv_para_show_question_basic' => 'Label', 'srv_para_show_show_graph_basic' => 'Graph', - 'srv_para_show_question_breaks' => 'Question', + 'srv_para_show_question_breaks' => 'Label', 'srv_para_show_show_graph_breaks' => 'Graph', 'srv_para_close_settings' => 'Close settings', 'srv_para_graph_type' => 'V grafu prikaži', From dabcf61d9753d7ea406a5ae409b100c31fad24ca Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 14 Apr 2022 01:16:30 +0200 Subject: [PATCH 2/6] [Redizajn 1KA] - Status --> Neodgovor spremenljivke --> Podrobno - scroll na tabelo --- .../survey/classes/class.SurveyParaAnalysis.php | 12 ++++++++++-- admin/survey/script/script.js | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/admin/survey/classes/class.SurveyParaAnalysis.php b/admin/survey/classes/class.SurveyParaAnalysis.php index 792564237..59cd9456c 100644 --- a/admin/survey/classes/class.SurveyParaAnalysis.php +++ b/admin/survey/classes/class.SurveyParaAnalysis.php @@ -896,8 +896,14 @@ class SurveyParaAnalysis{ $this->displayFormula(); - - + + echo '
'; + echo '
'; + + echo ''; + echo ''; echo ''; @@ -1171,6 +1177,8 @@ class SurveyParaAnalysis{ } } echo '
'; + echo '
'; + echo '
'; SurveyAnalysisHelper::getInstance()->displayMissingLegend(); } diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index f73ed4a8c..c0d052e6a 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -4530,13 +4530,28 @@ function changeParaAnalysisCbx(what, reverse) { value = !value; } var what_id = $(what).attr('id'); - + $.post('ajax.php?t=ParaAnalysis&a=setCbx', {anketa: srv_meta_anketa_id,value:value,what:what_id}, function () { window.location.reload(); }); return false; } + +function check_para_wrap() { + + var value = $("#show_with_zero").is(":checked"); + if (value) { + $("#scroll1").removeClass("table-horizontal-scroll-wrapper1"); + $("#scroll2").removeClass("table-horizontal-scroll-wrapper2"); + } + else { + $("#scroll1").addClass("table-horizontal-scroll-wrapper1"); + $("#scroll2").addClass("table-horizontal-scroll-wrapper2"); + } + +} + function changeParaAnalysisSelect(what) { var value = $(what).val(); From 03d0ea3a9ef854bc74b374d9dbe29b0e55e72e26 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Thu, 14 Apr 2022 03:03:37 +0200 Subject: [PATCH 3/6] [Redizajn 1KA] - Urejanje --> Nastavitve --> Telefonska anketa - v2 // Dodaj --- .../survey/classes/class.SurveyTelephone.php | 18 +- public/css/admin_new.css | 2906 +++++++++-------- .../pages/survey_edit/telefonska_anketa.scss | 98 +- 3 files changed, 1539 insertions(+), 1483 deletions(-) diff --git a/admin/survey/classes/class.SurveyTelephone.php b/admin/survey/classes/class.SurveyTelephone.php index b8416f8b8..07477947d 100644 --- a/admin/survey/classes/class.SurveyTelephone.php +++ b/admin/survey/classes/class.SurveyTelephone.php @@ -516,7 +516,6 @@ class SurveyTelephone { function addRecipientsView( $fields = array(), $recipients_list=null) { #prikažemo vmesnik za dodajanje respondentov global $lang; - echo '

'.$lang['srv_inv_add_recipients_heading'].'

'; echo '
'; $this->displayAddRecipientsView($fields, $recipients_list); @@ -560,12 +559,12 @@ class SurveyTelephone { # profili respondentov echo '
'; - echo '

'.$lang['srv_inv_recipient_select_list'].'

'; + echo '

'.$lang['srv_inv_recipient_select_list'].'

'; $this->listRecipientsProfiles(); echo '
'; # id=inv_recipients_profiles_holder - echo '
'; + echo '
'.$lang['srv_inv_recipiens_from'].''; $sqlSysMapping = sisplet_query("SELECT * FROM srv_invitations_mapping WHERE sid = '$this->sid'"); if (mysqli_num_rows($sqlSysMapping) > 0) { @@ -580,8 +579,6 @@ class SurveyTelephone { .($sysUserToAdd > 0 ? ' ('.$sysUserToAdd.')' : '').''; echo Help::display('inv_recipiens_from_system');*/ - echo '
'; - echo '
'; if ($import_type == 3) { #$this->displayFromSystemVariables(); $this->createSystemVariablesMapping(); @@ -605,6 +602,7 @@ class SurveyTelephone { echo ''; echo ''.$lang['srv_'.$field].''; echo ''; + if ($is_selected == 1) { $field_lang[] = $lang['srv_'.$field]; } @@ -618,12 +616,12 @@ class SurveyTelephone { echo '