From 1c81907505320cb00a04430437313a398618ffde Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 20 Jun 2022 14:49:51 +0200
Subject: [PATCH] Redesign - popravek gdpr tabele zahtevkov

---
 admin/survey/classes/class.GDPR.php           | 17 ++++++++--
 public/css/admin_new.css                      | 15 ++++++++
 .../admin_new/components/table/table.scss     | 34 ++++++++++++++-----
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 4e54bf71b..0211672c3 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -376,8 +376,8 @@ class GDPR{
 
 			echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</p>';
 			
-			echo '<div class="table-horizontal-scroll-wrapper1" id="gdrp_requests_unresolved">';
-        	echo '<div class="table-horizontal-scroll-wrapper2">';
+			echo '<div class="table-horizontal-scroll-wrapper-outer" id="gdrp_requests_unresolved">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
 			
 			echo '<table class="gdpr_surveys requests">';
 
@@ -491,6 +491,9 @@ class GDPR{
 								ORDER BY date(r.datum) ASC");
 		if(mysqli_num_rows($sql) > 0){
 
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests all">';
 
 			echo '<tr>';
@@ -564,6 +567,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 		else{
 			echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
@@ -588,6 +594,9 @@ class GDPR{
 			echo '	<span class="requests_table_title"><span id="requests_table_title_plus">+</span><span id="requests_table_title_minus" style="display:none;">-</span> '.$lang['srv_gdpr_requests_done'].'</span>';
 			echo '</a>';
 			
+            echo '<div class="table-horizontal-scroll-wrapper-outer">';
+			echo '<div class="table-horizontal-scroll-wrapper-inner">';
+
 			echo '<table class="gdpr_surveys requests" id="table_requests_done" style="margin-top:0; display:none;">';
 
 			echo '<tr>';
@@ -661,6 +670,9 @@ class GDPR{
 			}
 
 			echo '</table>';
+
+            echo '</div>';
+            echo '</div>';
 		}
 	}
 
@@ -1224,6 +1236,7 @@ class GDPR{
 		$request_list_done = self::getUserRequests($ank_id, $status=1);
 
 		if(count($request_list) > 0){
+
 			echo '<table class="gdpr_surveys requests">';
 
 			echo '<tr>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index bc7ffa877..1ded8445b 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10145,6 +10145,21 @@ div .table-horizontal-scroll-wrapper2 table {
   margin: 0px;
 }
 
+.table-horizontal-scroll-wrapper-outer {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner {
+  overflow-x: auto;
+  width: 100%;
+}
+.table-horizontal-scroll-wrapper-outer .table-horizontal-scroll-wrapper-inner table {
+  width: 100%;
+  table-layout: auto !important;
+  margin-bottom: 0;
+}
+
 /*
     Placljive vsebine
 */
diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss
index 1762df436..2053f77b0 100644
--- a/resources/sass/admin_new/components/table/table.scss
+++ b/resources/sass/admin_new/components/table/table.scss
@@ -70,18 +70,36 @@ div {
         width: 100%;
 
         margin: 8px 0;
-  }
+    }
 
     .table-horizontal-scroll-wrapper2 {
         display: table-cell;
         overflow-x: auto;
         width: 100%;
 
-    table {
-        width: 100%;
-        border-collapse: collapse;
-        white-space: nowrap;
-        margin: 0px;
+        table {
+            width: 100%;
+            border-collapse: collapse;
+            white-space: nowrap;
+            margin: 0px;
+        }
     }
-  }
-}
\ No newline at end of file
+}
+
+.table-horizontal-scroll-wrapper-outer{
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+
+    .table-horizontal-scroll-wrapper-inner{
+        overflow-x: auto;
+        width: 100%;
+
+        table {
+            width: 100%;
+            table-layout: auto !important;
+
+            margin-bottom: 0;
+        }
+    }
+}