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

Dodan stolpec s stevilom managerjev nad uporabnikom

Browse Source
This commit is contained in:
pero1203 2021-03-05 13:06:03 +01:00
parent cd13f3bf08
commit e7b65755ca
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/survey/SurveyAdminSettings.php
View File

@ -8354,6 +8354,7 @@ class SurveyAdminSettings {
echo '<th>' . $lang['srv_survey_list_users_survey_count'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_survey_archive_count'] . '</th>';
echo '<th>' . $lang['srv_manager_count'] . '</th>';
echo '<th>' . $lang['manager'] . '</th>';
echo '<th>' . $lang['users_gdpr_title'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_registred'] . '</th>';
echo '<th>' . $lang['srv_survey_list_users_last_login'] . '</th>';

9
admin/survey/classes/class.Dostop.php
View File

@ -1126,10 +1126,11 @@ class Dostop {
}
// Pridobimo vse uporabnike
$sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, dm.st_dodeljenih_uporabnikov as st_dodeljenih_uporabnikov, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
$sql = "SELECT u.id as id, u.type as type, u.status, u.email as email, u.name as name, u.surname as surname, u.lang as lang, u.eduroam as aai, date_format(u.when_reg, '%d.%m.%Y') as registriran, u.gdpr_agree as gdpr_agree, dm.st_dodeljenih_uporabnikov as st_dodeljenih_uporabnikov, dm2.st_managerjev as st_managerjev, d1.dostop_survey_count as st_anket, d2.dostop_survey_archive as st_arhivskih, date_format(u.last_login, '%d.%m.%Y') as last_login, ue.email as second_email FROM users AS u ".
" LEFT OUTER JOIN (SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_count FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup='0' GROUP BY srv_dostop.uid ) AS d1 ON d1.uid = u.id ".
" LEFT OUTER JOIN (SELECT srv_dostop.ank_id, srv_dostop.uid, count(*) AS dostop_survey_archive FROM srv_dostop, srv_anketa WHERE srv_anketa.id=srv_dostop.ank_id AND srv_anketa.backup>'0' GROUP BY srv_dostop.uid ) AS d2 ON d2.uid = u.id ".
" LEFT OUTER JOIN (SELECT srv_dostop_manage.manager, count(*) AS st_dodeljenih_uporabnikov FROM srv_dostop_manage GROUP BY srv_dostop_manage.manager) AS dm ON dm.manager = u.id ".
" LEFT OUTER JOIN (SELECT srv_dostop_manage.user, count(*) AS st_managerjev FROM srv_dostop_manage GROUP BY srv_dostop_manage.user) AS dm2 ON dm2.user = u.id ".
" LEFT OUTER JOIN (SELECT user_emails.email, user_emails.user_id FROM user_emails WHERE active=1) AS ue ON ue.user_id = u.id".
" WHERE u.email NOT LIKE ('D3LMD-%') AND u.email NOT LIKE ('UNSU8MD-%') ".$iskanjeSql;
@ -1144,12 +1145,13 @@ class Dostop {
"d1.dostop_survey_count", //st_anket
"d2.dostop_survey_archive", //st_arhivskih
"dm.st_dodeljenih_uporabnikov", //st_dodeljenih_uporabnikov
"dm2.st_managerjev", //st_managerjev
"u.gdpr_agree",
"u.when_reg",
"u.last_login"
];
if($_POST['order'][0]['column'] == 8){
if($_POST['order'][0]['column'] == 9){
$vrednost='u.gdpr_agree desc';
if($_POST['order'][0]['dir'] == 'asc'){
@ -1190,6 +1192,7 @@ class Dostop {
(!empty($uporabnik->st_anket) ? $uporabnik->st_anket : 0),
(!empty($uporabnik->st_arhivskih) ? $uporabnik->st_arhivskih : 0),
'<a href="#" onclick="dodeljeni_uporabniki_display(\''.$uporabnik->id.'\'); return false;" title="'.$lang['srv_manager_manager'].'">'.(!empty($uporabnik->st_dodeljenih_uporabnikov) ? $uporabnik->st_dodeljenih_uporabnikov : 0).'</a>',
(!empty($uporabnik->st_managerjev) ? $uporabnik->st_managerjev : 0),
$lang["users_gdpr".$uporabnik->gdpr_agree],
$uporabnik->registriran,
$uporabnik->last_login,
@ -1648,7 +1651,7 @@ class Dostop {
echo '<form class="manager_add_user" name="admin_add_dostop" action="ajax.php?t=dostop&a=admin_add_user" method="post">';
echo '<h3><b>'.$lang['srv_manager_add_user2'].'</b></h3>';
echo '<h3><b>'.$lang['srv_manager_add_user_popup'].'</b></h3>';
echo '<p><select name="add_user_id" id="add_user_id" class="js-obstojeci-uporabniki-admin-ajax" style="width: 300px;"></select></p>';
echo '<p><div class="buttonwrapper floatLeft">';

2
admin/survey/script/dostop.js
View File

@ -253,7 +253,7 @@ $(document).ready(function () {
tabelaDataTables = $('#all_users_list').DataTable({
lengthMenu: [[50, 500, 1000, 5000, 10000], [50, 500, 1000, 5000, 10000]],
select: true,
order: [[ 10, "desc" ]],
order: [[ 11, "desc" ]],
lengthChange: true,
serverSide: true,
ajax: {

1
lang/1.php
View File

@ -5629,6 +5629,7 @@ $lang = array (
"srv_manager_count" => 'Dodeljeni uporabniki',
"srv_manager_remove_alert" => 'Ste prepričani, da želite odstraniti uporabnika iz pregleda?',
"srv_manager_add_admin" => 'Dodaj uporabnika v pregled',
"srv_manager_add_user_popup" => 'Dodajte obstoječega uporabnika nad katerim bo uporabnik pregled',
"create" => 'Ustvari',
"create_add" => 'Ustvari in dodaj',
"srv_library_left" => 'Standardna vprašanja lahko dodajate v anketo',

1
lang/2.php
View File

@ -5526,6 +5526,7 @@ $lang = array (
"srv_manager_count" => 'Managed users',
"srv_manager_remove_alert" => 'Are you sure you would like to remove user from managing?',
"srv_manager_add_admin" => 'Add user to managing',
"srv_manager_add_user_popup" => 'Add existing user',
"create" => 'Create',
"create_add" => 'Create and add',
"srv_library_left" => '',