diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index baf01a4eb..e64908279 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -53,7 +53,7 @@
- {{msg.u.name}} + {{msg.u.name}} {{msg.duration}}
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 0f8c1a5df..2bad4e663 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -1051,10 +1051,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { // } - hkellor() { - // alert('cool!') - } - } diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 57fcdc490..a721da793 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -214,37 +214,43 @@ export class PublicationsPage implements OnInit { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.publicationsEventFolderList = new Array(); this.publicationsTravelFolderList = new Array(); - this.storage.get('actionsEvents').then((events) => { + this.storage.get('actionsEvents').then((events = []) => { - events.forEach(data => { - let folder: PublicationFolder = { - ProcessId: data.ProcessId, - Description: data.Description, - Detail: data.Detail, - DateBegin: data.DateBegin, - DateEnd: data.DateEnd, - ActionType: data.ActionType, - } + if(Array.isArray(events)) { + events.forEach(data => { + let folder: PublicationFolder = { + ProcessId: data.ProcessId, + Description: data.Description, + Detail: data.Detail, + DateBegin: data.DateBegin, + DateEnd: data.DateEnd, + ActionType: data.ActionType, + } + + this.publicationsEventFolderList.push(folder); + this.showLoader = false; + }); + } - this.publicationsEventFolderList.push(folder); - this.showLoader = false; - }); }); this.storage.get('actionsViagens').then((viagens = []) => { - viagens.forEach(data => { - let folder: PublicationFolder = { - ProcessId: data.ProcessId, - Description: data.Description, - Detail: data.Detail, - DateBegin: data.DateBegin, - DateEnd: data.DateEnd, - ActionType: data.ActionType, - } - - this.publicationsTravelFolderList.push(folder); - this.showLoader = false; - }); + if(Array.isArray(viagens)) { + viagens.forEach(data => { + let folder: PublicationFolder = { + ProcessId: data.ProcessId, + Description: data.Description, + Detail: data.Detail, + DateBegin: data.DateBegin, + DateEnd: data.DateEnd, + ActionType: data.ActionType, + } + + this.publicationsTravelFolderList.push(folder); + this.showLoader = false; + }); + } + }); } else { this.sqliteservice.getAllActions().then((actions: any[]) => { @@ -311,7 +317,7 @@ export class PublicationsPage implements OnInit { this.closeDesktopComponent(); this.idSelected = ''; - + if (window.innerWidth < 701) { const modal = await this.modalController.create({