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:
Nejc Kovač 2022-06-17 12:07:12 +02:00
commit 74ff3084bd
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/survey/classes/class.SurveyList.php
View File

@ -1232,7 +1232,12 @@ class SurveyList {
if($anketa['answers'] > 0){ if($anketa['answers'] > 0){
$v_time = substr($anketa['v_time_last'], 0, 8); $v_time = substr($anketa['v_time_last'], 0, 8);
$v_time = explode('.', $v_time); $v_time = explode('.', $v_time);
echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2];
// Nimamo parapodatkov
if($anketa['v_time_last'] == '00.00.00 0:00')
echo $lang['srv_survey_list_no_paradata'];
else
echo $v_time[0].'.'.$v_time[1].'.20'.$v_time[2];
} }
else{ else{
echo '/'; echo '/';

10
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -3907,11 +3907,6 @@ class SurveyInvitationsNew {
session_commit(); session_commit();
$dont_send_duplicated = false;
if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') {
$dont_send_duplicated = true;
}
$rids = $_POST['rids']; $rids = $_POST['rids'];
$return = array(); $return = array();
@ -4209,6 +4204,11 @@ class SurveyInvitationsNew {
} }
} }
$dont_send_duplicated = false;
if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') {
$dont_send_duplicated = true;
}
$duplicated = array(); $duplicated = array();
# array za rezultate # array za rezultate

1
lang/1.php
View File

@ -5213,6 +5213,7 @@ $lang = array (
'srv_survey_list_users_confirm_delete_warning' => 'Ali ste prepričani, da želite izbrisati uporabnika?\n\nZ brisanjem uporabnika boste uporabniku odvzeli dostop do uporabe vaše aplikacije. Ankete bodo še vedno dostopne drugim urednikom ankete.', 'srv_survey_list_users_confirm_delete_warning' => 'Ali ste prepričani, da želite izbrisati uporabnika?\n\nZ brisanjem uporabnika boste uporabniku odvzeli dostop do uporabe vaše aplikacije. Ankete bodo še vedno dostopne drugim urednikom ankete.',
'srv_survey_list_closed' => "Zaključena", 'srv_survey_list_closed' => "Zaključena",
'srv_survey_list_inpreparation' => "V pripravi", 'srv_survey_list_inpreparation' => "V pripravi",
'srv_survey_list_no_paradata' => "Ni parapodatkov",
'srv_survey_finished' => "Vprašalnik zaključen?", 'srv_survey_finished' => "Vprašalnik zaključen?",
'srv_quick_settings_osnovno' => "Osnovne nastavitve", 'srv_quick_settings_osnovno' => "Osnovne nastavitve",
'srv_quick_settings_napredno' => "Napredne nastavitve", 'srv_quick_settings_napredno' => "Napredne nastavitve",

1
lang/2.php
View File

@ -5182,6 +5182,7 @@ $lang = array (
'srv_survey_list_users_confirm_delete_warning' => 'You will delete this user, are you agree?\n\nDeleting a user will deprive the user of access to use your application. The surveys will still be available to other survey editors.', 'srv_survey_list_users_confirm_delete_warning' => 'You will delete this user, are you agree?\n\nDeleting a user will deprive the user of access to use your application. The surveys will still be available to other survey editors.',
'srv_survey_list_closed' => "Closed", 'srv_survey_list_closed' => "Closed",
'srv_survey_list_inpreparation' => "In preparation", 'srv_survey_list_inpreparation' => "In preparation",
'srv_survey_list_no_paradata' => "No paradata",
'srv_survey_finished' => "Finished editing survey?", 'srv_survey_finished' => "Finished editing survey?",
'srv_quick_settings_osnovno' => "Basic settings", 'srv_quick_settings_osnovno' => "Basic settings",
'srv_quick_settings_napredno' => "Advanced settings", 'srv_quick_settings_napredno' => "Advanced settings",