From 5ebcc626266e3ed45a5963fe7f16970ac560e458 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 24 Nov 2020 13:47:22 +0100
Subject: [PATCH] Fix start and end time for join videoconference on calendar
 action

---
 calendar/js/app.js | 7 +++----
 calendar/js/app.ts | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 0c723a6a8e..36973254ac 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -3561,14 +3561,13 @@ var CalendarApp = /** @class */ (function (_super) {
      * @param {string} videoconference
      */
     CalendarApp.prototype.joinVideoConference = function (videoconference, _data) {
-        var start = new Date(_data.start);
-        var end = new Date(_data.end);
         return egw.json("EGroupware\\Status\\Videoconference\\Call::ajax_genMeetingUrl", [videoconference,
             {
                 name: egw.user('account_fullname'),
                 account_id: egw.user('account_id'),
-                email: egw.user('account_email')
-            }, start.getTime() / 1000, end.getTime() / 1000], function (_url) {
+                email: egw.user('account_email'),
+                cal_id: _data.id
+            }, _data.start, _data.end], function (_url) {
             app.status.openCall(_url);
         }).sendRequest();
     };
diff --git a/calendar/js/app.ts b/calendar/js/app.ts
index e3766b0a99..f981c65f28 100644
--- a/calendar/js/app.ts
+++ b/calendar/js/app.ts
@@ -4420,16 +4420,15 @@ class CalendarApp extends EgwApp
 	 */
 	public joinVideoConference(videoconference, _data)
 	{
-		let start = new Date(_data.start);
-		let end = new Date(_data.end);
 		return egw.json(
 			"EGroupware\\Status\\Videoconference\\Call::ajax_genMeetingUrl",
 			[videoconference,
 				{
 					name:egw.user('account_fullname'),
 					account_id:egw.user('account_id'),
-					email:egw.user('account_email')
-				}, start.getTime()/1000, end.getTime()/1000], function(_url){
+					email:egw.user('account_email'),
+					cal_id:_data.id
+				}, _data.start, _data.end], function(_url){
 				app.status.openCall(_url);
 			}).sendRequest();
 	}