diff --git a/admin/themes/default/template/user_activity.tpl b/admin/themes/default/template/user_activity.tpl index 223dedebc..209da37be 100644 --- a/admin/themes/default/template/user_activity.tpl +++ b/admin/themes/default/template/user_activity.tpl @@ -15,6 +15,12 @@ var usersCache = new UsersCache({ }); const color_icons = ["icon-red", "icon-blue", "icon-yellow", "icon-purple", "icon-green"]; +var activity_page = 1; +let actual_page = 1; +let max_page = 1; +const page_ellipsis = '...' +const page_item = '%d'; +var create_selecter = true; const users_key = "{"Users"|@translate}" const line_key = "{'%s line'|translate}"; @@ -93,16 +99,24 @@ var actionInfos_tags_moved = "{'%d tags moved'|translate}"; {*<-- Getting and Displaying Activities -->*} -get_user_activity(); +get_user_activity(activity_page); -function get_user_activity() { +function get_user_activity(page) { $.ajax({ url: "ws.php?format=json&method=pwg.activity.getList", type: "POST", dataType: "json", data: { - a: 1, - b: 2 + page: page - 1, + }, + beforeSend: () => { + $('.tab').contents(':not(#-1):not(.loading)').remove(); + $(".loading").show(); + $('.pagination-arrow.rigth').addClass('unavailable'); + $('.pagination-arrow.left').addClass('unavailable'); + $(".pagination-item-container").hide(); + $(".user-update-spinner").addClass("icon-spin6"); + $(".cancel-icon").trigger("click"); }, success: (data) => { /* console log to help debug */ @@ -110,12 +124,17 @@ function get_user_activity() { setCreationDate(data.result['result_lines'][data.result['result_lines'].length-1].date, data.result['result_lines'][0].date); $(".loading").hide(); - + data.result['result_lines'].forEach(line => { lineConstructor(line); }); - fillUserFilter(data.result['filterable_users'], data.result['id_of']); + max_page = data.result['max_page']; + $(".user-update-spinner").removeClass("icon-spin6"); + $(".pagination-item-container").show(); + update_pagination_menu(); + createUserFilter(); + fillUserFilter(data.result['filterable_users'], create_selecter, data.result['id_of']); }, error: (e) => { console.log("ajax call failed"); @@ -124,12 +143,26 @@ function get_user_activity() { }) } -function fillUserFilter(user_tab) { +function addSelecterListenner() { + $('select').on('change', function (user) { + if ($(".selectize-input").hasClass("full")) { + $(".line").hide(); + console.log("ici"); + $(".uid-" + $(".selectize-input .item").data("value")).show(); + } + }); +} +function createUserFilter() { + $(".user-selecter").remove(); + $(".select-user-title").after(""); +} + +function fillUserFilter(user_tab, create_selecter) { for (const [key, value] of Object.entries(user_tab)) { - {* console.log(key, value); *} + var newOption = ""; - + $(".user-selecter").append(newOption); } @@ -138,9 +171,11 @@ function fillUserFilter(user_tab) { jQuery(".user-selecter")[0].selectize.setValue(null); jQuery(".cancel-icon").click(function() { - jQuery(".user-selecter")[0].selectize.setValue(null); - $(".line").show(); + jQuery(".user-selecter")[0].selectize.clear(true); + $(".line").css('display', 'flex');; }); + + addSelecterListenner(); } function lineConstructor(line) { @@ -318,7 +353,6 @@ function lineConstructor(line) { newLine.find(".action-name").html(actionType_login); - console.log("userS Logged in"); final_albumInfos = actionInfos_users_logged_in.replace('%d', line.counter); break; @@ -335,7 +369,6 @@ function lineConstructor(line) { newLine.find(".action-name").html(actionType_logout); - console.log("userS Logged in"); final_albumInfos = actionInfos_users_logged_out.replace('%d', line.counter); break; @@ -617,6 +650,83 @@ function setCreationDate(startDate, endDate) { $(".end-date").html(endDate) } +{* Pagination *} + +function move_to_page(page) { + if (page < 0 || page > max_page) + return; + actual_page = page; + update_pagination_menu(); + get_user_activity(page); +} + +$('.pagination-arrow.rigth').on('click', () => { + move_to_page(actual_page + 1); +}) + +$('.pagination-arrow.left').on('click', () => { + move_to_page(actual_page - 1); +}) + +function update_pagination_menu() { + {* max_page = Math.ceil(nb_filtered_users / per_page); *} + updateArrows(); + update_pagination_items(); + if (max_page <= 1) { + $('.pagination-container').hide(); + } else { + $('.pagination-container').show(); + } +} + +function updateArrows() { + if (actual_page == 1) { + $('.pagination-arrow.left').addClass('unavailable'); + } else { + $('.pagination-arrow.left').removeClass('unavailable'); + } + if (actual_page == max_page) { + $('.pagination-arrow.rigth').addClass('unavailable'); + } else { + $('.pagination-arrow.rigth').removeClass('unavailable'); + } +} + +function update_pagination_items() { + $('.pagination-item-container a').remove(); + $('.pagination-item-container span').remove(); + + append_pagination_item(1); + + if (actual_page > 2) { + append_pagination_item(); + } + if (actual_page != 1 && actual_page != max_page) { + append_pagination_item(actual_page) + } + if (actual_page < (max_page - 1)) { + append_pagination_item(); + } + append_pagination_item(max_page); + +} + +function append_pagination_item(page = null) { + if (page != null) { + let new_tag = $(page_item.replace(/%d/g, page)); + $('.pagination-item-container').append(new_tag); + if (actual_page == page) { + new_tag.addClass('actual'); + } + new_tag.on('click', () => { + move_to_page(new_tag.data('page')); + }) + } else { + $('.pagination-item-container').append($(page_ellipsis)); + } +} + + $(document).ready(function () { $('select').on('change', function (user) { if ($(".selectize-input").hasClass("full")) { @@ -638,7 +748,6 @@ $(document).ready(function () { -
{'Activity time from'|translate} @@ -654,8 +763,20 @@ $(document).ready(function () {
- - +{if max_page != 1} +
+
+ +
+
+
+ +
+ +
+
+{/if} +
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php index 7bb2d136b..1d3f1fc64 100644 --- a/include/ws_functions/pwg.php +++ b/include/ws_functions/pwg.php @@ -429,6 +429,8 @@ function ws_getActivityList($param, &$service) $output_lines = array(); $current_key = ''; + $page_size = 100000; //We will fetch X lines in database =/= lines displayed due to line concatenation + $page_offset = $param['page']*$page_size; $user_ids = array(); @@ -444,8 +446,8 @@ SELECT occured_on, details FROM '.ACTIVITY_TABLE.' - ORDER BY activity_id DESC LIMIT 100000 -;'; //Limited to 100k before implementing pagination in v.13 (issue #1595) + ORDER BY activity_id DESC LIMIT '.$page_size.' OFFSET '.$page_offset.'; +;'; $line_id = 0; $result = pwg_query($query); @@ -569,10 +571,19 @@ SELECT return (strtolower($a['username']) >= strtolower($b['username']) ? 1 : 0); }); + $query = ' + SELECT + count(*) + FROM '.ACTIVITY_TABLE.' + ;'; + + $result = (pwg_db_fetch_row(pwg_query($query))[0])/$page_size; + // return $output_lines; return array( 'result_lines' => $output_lines, 'filterable_users' => $filterable_users, + 'max_page' => floor($result), ); } diff --git a/ws.php b/ws.php index 7fd7b8a8f..61862d44c 100644 --- a/ws.php +++ b/ws.php @@ -83,7 +83,10 @@ function ws_addDefaultMethods( $arr ) $service->addMethod( 'pwg.activity.getList', 'ws_getActivityList', - null, + array( + 'page' => array('default'=>null, + 'type'=>WS_TYPE_INT|WS_TYPE_POSITIVE), + ), 'Returns general informations.', $ws_functions_root . 'pwg.php', array('admin_only'=>true)