extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add start and end time to joinVideoConference call

Browse Source
This commit is contained in:
Hadi Nategh 2020-11-18 15:10:16 +01:00
parent 09e3035320
commit 20a7cd6c76
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -3551,7 +3551,7 @@ var CalendarApp = /** @class */ (function (_super) {
*/ */
CalendarApp.prototype.joinVideoConferenceAction = function (_action, _sender) { CalendarApp.prototype.joinVideoConferenceAction = function (_action, _sender) {
var data = egw.dataGetUIDdata(_sender[0].id)['data']; var data = egw.dataGetUIDdata(_sender[0].id)['data'];
return this.joinVideoConference(data['##videoconference']); return this.joinVideoConference(data['##videoconference'], data);
}; };
/** /**
* Join a videoconference * Join a videoconference
@ -3560,13 +3560,15 @@ var CalendarApp = /** @class */ (function (_super) {
* *
* @param {string} videoconference * @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, return egw.json("EGroupware\\Status\\Videoconference\\Call::ajax_genMeetingUrl", [videoconference,
{ {
name: egw.user('account_fullname'), name: egw.user('account_fullname'),
account_id: egw.user('account_id'), account_id: egw.user('account_id'),
email: egw.user('account_email') email: egw.user('account_email')
}], function (_url) { }, start.getTime() / 1000, end.getTime() / 1000], function (_url) {
app.status.openCall(_url); app.status.openCall(_url);
}).sendRequest(); }).sendRequest();
}; };

8
calendar/js/app.ts
View File

@ -4408,7 +4408,7 @@ class CalendarApp extends EgwApp
{ {
let data = egw.dataGetUIDdata(_sender[0].id)['data']; 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 * @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( return egw.json(
"EGroupware\\Status\\Videoconference\\Call::ajax_genMeetingUrl", "EGroupware\\Status\\Videoconference\\Call::ajax_genMeetingUrl",
[videoconference, [videoconference,
@ -4427,7 +4429,7 @@ class CalendarApp extends EgwApp
name:egw.user('account_fullname'), name:egw.user('account_fullname'),
account_id:egw.user('account_id'), account_id:egw.user('account_id'),
email:egw.user('account_email') email:egw.user('account_email')
}], function(_url){ }, start.getTime()/1000, end.getTime()/1000], function(_url){
app.status.openCall(_url); app.status.openCall(_url);
}).sendRequest(); }).sendRequest();
} }