From 20a7cd6c765564cd4a1e17205680a943f2415efe Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Wed, 18 Nov 2020 15:10:16 +0100 Subject: [PATCH] Add start and end time to joinVideoConference call --- calendar/js/app.js | 8 +++++--- calendar/js/app.ts | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/calendar/js/app.js b/calendar/js/app.js index c8430ade25..0c723a6a8e 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -3551,7 +3551,7 @@ var CalendarApp = /** @class */ (function (_super) { */ CalendarApp.prototype.joinVideoConferenceAction = function (_action, _sender) { var data = egw.dataGetUIDdata(_sender[0].id)['data']; - return this.joinVideoConference(data['##videoconference']); + return this.joinVideoConference(data['##videoconference'], data); }; /** * Join a videoconference @@ -3560,13 +3560,15 @@ var CalendarApp = /** @class */ (function (_super) { * * @param {string} videoconference */ - CalendarApp.prototype.joinVideoConference = function (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') - }], function (_url) { + }, start.getTime() / 1000, end.getTime() / 1000], function (_url) { app.status.openCall(_url); }).sendRequest(); }; diff --git a/calendar/js/app.ts b/calendar/js/app.ts index a0a19fe5fc..e3766b0a99 100644 --- a/calendar/js/app.ts +++ b/calendar/js/app.ts @@ -4408,7 +4408,7 @@ class CalendarApp extends EgwApp { let data = egw.dataGetUIDdata(_sender[0].id)['data']; - return this.joinVideoConference(data['##videoconference']); + return this.joinVideoConference(data['##videoconference'], data); } /** @@ -4418,8 +4418,10 @@ class CalendarApp extends EgwApp * * @param {string} videoconference */ - public joinVideoConference(videoconference) + 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, @@ -4427,7 +4429,7 @@ class CalendarApp extends EgwApp name:egw.user('account_fullname'), account_id:egw.user('account_id'), email:egw.user('account_email') - }], function(_url){ + }, start.getTime()/1000, end.getTime()/1000], function(_url){ app.status.openCall(_url); }).sendRequest(); }