From 8a32be95b9c5a233de562968f1e9002ed02b7fd4 Mon Sep 17 00:00:00 2001 From: tejagerjovic Date: Fri, 18 Feb 2022 01:16:21 +0100 Subject: [PATCH] [Redizajn 1KA] - Podatki --> Uvozi --> Dodaj podatke - v1 --- admin/survey/SurveyAdmin.php | 4 +- .../classes/class.SurveyAppendMerge.php | 159 +++++++++++------- admin/survey/classes/tracking/CrossRoad.php | 2 +- lang/1.php | 43 +++-- lang/2.php | 41 +++-- public/css/admin_new.css | 72 ++++++++ .../pages/survey_data/append_merge.scss | 95 +++++++++++ .../pages/survey_data/calculations.scss | 18 ++ .../survey_data/popups/calculations.scss | 9 + .../pages/survey_data/popups/popups.scss | 1 + .../pages/survey_data/survey_data.scss | 2 + 11 files changed, 354 insertions(+), 92 deletions(-) create mode 100644 resources/sass/admin_new/pages/survey_data/append_merge.scss create mode 100644 resources/sass/admin_new/pages/survey_data/calculations.scss create mode 100644 resources/sass/admin_new/pages/survey_data/popups/calculations.scss diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 2d7d611bf..be22d47b0 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3090,7 +3090,9 @@ class SurveyAdmin global $admin_type; global $global_user_id; - echo '