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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-08-25 12:28:07 +02:00
commit 771b80796f
9 changed files with 1602 additions and 1588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/SurveyAdminSettings.php
View File

@ -8859,7 +8859,7 @@ class SurveyAdminSettings {
echo $lang['srv_stevilo_vnosov'].':';
echo '<div class="max_wrap">';
echo '<input class="text large" type="text" name="stevilo_vnosov" value="1" onkeyup="max_stevilo_vnosov();">';
echo '<span class="gray">(max 1000)</span>';
echo '<span class="gray">(max. 1000)</span>';
echo '</div>';
echo '</div>';
@ -8879,6 +8879,9 @@ class SurveyAdminSettings {
echo '<a class="noline" href="#" onClick="delete_test_data();"><span class="faicon trash empty link-right"></span>'.$lang['srv_delete_testdata'].'</a> ('.$total_rows.')';
if ($total_rows > 0) {
echo '<table class="table_header">';
echo '<tbody>';
echo '<tr>';
@ -8888,11 +8891,10 @@ class SurveyAdminSettings {
echo '</tbody>';
echo '</table>';
if ($total_rows > 0) {
$prevpage = 0;
$sql = sisplet_query("SELECT s.id, s.gru_id, s.tip, s.naslov, g.naslov AS pagename FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND s.visible='1' AND g.ank_id='$this->anketa' ORDER BY g.vrstni_red, s.vrstni_red");
while ($row = mysqli_fetch_array($sql)) {

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

@ -64,10 +64,10 @@ class GDPR{
echo '<div class="box-container">';
echo '<div class= "num_box num_box1 checked" id="num_box1">';
echo '<div class= "num_box num_box1 checked" id="num_box1" onclick="gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">';
echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="gdpr_ankete()">';
echo '<div class="naslov_gdpr"> GDPR ANKETE</div>';
echo '</div>';
@ -83,10 +83,10 @@ class GDPR{
echo '</div>';
echo '<div class= "num_box num_box2 checked" id="num_box2">';
echo '<div class= "num_box num_box2 checked" id="num_box2" onclick="potenc_gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex potenc_gdpr">';
echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">';
echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="potenc_gdpr_ankete()">';
echo '<div class="naslov_gdpr"> POTENCIALNO GDPR ANKETE</div>';
echo '</div>';
@ -102,10 +102,10 @@ class GDPR{
echo '</div>';
echo '<div class= "num_box num_box3 checked" id="num_box3">';
echo '<div class= "num_box num_box3 checked" id="num_box3" onclick="ne_gdpr_ankete()">';
echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >';
echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="ne_gdpr_ankete()" >';
echo '<div class="naslov_gdpr"> NE-GDPR ANKETE</div>';
echo '</div>';

42
admin/survey/script/GDPR_seznam_anket.js
View File

@ -147,7 +147,49 @@ function test_function() {
}
}
function gdpr_ankete(){
var check_gdpr_ankete = document.getElementById('gdpr_ankete_check');
//GDOR ANKETE
if (check_gdpr_ankete.checked){
check_gdpr_ankete.checked = false;
test_function();
}
else {
check_gdpr_ankete.checked = true;
test_function();
}
}
function potenc_gdpr_ankete(){
var check_potenc_gdpr = document.getElementById('potenc_gdpr_ankete_check');
//POTENCGDOR ANKETE
if (check_potenc_gdpr.checked){
check_potenc_gdpr.checked = false;
test_function();
}
else {
check_potenc_gdpr.checked = true;
test_function();
}
}
function ne_gdpr_ankete(){
var check_negdpr_ankete = document.getElementById('ne_gdpr_ankete');
//NE GDPR ANKETE
if (check_negdpr_ankete.checked){
check_negdpr_ankete.checked = false;
test_function();
}
else {
check_negdpr_ankete.checked = true;
test_function();
}
}
function teme_options(){
var toggle = document.getElementsByClassName('buttons-window');

2
lang/1.php
View File

@ -6433,6 +6433,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Napredni način',
'srv_email_example_txt' => 'Če želite ta e-mail uporabljati za pošiljanje, je treba v naprednih nastavitvah nastaviti, da je spremenljivka sistemska.',
'srv_prikaz_default_valid' => 'Privzeta izbira ustreznih enot:',
'srv_prikaz_default_valid1' => 'Delno izpolnjene in končane enote/ankete (s statusoma 5, 6)',
'srv_prikaz_default_valid2' => 'Samo končane enote/ankete (s statusom 6)',
'srv_prikaz_showItime' => 'Prikaži datum respondenta:',
'srv_prikaz_showLineNumber' => 'Prikaži številko vrstice respondenta:',
'srv_global_settnig_access_respondents' => 'Dostop respondenti',

2
lang/2.php
View File

@ -6326,6 +6326,8 @@ $lang = array (
'srv_editing_mode_new_anketa_1' => 'Advanced mode',
'srv_email_example_txt' => 'To use this e-mail for sending invitations, you need to mark it as system variable in advanced settings.',
'srv_prikaz_default_valid' => 'The default selection of appropriate units:',
'srv_prikaz_default_valid1' => 'Partially completed and completed units/surveys (with statuses 5, 6)',
'srv_prikaz_default_valid2' => 'Completed units/surveys only (with status 6)',
'srv_prikaz_showItime' => 'Show respondent date:',
'srv_prikaz_showLineNumber' => 'Display the row number of the respondent:',
'srv_global_settnig_access_respondents' => 'Respondent access',

3028
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -13,6 +13,7 @@
border: 1px solid #E5E5E5;
background-color: #FFFF;
border-radius: 2px;
cursor: pointer;
margin: 0px;
padding: 0px;

42
resources/sass/admin_new/components/table/table.scss
View File

@ -112,26 +112,34 @@ div {
border-top: 1px dashed #E5E5E5;
padding: 0px;
}
.page_num_fieldset{
#anketa_edit {
.page_num_fieldset{
padding-top: 0px;
padding-bottom: 0px;
margin: 12px 0px;
}
margin: 0px;
}
.page_num{
margin-left: 39%;
.page_num{
text-align: center;
color: #333333;
position: relative;
}
margin: 4px 0px;
}
.table_header{
.table_header{
width: 100%;
margin: 16px 0px 0px 0px;
background-color: #F8F8F8;
font-size: 16px;
font-weight: 600;
@ -141,22 +149,30 @@ div {
td:first-of-type {
width: 40%;
width: 46%;
padding-left: 16px;
}
td:last-of-type {
width: 60%;
width: 54%;
padding-left: 16px;
}
}
}
}
.avt_vnosi_table{
margin: 0px;
.avt_vnosi_table{
td:first-of-type {
width: 40%;
width: 46%;
}
td:last-of-type {
width: 60%;
width: 54%;
}
}
}

7
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -14,7 +14,7 @@
left: 17px;
top: 40px;
box-shadow: 0px 0px 7px 0px #0000001F;
}
.faicon.dots {
@ -127,6 +127,11 @@
}
@media only screen and (max-width: 850px) {
.analysis_icons_holder {
display: block !important;
}
}