merge branch

This commit is contained in:
Peter Maquiran
2023-08-28 17:06:16 +01:00
parent 1b897e9c2b
commit a426fba4b3
19 changed files with 176 additions and 136 deletions
+1 -1
View File
@@ -102,7 +102,7 @@ export class ChatSystemService {
document.addEventListener('resume', function () {
if(this._dm?.length == 0 || this._group?.length == 0) {
if(this._dm?.length == 0 && this._group?.length == 0) {
this.getAllRooms();
}
});
+10
View File
@@ -851,12 +851,22 @@ export class EventsService {
const puturl = environment.apiURL + 'calendar/PutEvent';
let params = new HttpParams();
// event.Organizer = {
// "Id": SessionStore.user.UserId,
// "EmailAddress": SessionStore.user.Email,
// "Name": SessionStore.user.UserName,
// "IsRequired": true,
// "UserType": "GD"
// }
// params = params.set("notifyUsers", true)
params = params.set("conflictResolutionMode", conflictResolutionMode.toString());
params = params.set("sendInvitationsOrCancellationsMode", sendInvitationsOrCancellationsMode.toString());
params.set('CalendarId', event.CalendarId)
params.set('CalendarName', event.CalendarName)
this.headers['CalendarId'] = event.CalendarId
this.headers['CalendarName'] = event.CalendarName
//params = params.set("CalendarName", event.CalendarName);
if (event.CalendarName == 'Oficial') {
if (SessionStore.user.Profile == 'MDGPR') {