[Redizajn 1KA] - GDPR nastavitve --> Procesiranje zahtevkov - v1
This commit is contained in:
tejagerjovic
parent
bfad2e552a
commit
d342de20b5
@ -357,9 +357,10 @@ class GDPR{
|
||||
global $site_url;
|
||||
global $lang;
|
||||
|
||||
echo '<div style="margin-top:-10px;">';
|
||||
echo '<p>'.$lang['srv_gdpr_requests_desc'].'</p>';
|
||||
echo '</div>';
|
||||
echo '<fieldset>';
|
||||
echo '<legend>'.$lang['srv_gdpr_requests_list'].'</legend>';
|
||||
|
||||
echo '<p class="bottom16">'.$lang['srv_gdpr_requests_desc'].'</p>';
|
||||
|
||||
// Seznam cakajocih zahtevkov
|
||||
$request_list = array();
|
||||
@ -370,107 +371,103 @@ class GDPR{
|
||||
$request_list_done = $this->getUserRequests($ank_id=0, $status=1);
|
||||
|
||||
if(count($request_list) > 0){
|
||||
|
||||
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 '<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_recnum'].'</th>';
|
||||
//echo '<th>'.$lang['srv_gdpr_requests_ip'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_url'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
//echo '<th>'.$lang['srv_gdpr_requests_date'].'</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>'.$lang['srv_gdpr_requests_done'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_comment'].'</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 '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></td>';
|
||||
// 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 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>'.$request['recnum'].'</td>';
|
||||
//echo '<td>'.$request['ip'].'</td>';
|
||||
echo '<td>'.$request['url'].'</td>';
|
||||
echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
|
||||
echo '<td>'.$request['email'].'</td>';
|
||||
//echo '<td>'.$request['date'].'</td>';
|
||||
echo '<td>'.$request['text'].'</td>';
|
||||
|
||||
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
|
||||
|
||||
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
|
||||
// Checkbox ce je zahteva opravljena
|
||||
//echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
|
||||
echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
|
||||
|
||||
// Komentar avtorja
|
||||
echo '<td><textarea style="height:30px; width:200px;" 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 '</table>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
else{
|
||||
echo '<p>'.$lang['srv_gdpr_requests_none'].'</p>';
|
||||
echo '<p class="bold">'.$lang['srv_gdpr_requests_none'].'</p>';
|
||||
}
|
||||
|
||||
|
||||
// Tabela opravljenih zahtevkov
|
||||
if(count($request_list_done) > 0){
|
||||
|
||||
echo '<br /><span class="requests_table_title">'.$lang['srv_gdpr_requests_done'].'</span>';
|
||||
echo '<p class="bold bottom8">'.$lang['srv_gdpr_requests_list_resolved'].'</p>';
|
||||
|
||||
echo '<div class="table-horizontal-scroll-wrapper1">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper2">';
|
||||
|
||||
echo '<table class="gdpr_surveys requests" style="margin-top:0;">';
|
||||
|
||||
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_recnum'].'</th>';
|
||||
//echo '<th>'.$lang['srv_gdpr_requests_ip'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_url'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
|
||||
//echo '<th>'.$lang['srv_gdpr_requests_date'].'</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>'.$lang['srv_gdpr_requests_done'].'</th>';
|
||||
echo '<th>'.$lang['srv_gdpr_requests_comment'].'</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 '<td><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></td>';
|
||||
// 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 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>'.$request['recnum'].'</td>';
|
||||
//echo '<td>'.$request['ip'].'</td>';
|
||||
echo '<td>'.$request['url'].'</td>';
|
||||
echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
|
||||
echo '<td>'.$request['email'].'</td>';
|
||||
//echo '<td>'.$request['date'].'</td>';
|
||||
echo '<td>'.$request['text'].'</td>';
|
||||
|
||||
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';
|
||||
|
||||
echo '<td>'.date('j.n.Y', strtotime($request['datum'])).'</td>';
|
||||
|
||||
// Checkbox ce je zahteva opravljena
|
||||
//echo '<td>'.($request['status'] == '1' ? $lang['srv_gdpr_requests_status_1'] : $lang['srv_gdpr_requests_status_0']).'</td>';
|
||||
echo '<td><input type="checkbox" value="1" class="pointer" onClick="setGDPRRequestStatus(\''.$request_id.'\', this.checked); return false;" '.($request['status'] == '1' ? ' checked="checked"' : '').'></td>';
|
||||
|
||||
// Komentar avtorja
|
||||
echo '<td><textarea style="height:30px; width:200px;" 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 '</table>';
|
||||
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -45,8 +45,8 @@ class UserTrackingClass
|
||||
// Izvoz v Excel
|
||||
echo '<p>'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
|
||||
|
||||
echo '<div id="table-tracking-wrapper1">';
|
||||
echo '<div id="table-tracking-wrapper2">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper1">';
|
||||
echo '<div class="table-horizontal-scroll-wrapper2">';
|
||||
|
||||
|
||||
echo '<table id="tracking">';
|
||||
|
||||
11
lang/1.php
11
lang/1.php
@ -7759,29 +7759,32 @@ $lang = array (
|
||||
'srv_gdpr_dpa_eng' => "v angleščini",
|
||||
'srv_gdpr_dpa_info' => "Za podpisano pogodbo DPA kontaktirajte <a href=\"mailto:help@1ka.si\">help@1ka.si</a> in DPA bomo ustrezno prilagodili.",
|
||||
'srv_gdpr_requests' => "Procesiranje zahtevkov",
|
||||
'srv_gdpr_requests_list' => "Seznam zahtevkov",
|
||||
'srv_gdpr_requests_list_resolved' => "Izvršeni zahtevki",
|
||||
'srv_gdpr_requests_list_unresolved' => "Neizvršeni zahtevki",
|
||||
'srv_gdpr_requests_all' => "Vsi zahtevki (admin)",
|
||||
'srv_gdpr_requests_desc' => "Spodaj je seznam zahtevkov, ki so jih oddali respondenti v vaših anketah.<br />Prosimo, da v roku enega meseca izvršite zahtevo in o tem obvestite respondenta na spodaj navedeni elektronski naslov respondenta (<a href=\"http://eur-lex.europa.eu/legal-content/SL/TXT/?uri=uriserv:OJ.L_.2016.119.01.0001.01.SLV&toc=OJ:L:2016:119:FULL\" target=\"_blank\">Člen 19 uredbe GDPR</a>).<br />Če v roku 30 dni zahtevek ni izveden in respondent o tem ni obveščen, si pridržujemo pravico, da vašo anketo izbrišemo oziroma respondentu neposredno zagotovimo vpogled oziroma popravek.",
|
||||
'srv_gdpr_requests_none' => "Ni zahtevkov",
|
||||
'srv_gdpr_requests_survey' => "Anketa",
|
||||
'srv_gdpr_requests_survey' => "Ime ankete",
|
||||
'srv_gdpr_requests_recnum' => "Recnum",
|
||||
'srv_gdpr_requests_ip' => "IP",
|
||||
'srv_gdpr_requests_url' => "URL",
|
||||
'srv_gdpr_requests_email' => "Email respondenta",
|
||||
'srv_gdpr_requests_date' => "Čas odgovora",
|
||||
'srv_gdpr_requests_text' => "Sporočilo respondenta",
|
||||
'srv_gdpr_requests_done' => "Opravljeno",
|
||||
'srv_gdpr_requests_resolved' => "Izvršeno",
|
||||
'srv_gdpr_requests_comment' => "Komentar avtorja",
|
||||
'srv_gdpr_requests_status' => "Status",
|
||||
'srv_gdpr_requests_status_0' => "V obdelavi",
|
||||
'srv_gdpr_requests_status_1' => "Opravljeno",
|
||||
'srv_gdpr_requests_type' => "Vrsta zahtevka",
|
||||
'srv_gdpr_requests_type' => "Zahtevek",
|
||||
'srv_gdpr_requests_type_1' => "Izbris",
|
||||
'srv_gdpr_requests_type_2' => "Vpogled",
|
||||
'srv_gdpr_requests_type_3' => "Popravek",
|
||||
'srv_gdpr_requests_type_4' => "Prenos",
|
||||
'srv_gdpr_requests_type_5' => "Omejitev obdelave",
|
||||
'srv_gdpr_requests_type_6' => "Preklic privolitve v obdelavo",
|
||||
'srv_gdpr_requests_date_sent' => "Datum zahtevka",
|
||||
'srv_gdpr_requests_date_sent' => "Datum",
|
||||
'srv_gdpr_requests_author' => "Avtor",
|
||||
'srv_gdpr_requests_responsible' => "GDDPR podatki avtorja ankete",
|
||||
'srv_gdpr_requests_organization' => "GDDPR podatki organizacije",
|
||||
|
||||
11
lang/2.php
11
lang/2.php
@ -7646,29 +7646,32 @@ $lang = array (
|
||||
'srv_gdpr_dpa_eng' => "in English",
|
||||
'srv_gdpr_dpa_info' => "For a signed DPA, please contact <a href=\"mailto:help@1ka.si\">help@1ka.si</a> and we will adjust the DPA accordingly.",
|
||||
'srv_gdpr_requests' => "Requests processing",
|
||||
'srv_gdpr_requests_list' => "List of requests",
|
||||
'srv_gdpr_requests_list_unresolved' => "Unresolved requests",
|
||||
'srv_gdpr_requests_list_resolved' => "Resolved requests",
|
||||
'srv_gdpr_requests_all' => "All requests (admin)",
|
||||
'srv_gdpr_requests_none' => "No requests",
|
||||
'srv_gdpr_requests_desc' => "Below is a list of requests submitted by respondents in your surveys.<br />Please execute a request within one month and inform the respondent to the respondent's e-mail address below (<a href=\"https://eur-lex.europa.eu/legal-content/EN/TXT/HTML/?uri=OJ:L:2016:119:FULL&from=EN\" target=\"_blank\">Article 19 of the GDPR</a>).<br />If within 30 days the request has not been made and the respondent is not informed of this, we reserve the right to delete your survey or directly provide the respondent with insight or correction.",
|
||||
'srv_gdpr_requests_survey' => "Survey",
|
||||
'srv_gdpr_requests_survey' => "Survey name",
|
||||
'srv_gdpr_requests_recnum' => "Recnum",
|
||||
'srv_gdpr_requests_ip' => "IP",
|
||||
'srv_gdpr_requests_url' => "URL",
|
||||
'srv_gdpr_requests_email' => "Respondent email",
|
||||
'srv_gdpr_requests_date' => "Response time",
|
||||
'srv_gdpr_requests_text' => "Respondent message",
|
||||
'srv_gdpr_requests_done' => "Done",
|
||||
'srv_gdpr_requests_resolved' => "Resolved",
|
||||
'srv_gdpr_requests_comment' => "Author comment",
|
||||
'srv_gdpr_requests_status' => "Status",
|
||||
'srv_gdpr_requests_status_0' => "Pending",
|
||||
'srv_gdpr_requests_status_1' => "Done",
|
||||
'srv_gdpr_requests_type' => "Request type",
|
||||
'srv_gdpr_requests_type' => "Request",
|
||||
'srv_gdpr_requests_type_1' => "Deletion",
|
||||
'srv_gdpr_requests_type_2' => "Insight",
|
||||
'srv_gdpr_requests_type_3' => "Change",
|
||||
'srv_gdpr_requests_type_4' => "Transmission",
|
||||
'srv_gdpr_requests_type_5' => "Restriction",
|
||||
'srv_gdpr_requests_type_6' => "Withdrawal of consent",
|
||||
'srv_gdpr_requests_date_sent' => "Request date",
|
||||
'srv_gdpr_requests_date_sent' => "Date",
|
||||
'srv_gdpr_requests_author' => "Author",
|
||||
'srv_gdpr_requests_responsible' => "GDPR author data",
|
||||
'srv_gdpr_requests_organization' => "GDPR organization data",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -35,4 +35,9 @@ textarea {
|
||||
height: 120px;
|
||||
}
|
||||
|
||||
&.gdpr_requests_comment {
|
||||
width: 200px;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
}
|
||||
37
resources/sass/admin_new/components/table/gdpr_tables.scss
Normal file
37
resources/sass/admin_new/components/table/gdpr_tables.scss
Normal file
@ -0,0 +1,37 @@
|
||||
// GDPR tabele
|
||||
|
||||
table {
|
||||
&.gdpr_surveys {
|
||||
tr.red_row {
|
||||
td {
|
||||
background-color: $light-red !important;
|
||||
}
|
||||
}
|
||||
tr.green_row {
|
||||
td {
|
||||
background-color: $light-green !important;
|
||||
}
|
||||
}
|
||||
|
||||
//Seznam zahtevkov
|
||||
&.requests {
|
||||
td {
|
||||
div{
|
||||
&.gdpr_requests_wrap {
|
||||
max-width: 204px;
|
||||
min-width: 204px;
|
||||
overflow-wrap: break-word;
|
||||
white-space: normal;
|
||||
padding: 8px 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
div#gdrp_requests_unresolved {
|
||||
margin-bottom: 32px;
|
||||
}
|
||||
@ -1,5 +1,4 @@
|
||||
table {
|
||||
|
||||
margin: 8px 0;
|
||||
padding: 8px 0;
|
||||
border-collapse: collapse;
|
||||
@ -16,6 +15,10 @@ table {
|
||||
&.right {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
&.wrap {
|
||||
white-space: normal;
|
||||
}
|
||||
}
|
||||
|
||||
th {
|
||||
@ -40,19 +43,30 @@ table {
|
||||
min-width: 421px;
|
||||
}
|
||||
|
||||
// GDPR tabele
|
||||
}
|
||||
|
||||
&.gdpr_surveys {
|
||||
tr.red_row {
|
||||
td {
|
||||
background-color: $light-red !important;
|
||||
//Wrapperji za horizontal scroll
|
||||
div {
|
||||
.table-horizontal-scroll-wrapper1 {
|
||||
display: table;
|
||||
table-layout: fixed;
|
||||
width: 100%;
|
||||
|
||||
margin: 8px 0;
|
||||
}
|
||||
}
|
||||
tr.green_row {
|
||||
td {
|
||||
background-color: $light-green !important;
|
||||
|
||||
.table-horizontal-scroll-wrapper2 {
|
||||
display: table-cell;
|
||||
overflow-x: auto;
|
||||
width: 100%;
|
||||
|
||||
table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
white-space: nowrap;
|
||||
margin: 0px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@import "gdpr_tables";
|
||||
@ -1,17 +1,17 @@
|
||||
// Zadnjih 25 sprememb tabela - horizontal scroll
|
||||
#table-tracking-wrapper1 {
|
||||
#table-horizontal-scroll-wrapper1 {
|
||||
display: table;
|
||||
table-layout: fixed;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#table-tracking-wrapper2 {
|
||||
#table-horizontal-scroll-wrapper2 {
|
||||
display: table-cell;
|
||||
overflow-x: auto;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#table-tracking-wrapper2 table {
|
||||
#table-horizontal-scroll-wrapper2 table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
white-space: nowrap;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user