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

GDPR zahtevke - dokoncan v2

Browse Source
This commit is contained in:
pero1203 2022-09-12 12:02:55 +02:00
parent bae8a51616
commit 85fda0c59c
6 changed files with 184 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/SurveyAdminAjax.php
View File

@ -7350,10 +7350,7 @@ class SurveyAdminAjax {
$sql = sisplet_query("SELECT text FROM srv_gdpr_requests WHERE id = '".$id_sporocila."'");
$row = mysqli_fetch_array($sql);
echo '<div class= "head_msg"> ';
echo '<img src="\public\img\icons\envelope_img.svg" alt="envelope image">';
echo '<h2> SPOROČILO RESPONDENTA</h2>';
echo '</div>';
echo '<h2><span class="faicon envelope"></span>SPOROČILO RESPONDENTA</h2>';
echo '<div class="popup_close"><a href="#" onClick="popupClose(); return false;">✕</a></div>';

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

@ -419,42 +419,47 @@ class GDPR{
// Tabela neizvrsenih zahtevkov
if(count($request_list) > 0){
echo '<span class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</span>';
echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_unresolved'].'</div>';
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>';
echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
echo '<th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
echo '<th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo '</tr>';
foreach($request_list as $request_id => $request){
echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
echo '<tr>';
// Checkbox ce je zahteva opravljena
echo '<td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'>';
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 center">';
echo '<button onclick="show_gdpr_messeage('.$request_id.')"> <img src="\public\img\icons\envelope_img.svg" alt="envelope image"> </button> </div></td>';
echo ' <td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'>';
echo ' <label class="empty" for="gdrp_request_'.$request_id.'"></label>';
echo ' </td>';
echo '<td>'.$request['email'].'</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>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.')"></span></td>';
echo ' <td>'.$request['email'].'</td>';
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
echo ' <td class="center">';
echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
echo ' </td>';
echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
// 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">';
echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
echo ' </td>';
echo '</tr>';
}
@ -467,41 +472,44 @@ class GDPR{
// Tabela opravljenih zahtevkov
if(count($request_list_done) > 0){
echo '<span class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</span>';
echo '<div class="gdpr_request_table_title bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</div>';
echo '<div class="table-horizontal-scroll-wrapper1">';
echo '<div class="table-horizontal-scroll-wrapper2">';
echo '<div class="table-horizontal-scroll-wrapper-outer">';
echo '<div class="table-horizontal-scroll-wrapper-inner">';
echo '<table class="gdpr_surveys requests">';
echo '<tr>';
echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
echo '<th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
echo ' <th>'.$lang['srv_gdpr_requests_survey'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
echo ' <th>'.$lang['srv_gdpr_requests_email'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_type'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_date_sent'].'</th>';
echo ' <th class="center">'.$lang['srv_gdpr_requests_comment'].'</th>';
echo '</tr>';
foreach($request_list_done as $request_id => $request){
echo '<tr '.($request['status'] == 0 ? ' class="red_row"' : '').'>';
echo '<tr>';
// Checkbox ce je zahteva opravljena
echo '<td class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'><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 class="center"><input type="checkbox" id="gdrp_request_'.$request_id.'" value="1" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'><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>'.$request['email'].'</td>';
echo ' <td class="center"><span class="faicon envelope" onclick="show_gdpr_messeage('.$request_id.')"></span></td>';
echo ' <td>'.$request['email'].'</td>';
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
echo ' <td class="center">';
echo ' <div class="request_type type'.$request['type'].'">'.$lang['srv_gdpr_requests_type_'.$request['type']].'</div>';
echo ' </td>';
echo ' <td class="center">'.date('j.n.Y', strtotime($request['datum'])).'</td>';
// 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">';
echo ' <textarea class="gdpr_requests_comment" onBlur="setGDPRRequestComment(\''.$request_id.'\', this.value);">'.$request['comment'].'</textarea>';
echo ' </td>';
echo '</tr>';
}

64
public/css/admin_new.css
View File

@ -6152,6 +6152,11 @@ span.faicon.fa-x::before {
content: "X";
}
span.faicon.envelope::before {
content: "";
font-weight: 400;
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
@ -11192,14 +11197,18 @@ table.gdpr_surveys {
width: 100%;
}
table.gdpr_surveys th {
box-sizing: border-box;
height: 56px;
font-size: 16px;
background-color: #F8F8F8;
}
table.gdpr_surveys tr {
background-color: #FFEFEF;
table.gdpr_surveys td {
box-sizing: border-box;
height: 52px;
font-size: 14px;
}
table.gdpr_surveys th,
table.gdpr_surveys td {
font-size: 14px;
border: 1px solid #E5E5E5;
}
table.gdpr_surveys th:first-child {
@ -11215,12 +11224,57 @@ table.gdpr_surveys tr.red_row td {
table.gdpr_surveys tr.green_row td {
background-color: #E3F6DE;
}
table.gdpr_surveys.requests {
white-space: wrap;
margin: 0;
}
table.gdpr_surveys.requests td div.gdpr_requests_wrap {
max-width: 204px;
min-width: 204px;
overflow-wrap: break-word;
/*overflow-wrap: break-word;
white-space: normal;
padding: 8px 0px;
padding: 8px 0px;*/
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
table.gdpr_surveys.requests td div.request_type {
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
width: 100%;
padding: 8px 16px;
border-radius: 2px;
}
table.gdpr_surveys.requests td div.request_type.type1, table.gdpr_surveys.requests td div.request_type.type6 {
background-color: #FFEFEF;
}
table.gdpr_surveys.requests td div.request_type.type2 {
background-color: #E3F6DE;
}
table.gdpr_surveys.requests td div.request_type.type3, table.gdpr_surveys.requests td div.request_type.type4, table.gdpr_surveys.requests td div.request_type.type5 {
background-color: #F4F9FE;
}
table.gdpr_surveys.requests td .faicon.envelope {
cursor: pointer;
color: #1E88E5;
font-size: 18px;
transition: 0.2s;
}
table.gdpr_surveys.requests td .faicon.envelope:hover {
color: #0059ab;
}
table.gdpr_surveys.requests td textarea.gdpr_requests_comment {
width: 320px;
font-size: 14px;
}
.gdpr_request_table_title {
margin: 32px 0 16px 0;
text-transform: uppercase;
font-size: 16px;
font-weight: 600;
}
div#gdrp_requests_unresolved {

3
public/img/icons/envelope_img.svg
View File

@ -1,3 +0,0 @@
<svg width="18" height="14" viewBox="0 0 18 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.5 0.75H1.5C1.16848 0.75 0.850537 0.881696 0.616116 1.11612C0.381696 1.35054 0.25 1.66848 0.25 2V12C0.25 12.3315 0.381696 12.6495 0.616116 12.8839C0.850537 13.1183 1.16848 13.25 1.5 13.25H16.5C16.8315 13.25 17.1495 13.1183 17.3839 12.8839C17.6183 12.6495 17.75 12.3315 17.75 12V2C17.75 1.66848 17.6183 1.35054 17.3839 1.11612C17.1495 0.881696 16.8315 0.75 16.5 0.75ZM15.125 2L9 6.2375L2.875 2H15.125ZM1.5 12V2.56875L8.64375 7.5125C8.74837 7.58508 8.87267 7.62397 9 7.62397C9.12733 7.62397 9.25163 7.58508 9.35625 7.5125L16.5 2.56875V12H1.5Z" fill="#1E88E5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 674 B

6
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -710,4 +710,10 @@ span.faicon.screwdriver::before{
span.faicon.fa-x::before{
content: "\58";
}
span.faicon.envelope::before {
content: "\f0e0";
font-weight: 400;
}

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

@ -5,22 +5,27 @@
}
table.gdpr_surveys {
table-layout: auto;
width: 100%;
th {
box-sizing: border-box;
height: 56px;
font-size: 16px;
background-color: #F8F8F8;
}
td{
box-sizing: border-box;
height: 52px;
tr{
background-color: #FFEFEF;
font-size: 14px;
}
th,
td, {
font-size: 14px;
border: 1px solid #E5E5E5;
}
@ -47,25 +52,79 @@ table.gdpr_surveys {
// Seznam zahtevkov
&.requests {
white-space: wrap;
margin: 0;
td {
div{
&.gdpr_requests_wrap {
max-width: 204px;
min-width: 204px;
overflow-wrap: break-word;
/*overflow-wrap: break-word;
white-space: normal;
padding: 8px 0px;
padding: 8px 0px;*/
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
div.request_type{
display: flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
width: 100%;
padding: 8px 16px;
border-radius: 2px;
&.type1,
&.type6{
background-color: $light-red;
}
&.type2{
background-color: $light-green2;
}
&.type3,
&.type4,
&.type5{
background-color: $medium-blue2;
}
}
.faicon.envelope{
cursor: pointer;
color: $blue;
font-size: 18px;
transition: 0.2s;
&:hover{
color: $dark-blue;
}
}
textarea.gdpr_requests_comment{
width: 320px;
font-size: 14px;
}
}
}
}
.gdpr_request_table_title{
margin: 32px 0 16px 0;
text-transform: uppercase;
font-size: 16px;
font-weight: 600;
}
div#gdrp_requests_unresolved {
margin-bottom: 32px;
}