extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP returning next chunk of messages, when all visible ones get deleted

Browse Source
This commit is contained in:
ralf 2024-04-11 15:48:42 +02:00
parent dc493595dd
commit 83cf428077
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
notifications/inc/class.notifications_ajax.inc.php
View File

@ -131,11 +131,17 @@ class notifications_ajax
/** /**
* Remove given notification id(s) from the table * Remove given notification id(s) from the table
* *
* @param array $notifymessages one or multiple notify_id(s) * @param int[]|array[] $notifymessages one or multiple notify_id(s) or objects incl. id attribute
*/ */
public function delete_message(array $notifymessages) public function delete_message(array $notifymessages)
{ {
$this->update($notifymessages, null); // null = delete $this->update($notifymessages, null); // null = delete
// if we delete all messages (we either delete one or all!), we return the next chunk of messages directly
if (count($notifymessages) > 1)
{
$this->get_notifications();
}
} }
/** /**

39
notifications/js/notificationajaxpopup.js
View File

@ -5,7 +5,7 @@
* @package notifications * @package notifications
* @subpackage ajaxpoup * @subpackage ajaxpoup
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Cornelius Weiss <nelius@cwtech.de>, Christian Binder <christian@jaytraxx.de>, Ralf Becker <rb@stylite.de> * @author Cornelius Weiss <nelius@cwtech.de>, Christian Binder <christian@jaytraxx.de>, Ralf Becker <rb@egroupware.org>
* @version $Id$ * @version $Id$
*/ */
@ -60,7 +60,7 @@
var EGW_PR_NOTIFY_MEDIUM = 2; var EGW_PR_NOTIFY_MEDIUM = 2;
/** /**
* Low priority for notifing about an entry * Low priority for notifying about an entry
* Action: Not defined * Action: Not defined
* @type Number * @type Number
*/ */
@ -85,7 +85,7 @@
var TIMEOUT = 0; var TIMEOUT = 0;
/** /**
* Constructor inits polling and installs handlers, polling frequence is passed via data-poll-interval of script tag * Constructor inits polling and installs handlers, polling frequency is passed via data-poll-interval of script tag
*/ */
function notifications() { function notifications() {
var notification_script = document.getElementById('notifications_script_id'); var notification_script = document.getElementById('notifications_script_id');
@ -211,7 +211,7 @@
}); });
// clear the list // clear the list
$egwpopup_list.empty(); $egwpopup_list.empty();
// define time label deviders // define time label dividers
var $today = jQuery(document.createElement('div')) var $today = jQuery(document.createElement('div'))
.addClass('egwpopup_time_label') .addClass('egwpopup_time_label')
.text(egw.lang('today')) .text(egw.lang('today'))
@ -327,7 +327,6 @@
if (notifymessages[id]['status'] != 'SEEN') if (notifymessages[id]['status'] != 'SEEN')
{ {
$mark.click(jQuery.proxy(this.message_seen, this,[$message])) $mark.click(jQuery.proxy(this.message_seen, this,[$message]))
.attr('title',egw.lang('mark as read')); .attr('title',egw.lang('mark as read'));
} }
@ -407,7 +406,7 @@
}; };
/** /**
* Opens the relavant entry from clicked message * Opens the relevant entry from clicked message
* *
* @param {jquery object} _node * @param {jquery object} _node
* @param {object} _event * @param {object} _event
@ -571,12 +570,9 @@
notifications.prototype.delete_all = function () { notifications.prototype.delete_all = function () {
if (!notifymessages || Object.entries(notifymessages).length == 0) return false; if (!notifymessages || Object.entries(notifymessages).length == 0) return false;
var self = this; egw.request("notifications.notifications_ajax.delete_message", [notifymessages.map(d => d.id)]);
egw.json("notifications.notifications_ajax.delete_message", [notifymessages], function(_data){
if (_data && _data['deleted']) self.total -= Object.keys(_data['deleted']).length;
self.counterUpdate();
}).sendRequest(true);
notifymessages = {}; notifymessages = {};
this.total = 0;
jQuery("#egwpopup_list").empty(); jQuery("#egwpopup_list").empty();
egw.loading_prompt('popup_notifications', false); egw.loading_prompt('popup_notifications', false);
this.bell("inactive"); this.bell("inactive");
@ -589,15 +585,11 @@
_event.stopPropagation(); _event.stopPropagation();
var egwpopup_message = _node[0]; var egwpopup_message = _node[0];
var id = egwpopup_message[0].id.replace(/egwpopup_message_/ig,''); var id = egwpopup_message[0].id.replace(/egwpopup_message_/ig,'');
var self = this; egw.request("notifications.notifications_ajax.delete_message", [[id]]);
var request = egw.json("notifications.notifications_ajax.delete_message", [[notifymessages[id]]],function(_data){
if (_data && _data['deleted']) self.total -= Object.keys(_data['deleted']).length;
self.counterUpdate();
});
request.sendRequest(true);
var nextNode = egwpopup_message.next(); var nextNode = egwpopup_message.next();
var keepLoadingPrompt = false; var keepLoadingPrompt = false;
delete (notifymessages[id]); delete (notifymessages[id]);
this.total -= 1;
if (nextNode.length > 0 && nextNode[0].id.match(/egwpopup_message_/ig) && egwpopup_message.hasClass('egwpopup_expanded')) if (nextNode.length > 0 && nextNode[0].id.match(/egwpopup_message_/ig) && egwpopup_message.hasClass('egwpopup_expanded'))
{ {
nextNode.trigger('click'); nextNode.trigger('click');
@ -667,9 +659,14 @@
var hasUnseen = []; var hasUnseen = [];
_rawData = _rawData || []; _rawData = _rawData || [];
// Dont process the data if they're the same as it could get very expensive to // Don't process the data if they're the same as it could get very expensive to
// proccess html their content. // process html their content.
if (_currentRawData.length>0 && _currentRawData.length == _rawData.length) return; if (_currentRawData.length && _currentRawData.length == _rawData.length &&
// check objects in both arrays have the same id
!_rawData.some((d, i) => d.id != _currentRawData[i].id))
{
return;
}
_currentRawData = _rawData || []; _currentRawData = _rawData || [];
var old_notifymessages = notifymessages; var old_notifymessages = notifymessages;
notifymessages = {}; notifymessages = {};
@ -947,4 +944,4 @@
jQuery(".egwpopup_seenall", '#egwpopup').click(function(){window.app.notifications.mark_all_seen()}); jQuery(".egwpopup_seenall", '#egwpopup').click(function(){window.app.notifications.mark_all_seen()});
}, this); }, this);
}); });
})(); })();