diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php index 6ddeedf16..5f6e59e7e 100644 --- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php +++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php @@ -659,21 +659,83 @@ class MobileSurveyAdmin{ ), array( 'title' => $lang['srv_data_navigation_calculate'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=calculation', - 'active' => ($_GET['m'] == M_COLLECT_DATA_CALCULATION || $_GET['m'] == M_COLLECT_DATA_CODING || $_GET['m'] == 'coding_auto' || $_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? 'active' : '') + 'name' => 'calculation_submenu', + 'submenu' => array( + array( + 'title' => $lang['navigation_NAVI_DATA_CALC_CALCULATION'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m='.M_COLLECT_DATA_CALCULATION, + 'active' => ($_GET['a'] == A_COLLECT_DATA && ($_GET['m'] == '' || $_GET['m'] == M_COLLECT_DATA_CALCULATION) ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_CALC_CODING'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m='.M_COLLECT_DATA_CODING, + 'active' => ($_GET['a'] == A_COLLECT_DATA && $_GET['m'] == M_COLLECT_DATA_CODING? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_CALC_CODING_AUTO'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m='.M_COLLECT_DATA_CODING_AUTO, + 'active' => ($_GET['a'] == A_COLLECT_DATA && $_GET['m'] == M_COLLECT_DATA_CODING_AUTO ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_CALC_RECODING'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m='.M_COLLECT_DATA_RECODING, + 'active' => ($_GET['a'] == A_COLLECT_DATA && $_GET['m'] == M_COLLECT_DATA_RECODING ? 'active' : '') + ), + ), + 'active' => ($_GET['m'] == M_COLLECT_DATA_CALCULATION || $_GET['m'] == M_COLLECT_DATA_CODING || $_GET['m'] == M_COLLECT_DATA_CODING_AUTO || $_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? 'active' : '') ), array( 'title' => $lang['srv_data_navigation_import'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA . '&m=append', - 'active' => ($_GET['m'] == 'append' || $_GET['m'] == 'merge' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? 'active' : '') + 'name' => 'import_submenu', + 'submenu' => array( + array( + 'title' => $lang['navigation_NAVI_DATA_IMPORT_APPEND'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m=append', + 'active' => ($_GET['a'] == A_COLLECT_DATA && ($_GET['m'] == '' || $_GET['m'] == 'append') ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_IMPORT_MERGE'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA.'&m=merge', + 'active' => ($_GET['a'] == A_COLLECT_DATA && $_GET['m'] == 'merge'? 'active' : '') + ) + ), + 'active' => ($_GET['m'] == 'merge' || $_GET['m'] == 'append' ? 'active' : '') ) ); if ($d->checkDostopSub('export')) { + $submenu[] = array( 'title' => $lang['srv_export_tab'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_COLLECT_DATA_EXPORT, - 'active' => ($this->second_action == NAVI_DATA_EXPORT ? 'active' : '') + 'name' => 'export_submenu', + 'submenu' => array( + array( + 'title' => $lang['navigation_NAVI_DATA_EXPORT_SPSS'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA_EXPORT.'&m='.M_EXPORT_SPSS, + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT && $_GET['m'] == M_EXPORT_SPSS ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_EXPORT_SAV'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA_EXPORT.'&m='.M_EXPORT_SAV, + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT && $_GET['m'] == M_EXPORT_SAV ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_EXPORT_EXCEL_XLS'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA_EXPORT.'&m='.M_EXPORT_EXCEL_XLS, + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT && $_GET['m'] == M_EXPORT_EXCEL_XLS ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_EXPORT_EXCEL'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA_EXPORT.'&m='.M_EXPORT_EXCEL, + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT && $_GET['m'] == M_EXPORT_EXCEL ? 'active' : '') + ), + array( + 'title' => $lang['navigation_NAVI_DATA_EXPORT_TXT'], + 'url' => 'index.php?anketa='.$this->surveyAdminClass->anketa.'&a='.A_COLLECT_DATA_EXPORT.'&m='.M_EXPORT_TXT, + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT && $_GET['m'] == M_EXPORT_TXT ? 'active' : '') + ), + ), + 'active' => ($_GET['a'] == A_COLLECT_DATA_EXPORT ? 'active' : '') ); } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 0f8b3a22d..d2596438a 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -222,6 +222,33 @@ class CrossRoad { case A_COLLECT_DATA: $first_action = NAVI_RESULTS; $second_action = NAVI_DATA; + + if ($_GET['m'] == M_COLLECT_DATA_CALCULATION) { + $second_action = NAVI_DATA_CALC; + $third_action = NAVI_DATA_CALC_CALCULATION; + } + elseif($_GET['m'] == M_COLLECT_DATA_CODING){ + $second_action = NAVI_DATA_CALC; + $third_action = NAVI_DATA_CALC_CODING; + } + elseif($_GET['m'] == M_COLLECT_DATA_CODING_AUTO){ + $second_action = NAVI_DATA_CALC; + $third_action = NAVI_DATA_CALC_CODING_AUTO; + } + elseif($_GET['m'] == M_COLLECT_DATA_RECODING){ + $second_action = NAVI_DATA_CALC; + $third_action = NAVI_DATA_CALC_RECODING; + } + + elseif($_GET['m'] == M_COLLECT_DATA_APPEND){ + $second_action = NAVI_DATA_IMPORT; + $third_action = NAVI_DATA_IMPORT_APPEND; + } + elseif($_GET['m'] == M_COLLECT_DATA_MERGE){ + $second_action = NAVI_DATA_IMPORT; + $third_action = NAVI_DATA_IMPORT_MERGE; + } + $status = 4; break; @@ -229,12 +256,33 @@ class CrossRoad { case A_COLLECT_DATA_EXPORT: $first_action = NAVI_RESULTS; $second_action = NAVI_DATA_EXPORT; + + if($_GET['m'] == M_EXPORT_EXCEL){ + $third_action = NAVI_DATA_EXPORT_EXCEL; + } + elseif($_GET['m'] == M_EXPORT_EXCEL_XLS){ + $third_action = NAVI_DATA_EXPORT_EXCEL_XLS; + } + elseif($_GET['m'] == M_EXPORT_SAV){ + $third_action = NAVI_DATA_EXPORT_SAV; + } + elseif($_GET['m'] == M_EXPORT_TXT){ + $third_action = NAVI_DATA_EXPORT_TXT; + } + else{ + $third_action = NAVI_DATA_EXPORT_SPSS; + } + $status = 4; + if ($_GET['m'] == A_COLLECT_DATA_EXPORT_ALL) { $first_action = NAVI_RESULTS; $second_action = NAVI_ANALYSIS_LINKS; + $third_action = ''; + $status = 2; } + break; # dodatne nastavitve diff --git a/admin/survey/definition.php b/admin/survey/definition.php index 033b080de..50206f69a 100644 --- a/admin/survey/definition.php +++ b/admin/survey/definition.php @@ -42,7 +42,6 @@ define("NAVI_OBJAVA", "NAVI_OBJAVA"); define("NAVI_ANALYSIS", "NAVI_ANALYSIS"); - define("NAVI_RESULTS", "NAVI_RESULTS"); define("NAVI_ADVANCED", "NAVI_ADVANCED"); define("NAVI_UPORABNOST", "NAVI_UPORABNOST"); define("NAVI_HIERARHIJA_SUPERADMIN", "NAVI_HIERARHIJA_SUPERADMIN"); @@ -57,9 +56,26 @@ define("NAVI_STATISTIC_ANALYSIS", "NAVI_STATISTIC_ANALYSIS"); define("NAVI_ANALYSIS_LINKS", "NAVI_ANALYSIS_LINKS"); define("NAVI_ANALYSIS_TIMES", "NAVI_ANALYSIS_TIMES"); - define("NAVI_DATA", "NAVI_DATA"); - define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT"); + define("NAVI_RESULTS", "NAVI_RESULTS"); + define("NAVI_DATA", "NAVI_DATA"); + + define("NAVI_DATA_CALC", "NAVI_DATA_CALC"); + define("NAVI_DATA_CALC_CALCULATION", "NAVI_DATA_CALC_CALCULATION"); + define("NAVI_DATA_CALC_CODING", "NAVI_DATA_CALC_CODING"); + define("NAVI_DATA_CALC_CODING_AUTO", "NAVI_DATA_CALC_CODING_AUTO"); + define("NAVI_DATA_CALC_RECODING", "NAVI_DATA_CALC_RECODING"); + + define("NAVI_DATA_IMPORT", "NAVI_DATA_IMPORT"); + define("NAVI_DATA_IMPORT_APPEND", "NAVI_DATA_IMPORT_APPEND"); + define("NAVI_DATA_IMPORT_MERGE", "NAVI_DATA_IMPORT_MERGE"); + + define("NAVI_DATA_EXPORT", "NAVI_DATA_EXPORT"); + define("NAVI_DATA_EXPORT_EXCEL", "NAVI_DATA_EXPORT_EXCEL"); + define("NAVI_DATA_EXPORT_EXCEL_XLS", "NAVI_DATA_EXPORT_EXCEL_XLS"); + define("NAVI_DATA_EXPORT_SAV", "NAVI_DATA_EXPORT_SAV"); + define("NAVI_DATA_EXPORT_TXT", "NAVI_DATA_EXPORT_TXT"); + define("NAVI_DATA_EXPORT_SPSS", "NAVI_DATA_EXPORT_SPSS"); # Dashboard - status - report define("A_REPORTI", "reporti"); @@ -175,10 +191,13 @@ define('M_COLLECT_DATA_PRINT', 'print'); define('M_COLLECT_DATA_CALCULATION', 'calculation'); define('M_COLLECT_DATA_CODING', 'coding'); + define('M_COLLECT_DATA_CODING_AUTO', 'coding_auto'); define('M_COLLECT_DATA_RECODING', 'recoding'); define('M_COLLECT_DATA_RECODING_DASHBOARD', 'recoding_dashboard'); define('A_COLLECT_DATA_EXPORT', 'export'); define('A_COLLECT_DATA_EXPORT_ALL', 'export_PDF'); + define('M_COLLECT_DATA_APPEND', 'append'); + define('M_COLLECT_DATA_MERGE', 'merge'); define('M_EXPORT_EXCEL', 'excel'); define('M_EXPORT_EXCEL_XLS', 'excel_xls'); define('M_EXPORT_SPSS', 'spss'); diff --git a/lang/1.php b/lang/1.php index 2903441be..5c9e8307f 100644 --- a/lang/1.php +++ b/lang/1.php @@ -7885,13 +7885,32 @@ $lang = array ( "navigation_diagnostika" => 'Diagnostika', "navigation_NAVI_TESTIRANJE_KOMENTARJI" => 'Komentarji', "navigation_NAVI_TESTIRANJE_VNOSI" => 'Avtomatski vnosi', + "navigation_NAVI_OBJAVA" => 'Objava', "navigation_NAVI_OBJAVA_SETTINGS" => 'Pregled', "navigation_NAVI_OBJAVA_URL" => 'Povezave', "navigation_invitations" => 'Vabila', + "navigation_NAVI_RESULTS" => 'Podatki', - "navigation_NAVI_DATA" => isset($_GET['m']) ? ($_GET['m'] == 'calculation' ? 'Izračuni' : ($_GET['m'] == 'append' ? 'Uvoz' : '')) : ($_GET['a'] == 'data' ? 'Pregledovanje' : ''), + "navigation_NAVI_DATA" => 'Pregledovanje', + + "navigation_NAVI_DATA_CALC" => 'Izračuni', + "navigation_NAVI_DATA_CALC_CALCULATION" => 'Izračunane vrednosti', + "navigation_NAVI_DATA_CALC_CODING" => 'Ročno kodiranje', + "navigation_NAVI_DATA_CALC_CODING_AUTO" => 'Avtomatsko kodiranje', + "navigation_NAVI_DATA_CALC_RECODING" => 'Rekodiranje', + "navigation_NAVI_DATA_EXPORT" => 'Izvoz', + "navigation_NAVI_DATA_EXPORT_EXCEL" => 'CSV', + "navigation_NAVI_DATA_EXPORT_EXCEL_XLS" => 'Excel (XLS)', + "navigation_NAVI_DATA_EXPORT_SAV" => 'SPSS SAV', + "navigation_NAVI_DATA_EXPORT_TXT" => 'Tekstovna datoteka', + "navigation_NAVI_DATA_EXPORT_SPSS" => 'SPSS SYNTAX', + + "navigation_NAVI_DATA_IMPORT" => 'Uvoz', + "navigation_NAVI_DATA_IMPORT_APPEND" => 'Dodaj podatke', + "navigation_NAVI_DATA_IMPORT_MERGE" => 'Združi podatke', + "navigation_NAVI_ANALYSIS" => 'Analize', "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Grafi' : 'Statistike'), "navigation_NAVI_STATISTIC_ANALYSIS_SUMARNIK" => 'Sumarnik', diff --git a/lang/2.php b/lang/2.php index c58135202..55902ab4b 100644 --- a/lang/2.php +++ b/lang/2.php @@ -7787,9 +7787,8 @@ GDPR introduction preview", "navigation_NAVI_OBJAVA_SETTINGS" => 'Settings', "navigation_NAVI_OBJAVA_URL" => 'Url', "navigation_invitations" => 'Invitations', - "navigation_NAVI_RESULTS" => 'Data', - "navigation_NAVI_DATA" => isset($_GET['m']) ? ($_GET['m'] == 'calculation' ? 'Computations' : ($_GET['m'] == 'append' ? 'Import' : '')) : ($_GET['a'] == 'data' ? 'Browse' : ''), - "navigation_NAVI_DATA_EXPORT" => 'Export', + + "navigation_NAVI_ANALYSIS" => 'Analyse', "navigation_NAVI_STATISTIC_ANALYSIS" => ($_GET['m'] == 'charts' ? 'Charts' : 'Statistics'), "navigation_NAVI_STATISTIC_ANALYSIS_SUMARNIK" => 'Summary', @@ -7803,6 +7802,28 @@ GDPR introduction preview", "navigation_NAVI_ANALYSIS_LINKS" => 'Reports', "navigation_NAVI_ARHIVI" => 'Archive', + "navigation_NAVI_RESULTS" => 'Data', + "navigation_NAVI_DATA" => 'Browse', + + "navigation_NAVI_DATA_CALC" => 'Calculations', + "navigation_NAVI_DATA_CALC_CALCULATION" => 'Calculations', + "navigation_NAVI_DATA_CALC_CODING" => 'Coding', + "navigation_NAVI_DATA_CALC_CODING_AUTO" => 'Automatic coding', + "navigation_NAVI_DATA_CALC_RECODING" => 'Recoding', + + "navigation_NAVI_DATA_EXPORT" => 'Export', + "navigation_NAVI_DATA_EXPORT_EXCEL" => 'CSV', + "navigation_NAVI_DATA_EXPORT_EXCEL_XLS" => 'Excel (XLS)', + "navigation_NAVI_DATA_EXPORT_SAV" => 'SPSS SAV', + "navigation_NAVI_DATA_EXPORT_TXT" => 'Text file', + "navigation_NAVI_DATA_EXPORT_SPSS" => 'SPSS SYNTAX', + + "navigation_NAVI_DATA_IMPORT" => 'Import', + "navigation_NAVI_DATA_IMPORT_APPEND" => 'Append data', + "navigation_NAVI_DATA_IMPORT_MERGE" => 'Merge data', + + + // 1KA NAMESTITEV // 'install_title' => '1KA installation', diff --git a/public/css/admin.css b/public/css/admin.css index 3d9bcca4e..0e1da4c58 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -29582,23 +29582,16 @@ table.invitations_settings p label input[type=password], .page_export { flex-direction: column !important; } - .subpage_append .anketa_edit_left, -.subpage_append .anketa_edit_main, -.subpage_merge .anketa_edit_left, + .subpage_append .anketa_edit_main, .subpage_merge .anketa_edit_main, -.subpage_calculation .anketa_edit_left, .subpage_calculation .anketa_edit_main, -.subpage_coding_auto .anketa_edit_left, .subpage_coding_auto .anketa_edit_main, -.subpage_recoding .anketa_edit_left, .subpage_recoding .anketa_edit_main, -.subpage_coding .anketa_edit_left, .subpage_coding .anketa_edit_main, -.page_export .anketa_edit_left, .page_export .anketa_edit_main { width: 100% !important; box-sizing: border-box; - margin: 20px 0 !important; + margin: 0 !important; } .subpage_append .anketa_edit_left, .subpage_merge .anketa_edit_left, @@ -29607,7 +29600,7 @@ table.invitations_settings p label input[type=password], .subpage_recoding .anketa_edit_left, .subpage_coding .anketa_edit_left, .page_export .anketa_edit_left { - margin: 0 !important; + display: none !important; } .subpage_append textarea, .subpage_merge textarea, diff --git a/resources/sass/admin/mobile/pages/data.scss b/resources/sass/admin/mobile/pages/data.scss index 9d38a020c..7fb84decb 100644 --- a/resources/sass/admin/mobile/pages/data.scss +++ b/resources/sass/admin/mobile/pages/data.scss @@ -75,16 +75,15 @@ .page_export{ flex-direction: column !important; - .anketa_edit_left, .anketa_edit_main{ width: 100% !important; box-sizing: border-box; - margin: 20px 0 !important; + margin: 0 !important; } .anketa_edit_left{ - margin: 0 !important; + display: none !important; } textarea{