Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Close #14604 Merge manually change to get notification to show

Browse Source 
Remains: support call of the action=closereminderid done by browser once
notif has be thrown.
This commit is contained in:
Laurent Destailleur
2020-09-12 03:02:08 +02:00
parent ead320642e
commit f45054df06
7 changed files with 78 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/core/js/lib_notification.js.php
View File

@@ -79,6 +79,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
}
?>
var listofreminderids = '';
$.each(arr, function (index, value) {
var url="notdefined";
@@ -88,6 +89,10 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
body += '\n' + value['location'];
}
if(value['type'] == 'agenda' && (value['date'] != null || value['date'] != '')) {
body += '\n' + value['date'];
}
if (value['type'] == 'agenda')
{
url = '<?php echo DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value['id'];
@@ -105,14 +110,26 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
{
audio.play();
}
noti.onclick = function (event) {
console.log("An event to notify on browser was received");
event.preventDefault(); // prevent the browser from focusing the Notification's tab
window.focus();
window.open(url, '_blank');
noti.close();
};
if (noti) {
noti.onclick = function (event) {
console.log("An event to notify on browser was received");
event.preventDefault(); // prevent the browser from focusing the Notification's tab
window.focus();
window.open(url, '_blank');
noti.close();
};
listofreminderids = listofreminderids + ',' + value['id']
}
});
// Update status of all notifications we sent on browser (listofreminderids)
$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderis='; ?>"+listofreminderids, {
type: "get", // Usually post or get
async: true,
data: {time: time_js_next_test}
});
}
}
});