diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index b62c42f52..cbc2cca9e 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -123,7 +123,7 @@ - +
+
+
+
+ +
A sua Agenda
-
+
+
+
-
-
-
- -
Correspondência por ler
-
- -
-
- - -
-
-
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
-
{{task.taskStartDate | date: 'HH:mm'}}
-
-
-
{{ task.Subject }}
-
{{ task.Senders }}
+
Todo
+
o dia
+
+
+
+
{{event.Location}}
+
+

{{event.Subject}}

- +
+ - + +
- +
+
+
+ +
Correspondência por ler
+
+ +
+
+ + +
+
+
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
+
{{task.taskStartDate | date: 'HH:mm'}}
+
+
+
{{ task.Subject }}
+
{{ task.Senders }}
+
+
+ + + +
+
+
+ + diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 237473091..008df2e4e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -109,16 +109,17 @@ export class EditEventPage implements OnInit { } } - const result = this.participantsPipe.transform(this.postEvent.Attendees) - this.taskParticipants = result.taskParticipants - this.taskParticipantsCc = result.taskParticipantsCc + if (this.postEvent.Attendees != null) { + const result = this.participantsPipe.transform(this.postEvent.Attendees) + this.taskParticipants = result.taskParticipants + this.taskParticipantsCc = result.taskParticipantsCc - this.taskParticipants = removeDuplicate(this.taskParticipants); - this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc); - - this.setIntervenient.emit(this.taskParticipants); - this.setIntervenientCC.emit(this.taskParticipantsCc); + this.taskParticipants = removeDuplicate(this.taskParticipants); + this.taskParticipantsCc = removeDuplicate(this.taskParticipantsCc); + this.setIntervenient.emit(this.taskParticipants); + this.setIntervenientCC.emit(this.taskParticipantsCc); + } } this.initCalendarName = this.postEvent.CalendarName; @@ -127,14 +128,10 @@ export class EditEventPage implements OnInit { this.getRecurrenceTypes(); - this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString(); - - // this.postEvent.EventRecurrence.LastOccurrence = this.currentDate; - setTimeout(() => { this.postEvent.EventRecurrence.Type = this.postEvent.EventRecurrence.Type.toString(); - }, 1000); + }, 500); } diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 8b80e04eb..f5e2b4b96 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -1103,20 +1103,21 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe async openPreview(msg) { + if (msg.file.type === "application/webtrix") { this.viewDocument(msg.file, msg.attachments.image_url) } else { if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') { this.downloadFileMsg(msg) + //this.testDownlod(msg) } else { - var str = msg.attachments[0].image_url; str = str.substring(1, ((str.length) - 1)); if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - console.log(msg) + if (msg.file.type == "application/img") { const modal = await this.modalController.create({ component: ViewMediaPage, @@ -1130,23 +1131,27 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe }); modal.present(); } else { - this.downloadFileFromBrowser("file", str) + this.downloadFileFromBrowser(msg.attachments[0].name, str) } + } else { - this.openFile(str, msg.attachments[0].name, msg.file.type); + if (msg.file.type == "application/img") { + const modal = await this.modalController.create({ + component: ViewMediaPage, + cssClass: 'modal modal-desktop', + componentProps: { + image: msg.attachments[0].image_url, + type: msg.file.type, + username: msg.u.name, + _updatedAt: msg._updatedAt + } + }); + modal.present(); + } else { + this.openFile(str, msg.attachments[0].name, msg.file.type); + } } - /* const modal = await this.modalController.create({ - component: ViewMediaPage, - cssClass: 'modal modal-desktop', - componentProps: { - image: str, - type: msg.file.type, - username: msg.u.name, - _updatedAt: msg._updatedAt - } - }); - modal.present(); */ } } diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 471d44db5..9b1f2abf7 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -97,9 +97,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy isPlaying = false; audioProgress = 0; audioDuration = 0; - audioTimer: any; - @ViewChild('range', { static: false }) range: IonRange; - userName = ""; + audioTimer:any; + @ViewChild('range', {static: false}) range: IonRange; + room: any = new Array(); + roomName: any; + isAdmin = false; + roomCountDownDate: string; constructor( public popoverController: PopoverController, @@ -129,6 +132,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } ngOnChanges(changes: SimpleChanges): void { + this.wsChatMethodsService.getAllRooms(); this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({}) this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked @@ -164,12 +168,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } - async ngOnInit() { + ngOnInit() { this.wsChatMethodsService.getAllRooms(); - alert(this.wsChatMethodsService.getDmRoom(this.roomId).name) this.chatService.refreshtoken(); this.scrollToBottom(); - this.getChatMembers(); this.deleteRecording(); @@ -1027,35 +1029,14 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy if (!msg.attachments[0].image_url || msg.attachments[0].image_url === null || msg.attachments[0].image_url === '') { this.downloadFileMsg(msg) + //this.testDownlod(msg) - - /* } else if (msg.file.type === "application/pdf") { - - - - const win = window.open("", "_blank"); - let html = ''; - - html += ''; - html += ''; - html += '