holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix start and end time for join videoconference on calendar action

Browse Source
This commit is contained in:
Hadi Nategh 2020-11-24 13:47:22 +01:00
parent 54eb66fd30
commit 5ebcc62626
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/app.js
View File

@ -3561,14 +3561,13 @@ var CalendarApp = /** @class */ (function (_super) {
* @param {string} videoconference * @param {string} videoconference
*/ */
CalendarApp.prototype.joinVideoConference = function (videoconference, _data) { 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'),
}, start.getTime() / 1000, end.getTime() / 1000], function (_url) { cal_id: _data.id
}, _data.start, _data.end], function (_url) {
app.status.openCall(_url); app.status.openCall(_url);
}).sendRequest(); }).sendRequest();
}; };

7
calendar/js/app.ts
View File

@ -4420,16 +4420,15 @@ class CalendarApp extends EgwApp
*/ */
public joinVideoConference(videoconference, _data) 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,
{ {
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'),
}, start.getTime()/1000, end.getTime()/1000], function(_url){ cal_id:_data.id
}, _data.start, _data.end], function(_url){
app.status.openCall(_url); app.status.openCall(_url);
}).sendRequest(); }).sendRequest();
} }