extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement push mechanism for popup notifications

Browse Source
This commit is contained in:
Hadi Nategh 2020-07-21 15:46:38 +02:00
parent eb927182b1
commit 382a9576c7
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
notifications/inc/class.notifications_popup.inc.php
View File

@ -128,6 +128,48 @@ class notifications_popup implements notifications_iface {
'notify_data' => is_array($_data) ? json_encode($_data) : NULL 'notify_data' => is_array($_data) ? json_encode($_data) : NULL
), false,__LINE__,__FILE__,self::_appname); ), false,__LINE__,__FILE__,self::_appname);
if ($result === false) throw new Exception("Can't save notification into SQL table"); if ($result === false) throw new Exception("Can't save notification into SQL table");
$push = new Api\Json\Push($this->recipient->account_id);
$push->call('app.notifications.append', $this->read());
}
/**
* read all notification messages for current recipient
* @return type
*/
private function read()
{
$rs = $this->db->select(self::_notification_table, '*', array(
'account_id' => $this->recipient->account_id,
'notify_type' => self::_type
),
__LINE__,__FILE__,0 ,'ORDER BY notify_id DESC',self::_appname, 100);
$result = array();
if ($rs->NumRows() > 0) {
foreach ($rs as $notification) {
$actions = null;
$data = json_decode($notification['notify_data'], true);
if ($data['appname'] && $data['data'])
{
$_actions = Api\Hooks::process (array(
'location' => 'notifications_actions',
'data' => $data['data']
), $data['appname'], true);
$actions = $_actions[$data['appname']];
}
$result[] = array(
'id' => $notification['notify_id'],
'message' => $notification['notify_message'],
'status' => $notification['notify_status'],
'created' => Api\DateTime::to($notification['notify_created']),
'current' => new DateTime(),
'actions' => is_array($actions)?$actions:NULL,
'extra_data' => ($data['data'] ? $data['data'] : array())
);
}
return $result;
}
} }
/** /**

3
notifications/js/notificationajaxpopup.js
View File

@ -658,6 +658,7 @@
var hasUnseen = []; var hasUnseen = [];
notifymessages = {}; notifymessages = {};
var browser_notify = _browser_notify || this.check_browser_notify();
for (var i=0; i < _rawData.length; i++) for (var i=0; i < _rawData.length; i++)
{ {
var data = this.getData(_rawData[i]['message'], _rawData[i]['extra_data']); var data = this.getData(_rawData[i]['message'], _rawData[i]['extra_data']);
@ -690,7 +691,7 @@
}; };
if (_rawData[i]['actions'] && _rawData[i]['actions'].length > 0) notifymessages[_rawData[i]['id']]['data']['actions'] = _rawData[i]['actions']; if (_rawData[i]['actions'] && _rawData[i]['actions'].length > 0) notifymessages[_rawData[i]['id']]['data']['actions'] = _rawData[i]['actions'];
// Notification API // Notification API
if(_browser_notify && !_rawData[i]['status']) if(browser_notify && !_rawData[i]['status'])
{ {
egw.notification(data.title, { egw.notification(data.title, {
tag: data.app+":"+_rawData[i]['id'], tag: data.app+":"+_rawData[i]['id'],