From c8a51246f868e75d9552d45eaede7aab8f286a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nejc=20Kova=C4=8D?= Date: Tue, 16 Aug 2022 16:54:37 +0200 Subject: [PATCH] =?UTF-8?q?GDPR=20-->=20procesiranje=20zahtevkov:=20sporo?= =?UTF-8?q?=C4=8Dilo=20respondenta=20pop-up=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/survey/SurveyAdminAjax.php | 29 +++++++++++++++++++ admin/survey/classes/class.GDPR.php | 5 +++- admin/survey/script/script.js | 14 +++++++++ public/css/admin_new.css | 2 +- .../admin_new/components/table/table.scss | 2 +- .../pages/gdpr_pages/gdpr_tables.scss | 14 +++++++++ 6 files changed, 63 insertions(+), 3 deletions(-) diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index c75f561cb..22e7f0cf8 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -7265,6 +7265,35 @@ class SurveyAdminAjax { echo ''; echo ''; } + + + private function ajax_show_gdpr_messeage(){ + global $lang; + + $id_sporocila = $_POST['id_sporocila']; + + $sql = sisplet_query("SELECT text FROM srv_gdpr_requests WHERE id = '".$id_sporocila."'"); + $row = mysqli_fetch_array($sql); + + echo '
'; + echo 'envelope image'; + echo '

SPOROČILO RESPONDENTA

'; + echo '
'; + + echo ''; + + + echo ''; + + + } } ?> \ No newline at end of file diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index 8579f5e8d..58c52f9d3 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -473,7 +473,7 @@ class GDPR{ // echo '
'.$request['text'].'
'; echo '
'; - echo '
'; + echo ' '; echo ''.$request['email'].''; @@ -490,8 +490,11 @@ class GDPR{ echo ''; + echo ''; echo ''; + + echo ''; } else{ if(count($request_list_done) == 0) diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index b65f14ad3..6ccbac630 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -1031,6 +1031,7 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) { $('#fade').fadeIn('slow'); $('#dropped_alert').html(data.output).fadeIn('slow').css('width', '600px'); } + } }, 'json' ); @@ -5642,4 +5643,17 @@ function oneClickArchive(){ $('#general_popup').addClass('PopUpNarrow'); $('#general_popup').html('').fadeIn('slow'); $("#general_popup").load('ajax.php?a=oneClickArchive', {anketa: srv_meta_anketa_id}); +} + + + +// kliči popup +function show_gdpr_messeage(id_sporocila){ + + $('#fade').fadeTo('slow', 1); + $('#general_popup').addClass('PopUpNarrow'); + $('#general_popup').html('hello').fadeIn('slow'); + $("#general_popup").load('ajax.php?a=show_gdpr_messeage', {id_sporocila: id_sporocila, anketa: srv_meta_anketa_id}); + + console.log(id_sporocila); } \ No newline at end of file diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 114e2585f..fa5701ebf 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10165,7 +10165,7 @@ div .table-horizontal-scroll-wrapper2 table { .table_header { width: 100%; - margin: 0px; + margin: 16px 0px 0px 0px; font-size: 16px; font-weight: 600; } diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index 5ba297128..0744bc565 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -123,7 +123,7 @@ div { .table_header{ width: 100%; - margin: 0px; + margin: 16px 0px 0px 0px; font-size: 16px; font-weight: 600; diff --git a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss index 8f9c3c780..18486f224 100644 --- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss +++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss @@ -55,4 +55,18 @@ table { div#gdrp_requests_unresolved { margin-bottom: 32px; +} + +.head_msg{ + display: flex; + align-items: center; + justify-content: center; + + margin-bottom: 24px; + + h2 { + margin-bottom: 0px; + margin-left: 8px; + padding-bottom: 0px; + } } \ No newline at end of file