may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GDPR seznam anket - popravek barve in paddinga, GDPR zahtevki - v delu

Browse Source
This commit is contained in:
pero1203 2022-09-12 10:48:35 +02:00
parent ed67398d05
commit dcaac4b682
5 changed files with 189 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
admin/survey/classes/class.GDPR.php
View File

@ -397,8 +397,6 @@ class GDPR{
global $site_url; global $site_url;
global $lang; global $lang;
echo '<fieldset>';
echo '<legend>'.$lang['srv_gdpr_requests_list'].'</legend>';
echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>'; echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>';
@ -410,13 +408,21 @@ class GDPR{
$request_list_done = array(); $request_list_done = array();
$request_list_done = $this->getUserRequests($ank_id=0, $status=1); $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){ 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-outer" id="gdrp_requests_unresolved">';
echo '<div class="table-horizontal-scroll-wrapper-inner">'; echo '<div class="table-horizontal-scroll-wrapper-inner">';
echo '<table class="gdpr_surveys requests">'; echo '<table class="gdpr_surveys requests">';
echo '<tr>'; echo '<tr>';
@ -438,8 +444,6 @@ class GDPR{
echo '<label class="empty" for="gdrp_request_'.$request_id.'"></label></td>'; 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"><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 '<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>'; 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 // Komentar avtorja
echo '<td class="center"><textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>'; echo '<td class="center"><textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea></td>';
echo '</tr>'; echo '</tr>';
} }
echo '</table>'; echo '</table>';
echo '</div>'; echo '</div>';
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 // Tabela opravljenih zahtevkov
if(count($request_list_done) > 0){ 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-wrapper1">';
echo '<div class="table-horizontal-scroll-wrapper2">'; echo '<div class="table-horizontal-scroll-wrapper2">';
echo '<table class="gdpr_surveys requests">'; echo '<table class="gdpr_surveys requests">';
echo '<tr>'; echo '<tr>';
@ -513,7 +506,6 @@ class GDPR{
} }
echo '</table>'; echo '</table>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
} }

136
public/css/admin_new.css
View File

@ -10014,79 +10014,6 @@ textarea:focus {
border-color: #1E88E5; 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 { table {
margin: 8px 0; margin: 8px 0;
padding: 8px 0; padding: 8px 0;
@ -11272,13 +11199,17 @@ table.gdpr_surveys tr {
} }
table.gdpr_surveys th, table.gdpr_surveys th,
table.gdpr_surveys td { table.gdpr_surveys td {
font-size: 14px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
table.gdpr_surveys th:first-child {
width: 30px;
}
table.gdpr_surveys tr.red_row td { table.gdpr_surveys tr.red_row td {
background-color: #FFEFEF; background-color: #FFEFEF;
} }
table.gdpr_surveys tr.green_row td { table.gdpr_surveys tr.green_row td {
background-color: #a8eea8; background-color: #E3F6DE;
} }
table.gdpr_surveys.requests td div.gdpr_requests_wrap { table.gdpr_surveys.requests td div.gdpr_requests_wrap {
max-width: 204px; max-width: 204px;
@ -11304,6 +11235,63 @@ div#gdrp_requests_unresolved {
padding-bottom: 0px; 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 { div.setting_holder.red label {
color: red; color: red;
} }

1
resources/sass/admin_new/components/form/form.scss
View File

@ -8,4 +8,3 @@
@import "fieldset"; @import "fieldset";
@import "dropdown"; @import "dropdown";
@import "textarea"; @import "textarea";
@import "seznam_anket";

89
resources/sass/admin_new/components/form/seznam_anket.scss
View File

@ -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;
}

94
resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
View File

@ -1,12 +1,11 @@
// GDPR tabele // GDPR tabele
.fullwidth #gdpr_nastavitve{ .fullwidth #gdpr_nastavitve{
padding: 0 16px; padding: 0 16px;
box-sizing: border-box; box-sizing: border-box;
} }
table { table.gdpr_surveys {
&.gdpr_surveys {
table-layout: auto; table-layout: auto;
width: 100%; width: 100%;
@ -20,22 +19,29 @@ table {
th, th,
td, { td, {
font-size: 14px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
th:first-child{
width: 30px;
}
tr.red_row { tr.red_row {
td { td {
background-color: $light-red ; background-color: $light-red;
} }
} }
tr.green_row { tr.green_row {
td { td {
background-color: $light-green ; background-color: $light-green2;
} }
} }
//Seznam zahtevkov // Seznam zahtevkov
&.requests { &.requests {
td { td {
div{ div{
&.gdpr_requests_wrap { &.gdpr_requests_wrap {
@ -48,7 +54,8 @@ table {
} }
} }
}
} }
} }
@ -70,3 +77,76 @@ div#gdrp_requests_unresolved {
padding-bottom: 0px; padding-bottom: 0px;
} }
} }
// 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;
}
}