From bdd0eef7396537873faf8ecf1161dcd3178dc5ab Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Wed, 8 Apr 2020 11:28:09 +0200
Subject: [PATCH] Some fixes for videoconference alarm notification: - Send
 necessary info to the client via calendar notification - Show dialog always
 on the top

---
 calendar/inc/class.calendar_boupdate.inc.php | 5 ++++-
 notifications/js/notificationajaxpopup.js    | 8 ++++----
 pixelegg/css/pixelegg.css                    | 1 +
 pixelegg/less/jquery-ui.less                 | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php
index 7e9fe0df15..e74d6f63fd 100644
--- a/calendar/inc/class.calendar_boupdate.inc.php
+++ b/calendar/inc/class.calendar_boupdate.inc.php
@@ -1164,7 +1164,10 @@ class calendar_boupdate extends calendar_bo
 							$notification->set_popupdata('calendar',
 								array('egw_pr_notify' => 1,
 									'type' => $m_type,
-									'videoconference' => $details['videoconference'])
+									'videoconference' => $details['videoconference'],
+									'account_id' => $userid,
+									'name' => $fullname
+								)
 								+ ($alarm ? ['alarm-offset' => (int)$alarm['offset']] : []));
 						}
 						$notification->set_popupmessage($subject."\n\n".$notify_body."\n\n".$details['description']."\n\n".$details_body."\n\n");
diff --git a/notifications/js/notificationajaxpopup.js b/notifications/js/notificationajaxpopup.js
index 607297f012..9c124ed4b6 100644
--- a/notifications/js/notificationajaxpopup.js
+++ b/notifications/js/notificationajaxpopup.js
@@ -358,13 +358,13 @@
 					case EGW_PR_NOTIFY_HEIGH:
 						if (notifymessages[id]['extra_data']['videoconference'] && notifymessages[id]['extra_data']['alarm-offset'] <= 300)
 						{
-							app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference']);
+							app.status.notificationPopup(notifymessages[id]['extra_data']['videoconference'],
+								notifymessages[id]['extra_data']['account_id'], notifymessages[id]['extra_data']['name']);
 						}
 						else {
-							poped.push(id);
+							this.toggle(true);
 						}
-
-						this.toggle(true);
+						poped.push(id);
 						break;
 					case EGW_PR_NOTIFY_MEDIUM:
 					case EGW_PR_NOTIFY_LOW:
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 96d48acfb3..695b1250ad 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1373,6 +1373,7 @@ span.ui-icon-search {
   background: #CDCDCD;
 }
 .ui-dialog {
+  z-index: 1000;
   box-shadow: -2px 1px 9px 3px #B4B4B4;
 }
 .ui-dialog .ui-dialog-buttonpane {
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index c7cebe95f3..59b521823a 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -288,6 +288,7 @@ span.ui-icon-search {
 	background: @gray_20;
 }
 .ui-dialog {
+	z-index: 1000;
 	box-shadow: -2px 1px 9px 3px @gray_30;
 	.ui-dialog-buttonpane {
 		padding-left: .8em;