From dcaac4b682c6ea8882ec21dcc74949ffc205d375 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 12 Sep 2022 10:48:35 +0200
Subject: [PATCH] GDPR seznam anket - popravek barve in paddinga, GDPR zahtevki
 - v delu

---
 admin/survey/classes/class.GDPR.php           |  34 ++--
 public/css/admin_new.css                      | 136 ++++++++--------
 .../sass/admin_new/components/form/form.scss  |   3 +-
 .../components/form/seznam_anket.scss         |  89 -----------
 .../pages/gdpr_pages/gdpr_tables.scss         | 146 ++++++++++++++----
 5 files changed, 189 insertions(+), 219 deletions(-)
 delete mode 100644 resources/sass/admin_new/components/form/seznam_anket.scss

diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 14205f267..1adaae991 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -397,8 +397,6 @@ class GDPR{
 		global $site_url;
 		global $lang;
 
-		echo '<fieldset>';
-		echo '<legend>'.$lang['srv_gdpr_requests_list'].'</legend>';
 
 		echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>';
 
@@ -410,13 +408,21 @@ class GDPR{
 		$request_list_done = array();
 		$request_list_done = $this->getUserRequests($ank_id=0, $status=1);
 
+
+        // Nimamo zahtevkov
+        if(count($request_list) == 0 &&count($request_list_done) == 0){
+            echo '<p class="bold">'.$lang['srv_gdpr_requests_none'].'</p>';
+            return;
+        }
+
+
+        // Tabela neizvrsenih zahtevkov
 		if(count($request_list) > 0){
 
-			echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</p>';
+			echo '<span class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</span>';
 			
 			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">';
 
 			echo '<tr>';
@@ -438,8 +444,6 @@ class GDPR{
 				echo '<label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
 				echo '<td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
 				
-				// echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
-
 				echo '<td><div class="gdpr_requests_wrap center">';
 					echo '<button onclick="show_gdpr_messeage('.$request_id.')"> <img src="\public\img\icons\envelope_img.svg" alt="envelope image"> </button> </div></td>';
 
@@ -452,32 +456,21 @@ class GDPR{
 				// Komentar avtorja
 				echo '<td class="center"><textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
 
-
 				echo '</tr>';
 			}
 
 			echo '</table>';
-
-
 			echo '</div>';
 			echo '</div>';
-
-			echo '<script src="/admin/survey/script/script.js"></script>';
-		}
-		else{
-			if(count($request_list_done) == 0)
-			echo '<p class="bold">'.$lang['srv_gdpr_requests_none'].'</p>';
-		}
-		
+		}		
 		
 		// Tabela opravljenih zahtevkov
 		if(count($request_list_done) > 0){
 
-			echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</p>';
+			echo '<span class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</span>';
 			
 			echo '<div class="table-horizontal-scroll-wrapper1">';
-        	echo '<div class="table-horizontal-scroll-wrapper2">';
-			
+        	echo '<div class="table-horizontal-scroll-wrapper2">';	
 			echo '<table class="gdpr_surveys requests">';
 
 			echo '<tr>';
@@ -513,7 +506,6 @@ class GDPR{
 			}
 
 			echo '</table>';
-
 			echo '</div>';
 			echo '</div>';
 		}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1847b2cf4..69e5d89c3 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10014,79 +10014,6 @@ textarea:focus {
   border-color: #1E88E5;
 }
 
-.gdpr-box-container {
-  display: flex;
-  justify-content: space-between;
-  margin: 16px 0px;
-}
-.gdpr-box-container .num_box {
-  border: 1px solid #E5E5E5;
-  background-color: #FFFF;
-  border-radius: 2px;
-  cursor: pointer;
-  margin: 0px;
-  padding: 0px;
-}
-.gdpr-box-container .num_box .box_flex {
-  margin: 16px 16px 12px 16px;
-  display: flex;
-  align-items: center;
-}
-.gdpr-box-container .num_box .box_flex .naslov_gdpr {
-  font-size: 16px !important;
-  font-weight: 600;
-}
-.gdpr-box-container .num_box .box_flex input {
-  position: unset;
-  height: 18px;
-  width: 18px;
-  margin-right: 8px;
-}
-.gdpr-box-container .num_box .box_text {
-  padding: 5px 16px 16px 16px;
-  font-size: 16px;
-  line-height: 20px;
-  color: #808080;
-  display: flex;
-  align-items: center;
-}
-.gdpr-box-container .num_box .box_text .num_of_surveys {
-  font-size: 32px;
-  color: #333;
-  font-weight: 400;
-}
-.gdpr-box-container .checked {
-  border: #1E88E5 solid 1px;
-}
-.gdpr-box-container .num_box2 {
-  margin: 0px 32px;
-}
-.gdpr-box-container #num_box1.checked {
-  background-color: rgba(20, 255, 0, 0.05);
-}
-.gdpr-box-container #num_box2.checked {
-  background-color: rgba(255, 0, 0, 0.05);
-}
-.gdpr-box-container #num_box3.checked {
-  background-color: #FFFFFF;
-}
-
-table.gdpr_surveys td {
-  font-size: 14px;
-}
-
-table.gdpr_surveys tr.green_row {
-  background-color: #F3FFF2 !important;
-}
-
-table.gdpr_surveys tr.red_row {
-  background-color: #FFEFEF !important;
-}
-
-table.gdpr_surveys tr.grey_row {
-  background-color: #ffffff !important;
-}
-
 table {
   margin: 8px 0;
   padding: 8px 0;
@@ -11272,13 +11199,17 @@ table.gdpr_surveys tr {
 }
 table.gdpr_surveys th,
 table.gdpr_surveys td {
+  font-size: 14px;
   border: 1px solid #E5E5E5;
 }
+table.gdpr_surveys th:first-child {
+  width: 30px;
+}
 table.gdpr_surveys tr.red_row td {
   background-color: #FFEFEF;
 }
 table.gdpr_surveys tr.green_row td {
-  background-color: #a8eea8;
+  background-color: #E3F6DE;
 }
 table.gdpr_surveys.requests td div.gdpr_requests_wrap {
   max-width: 204px;
@@ -11304,6 +11235,63 @@ div#gdrp_requests_unresolved {
   padding-bottom: 0px;
 }
 
+.gdpr-box-container {
+  display: flex;
+  justify-content: space-between;
+  margin: 16px 0px;
+}
+.gdpr-box-container .num_box {
+  border: 1px solid #E5E5E5;
+  background-color: #FFFF;
+  border-radius: 2px;
+  cursor: pointer;
+  margin: 0px;
+  padding: 0px;
+}
+.gdpr-box-container .num_box .box_flex {
+  margin: 16px 16px 12px 16px;
+  display: flex;
+  align-items: center;
+}
+.gdpr-box-container .num_box .box_flex .naslov_gdpr {
+  font-size: 16px !important;
+  font-weight: 600;
+}
+.gdpr-box-container .num_box .box_flex input {
+  position: unset;
+  height: 18px;
+  width: 18px;
+  margin-right: 8px;
+}
+.gdpr-box-container .num_box .box_text {
+  padding: 5px 16px 16px 16px;
+  font-size: 16px;
+  line-height: 20px;
+  color: #808080;
+  display: flex;
+  align-items: center;
+}
+.gdpr-box-container .num_box .box_text .num_of_surveys {
+  font-size: 32px;
+  color: #333;
+  font-weight: 400;
+}
+.gdpr-box-container .checked {
+  border: #1E88E5 solid 1px;
+}
+.gdpr-box-container .num_box2 {
+  margin: 0px 32px;
+}
+.gdpr-box-container #num_box1.checked {
+  background-color: rgba(20, 255, 0, 0.05);
+}
+.gdpr-box-container #num_box2.checked {
+  background-color: rgba(255, 0, 0, 0.05);
+}
+.gdpr-box-container #num_box3.checked {
+  background-color: #FFFFFF;
+}
+
 div.setting_holder.red label {
   color: red;
 }
diff --git a/resources/sass/admin_new/components/form/form.scss b/resources/sass/admin_new/components/form/form.scss
index 4044e8386..cafafcf91 100644
--- a/resources/sass/admin_new/components/form/form.scss
+++ b/resources/sass/admin_new/components/form/form.scss
@@ -7,5 +7,4 @@
 @import "input";
 @import "fieldset";
 @import "dropdown";
-@import "textarea";
-@import "seznam_anket";
\ No newline at end of file
+@import "textarea";
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/form/seznam_anket.scss b/resources/sass/admin_new/components/form/seznam_anket.scss
deleted file mode 100644
index 8c7b4e58a..000000000
--- a/resources/sass/admin_new/components/form/seznam_anket.scss
+++ /dev/null
@@ -1,89 +0,0 @@
-.gdpr-box-container{
-    display: flex;
-    justify-content: space-between;
-
-    margin: 16px 0px;
-
-    .num_box{
-        border: 1px solid #E5E5E5;
-        background-color: #FFFF;
-        border-radius: 2px;
-        cursor: pointer;
-
-        margin: 0px;
-        padding: 0px;
-
-        .box_flex{
-            margin: 16px 16px 12px 16px;
-            display: flex;
-            align-items: center;
-
-            .naslov_gdpr{
-                font-size: 16px !important;
-                font-weight: 600;
-            }
-
-            input {
-                position: unset;
-                
-                height: 18px;
-                width: 18px;
-
-                margin-right: 8px;
-            }
-        }
-
-        .box_text{
-            padding: 5px 16px 16px 16px;
-            font-size: 16px;
-            line-height: 20px;
-            color: #808080;
-
-            display: flex;
-            align-items: center;
-
-            .num_of_surveys{
-                font-size: 32px;
-                color: #333;
-                font-weight: 400;
-            }
-        }
-    }
-
-    .checked {
-        border: #1E88E5 solid 1px;
-    }
-
-    .num_box2{
-        margin: 0px 32px ;
-    }
-    
-    #num_box1.checked{
-        background-color: rgba(20, 255, 0, 0.05);
-    }
-    #num_box2.checked{
-        background-color: rgba(255, 0, 0, 0.05);
-    }
-    #num_box3.checked{
-        background-color: #FFFFFF;
-    }
-}
-
-table.gdpr_surveys{
-    td{
-        font-size: 14px;
-    }
-}
-
-
-table.gdpr_surveys tr.green_row  {
-    background-color: #F3FFF2  !important;
-
-}
-table.gdpr_surveys tr.red_row {
-    // background-color: #FF0000 !important;
-    background-color: #FFEFEF  !important;
-}
-table.gdpr_surveys tr.grey_row  {
-    background-color: #ffffff !important;
-}
\ No newline at end of file
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 18486f224..c91cf8ec7 100644
--- a/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
+++ b/resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
@@ -1,55 +1,62 @@
 // GDPR tabele
-
 .fullwidth #gdpr_nastavitve{
     padding: 0 16px;
     box-sizing: border-box;
 }
 
-table {
-    &.gdpr_surveys {
-        table-layout: auto;
-        width: 100%;
+table.gdpr_surveys {
 
-        th {
-            background-color: #F8F8F8;
-        }
+    table-layout: auto;
+    width: 100%;
 
-        tr{
-            background-color: #FFEFEF;
-        }
+    th {
+        background-color: #F8F8F8;
+    }
 
-        th,
-        td, {
-            border: 1px solid #E5E5E5;
-        }
+    tr{
+        background-color: #FFEFEF;
+    }
 
-        tr.red_row {
-            td {
-                background-color: $light-red ;
-            }
+    th,
+    td, {
+        font-size: 14px;
+
+        border: 1px solid #E5E5E5;
+    }
+
+    th:first-child{
+        width: 30px;
+    }
+
+    tr.red_row {
+        td {
+            background-color: $light-red;
         }
-        tr.green_row {
-            td {
-                background-color: $light-green ;
-            }
+    }
+    tr.green_row {
+        td {
+            background-color: $light-green2;
         }
-    
-        //Seznam zahtevkov
-        &.requests {
-            td {
-                div{
-                    &.gdpr_requests_wrap {
+    }
+
+    // Seznam zahtevkov
+    &.requests {
+
+        td {
+            div{
+                &.gdpr_requests_wrap {
                     max-width: 204px;
                     min-width: 204px;
                     overflow-wrap: break-word;
                     white-space: normal;
                     padding: 8px 0px;
-                    }
                 }
             }
-
         }
-    
+
+
+
+
     }
 }
 
@@ -69,4 +76,77 @@ div#gdrp_requests_unresolved {
         margin-left: 8px;
         padding-bottom: 0px;
     }
-}
\ No newline at end of file
+}
+
+
+// Filtri na vrhu pri seznamu anket
+.gdpr-box-container{
+    display: flex;
+    justify-content: space-between;
+
+    margin: 16px 0px;
+
+    .num_box{
+        border: 1px solid #E5E5E5;
+        background-color: #FFFF;
+        border-radius: 2px;
+        cursor: pointer;
+
+        margin: 0px;
+        padding: 0px;
+
+        .box_flex{
+            margin: 16px 16px 12px 16px;
+            display: flex;
+            align-items: center;
+
+            .naslov_gdpr{
+                font-size: 16px !important;
+                font-weight: 600;
+            }
+
+            input {
+                position: unset;
+                
+                height: 18px;
+                width: 18px;
+
+                margin-right: 8px;
+            }
+        }
+
+        .box_text{
+            padding: 5px 16px 16px 16px;
+            font-size: 16px;
+            line-height: 20px;
+            color: #808080;
+
+            display: flex;
+            align-items: center;
+
+            .num_of_surveys{
+                font-size: 32px;
+                color: #333;
+                font-weight: 400;
+            }
+        }
+    }
+
+    .checked {
+        border: $blue solid 1px;
+    }
+
+    .num_box2{
+        margin: 0px 32px ;
+    }
+    
+    #num_box1.checked{
+        background-color: rgba(20, 255, 0, 0.05);
+    }
+    #num_box2.checked{
+        background-color: rgba(255, 0, 0, 0.05);
+    }
+    #num_box3.checked{
+        background-color: #FFFFFF;
+    }
+}