diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b03508bb..c45e0aad0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion rootProject.ext.compileSdkVersion defaultConfig { - applicationId "com.capacitorjs.app.testapp" + applicationId "com.gpr.gabinetedigital" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7321c5001..6a2c5b61b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.gpr.gabinetedigital"> diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 08a376b77..efe947a63 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -9,51 +9,51 @@ }, { "pkg": "@capacitor/app", - "classpath": "com.capacitorjs.plugins.app.AppPlugin" + "classpath": "com.gpr.plugins.app.AppPlugin" }, { "pkg": "@capacitor/browser", - "classpath": "com.capacitorjs.plugins.browser.BrowserPlugin" + "classpath": "com.gpr.plugins.browser.BrowserPlugin" }, { "pkg": "@capacitor/camera", - "classpath": "com.capacitorjs.plugins.camera.CameraPlugin" + "classpath": "com.gpr.plugins.camera.CameraPlugin" }, { "pkg": "@capacitor/device", - "classpath": "com.capacitorjs.plugins.device.DevicePlugin" + "classpath": "com.gpr.plugins.device.DevicePlugin" }, { "pkg": "@capacitor/filesystem", - "classpath": "com.capacitorjs.plugins.filesystem.FilesystemPlugin" + "classpath": "com.gpr.plugins.filesystem.FilesystemPlugin" }, { "pkg": "@capacitor/haptics", - "classpath": "com.capacitorjs.plugins.haptics.HapticsPlugin" + "classpath": "com.gpr.plugins.haptics.HapticsPlugin" }, { "pkg": "@capacitor/keyboard", - "classpath": "com.capacitorjs.plugins.keyboard.KeyboardPlugin" + "classpath": "com.gpr.plugins.keyboard.KeyboardPlugin" }, { "pkg": "@capacitor/local-notifications", - "classpath": "com.capacitorjs.plugins.localnotifications.LocalNotificationsPlugin" + "classpath": "com.gpr.plugins.localnotifications.LocalNotificationsPlugin" }, { "pkg": "@capacitor/network", - "classpath": "com.capacitorjs.plugins.network.NetworkPlugin" + "classpath": "com.gpr.plugins.network.NetworkPlugin" }, { "pkg": "@capacitor/push-notifications", - "classpath": "com.capacitorjs.plugins.pushnotifications.PushNotificationsPlugin" + "classpath": "com.gpr.plugins.pushnotifications.PushNotificationsPlugin" }, { "pkg": "@capacitor/share", - "classpath": "com.capacitorjs.plugins.share.SharePlugin" + "classpath": "com.gpr.plugins.share.SharePlugin" }, { "pkg": "@capacitor/storage", - "classpath": "com.capacitorjs.plugins.storage.StoragePlugin" + "classpath": "com.gpr.plugins.storage.StoragePlugin" }, { "pkg": "@sentry/capacitor", diff --git a/android/app/src/main/java/com/capacitorjs/app/testapp/MainActivity.java b/android/app/src/main/java/com/capacitorjs/app/testapp/MainActivity.java deleted file mode 100644 index 6ce0f538f..000000000 --- a/android/app/src/main/java/com/capacitorjs/app/testapp/MainActivity.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.capacitorjs.app.testapp; - -import com.getcapacitor.BridgeActivity; - -public class MainActivity extends BridgeActivity {} diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index f240e8da0..c129da113 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -497,7 +497,9 @@ export class EditEventPage implements OnInit { this.attachmentsService.getAttachmentsById(eventId).subscribe(res=>{ this.loadedEventAttachments = res; - }); + },((erro) => { + console.error('editgetAttchament', erro) + })); } deleteAttachment(attachmentID: string, index) { diff --git a/src/app/pages/events/attachments/attachments.page.ts b/src/app/pages/events/attachments/attachments.page.ts index 6de2731ba..5bfb8006a 100644 --- a/src/app/pages/events/attachments/attachments.page.ts +++ b/src/app/pages/events/attachments/attachments.page.ts @@ -29,7 +29,9 @@ export class AttachmentsPage implements OnInit { this.attachamentsService.getAttachmentsById(eventid).subscribe(attachments => { this.loadedEventAttachments = attachments; this.pageId = eventid; - }); + },((erro) => { + console.error('loadtAttchament', erro) + })); } async viewDocument(documenturl:string) diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index 8324b12c9..918dd2797 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -194,7 +194,9 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments = res; - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index c49c78eab..8cbe6fe86 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -192,10 +192,9 @@ export class EventDetailModalPage implements OnInit { this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { - },(error) => { - - - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index 6e30d1eb5..21d84ef16 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -190,7 +190,9 @@ export class EventDetailPage implements OnInit { this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { this.loadedEventAttachments = res; - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 212e81102..f74da62f6 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,3 +1,145 @@ - \ No newline at end of file + + + + + +

{{customDate}}

+ + +

{{totalEvent}} evento agendado para hoje

+

{{totalEvent}} eventos agendados para hoje

+ +
+
{{currentHoursMinutes | date: 'HH:mm'}}
+
"{{currentEvent}}"
+
+ + + + + + + + + + + +
+
+ +
+
+ +
A sua Agenda
+
+ +
+
+ + + +
+ +
+
{{event.StartDate | date: 'HH:mm'}}
+
{{event.EndDate | date: 'HH:mm'}}
+ +
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/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index f9df3e409..82c822b98 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -1,11 +1,447 @@ import { Component, OnInit, EventEmitter, Output } from '@angular/core'; +import { EventsService } from 'src/app/services/events.service'; +import { NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, NavigationEnd } from '@angular/router'; +import { ModalController, Platform } from '@ionic/angular'; +import { EventDetailPage } from './event-detail/event-detail.page'; +import { ProcessesService } from '../../services/processes.service'; +import { ToDayEventStorage } from 'src/app/store/to-day-event-storage.service'; +import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; +import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; +import { SqliteService } from 'src/app/services/sqlite.service'; +import { BackgroundService } from 'src/app/services/background.service'; +import { momentG } from 'src/plugin/momentG'; +import { ThemeService } from 'src/app/services/theme.service' +import { Storage } from '@ionic/storage'; +import { PermissionService } from 'src/app/services/permission.service'; +import { ViewEventPage } from 'src/app/modals/view-event/view-event.page'; +import { ChangeProfileService } from 'src/app/services/change-profile.service'; +import { SessionStore } from 'src/app/store/session.service'; @Component({ selector: 'app-events', templateUrl: './events.page.html', styleUrls: ['./events.page.scss'], }) export class EventsPage implements OnInit { - constructor() {} + today = new Date(); + + months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; + days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + + customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]); + + grettings = ["Bom dia", "Boa tarde", "Boa noite"]; + greetting = ''; + + timeDate = this.today.getHours() + ":" + this.today.getMinutes(); + + segment: string; + public profile: string; + currentEvent: any; + + maxSubjectLength = 30; + + customText = false; + totalEvent = 0; + currentHoursMinutes: Date | string; + + showLoader: boolean; + + expedientList: any; + hideSearchBtn: boolean = false; + + // shared data + toDayEventStorage = ToDayEventStorage + expedienteGdStore = ExpedienteGdStore + + listToPresent = []; + listToPresentexpediente = [] + + expedienteTaskPipe = new ExpedienteTaskPipe() + + @Output() openExpedientListPage: EventEmitter = new EventEmitter(); + + sessoStore = SessionStore; + + showAgendaLoader = false + showCorrespondenciasLoader = false + + constructor( + private eventService: EventsService, + private router: Router, + public activatedRoute: ActivatedRoute, + private processes: ProcessesService, + private modalController: ModalController, + public platform: Platform, + private sqliteservice: SqliteService, + private backgroundservice: BackgroundService, + public ThemeService: ThemeService, + private storage: Storage, + public p: PermissionService, + private changeProfileService: ChangeProfileService, + ) { + + + window['zipPhoneCallback'] = function (zipphone) { + var frame = document.getElementById('home-iframe'); + if(frame) { + frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); + } + } + + this.changeProfileService.registerCallback(() => { + + this.listToPresent = []; + this.listToPresentexpediente = [] + }) + + } + + ngOnInit() { + + this.showGreeting(); + + this.router.events.forEach((event) => { + if (event instanceof NavigationEnd && event.url == '/home/events') { + this.RefreshEvents(); + setTimeout(() => { + this.LoadList(); + }, 1500) + } + }); + this.hideSearch(); + + this.backgroundservice.registerBackService('Online', () => { + this.showGreeting(); + this.RefreshEvents(); + this.LoadList(); + this.hideSearch(); + }); + + } + + hideSearch() { + if (this.router.url == '/home/events') { + this.hideSearchBtn = true; + } + } + + doRefresh() { + this.RefreshEvents(); + this.LoadList(); + } + + onSegmentChange() { + this.doRefresh(); + } + + + async RefreshEvents() { + + this.currentEvent = ""; + this.showLoader = true; + this.showAgendaLoader = true; + + let date = new Date(); + let month = date.getMonth() + 1; + let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); + let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; + if(SessionStore.user) { + let onwEvent:any = await this.eventService.getAllOwnEvents(start, end).catch((error) => { + this.showAgendaLoader = false; + console.error(error) + }) + this.listToPresent = onwEvent; + this.totalEvent = onwEvent.length; + this.showLoader = false; + this.showAgendaLoader = false; + } else { + + } + + } + + addEventToDb(list) { + + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + this.storage.set('events', list).then(() => { + // + }) + } else { + if (list.length > 0) { + list.forEach(element => { + this.sqliteservice.addEvent(element) + + this.sqliteservice.getAllEvents().then((event: any[] = []) => { + let todayEvents = new Array() + event.forEach((element) => { + let eventObject = { + AppointmentState: element.AppointmentState, + Attachments: element.Attachments, + Attendees: element.Attendees, + CalendarId: element.CalendarId, + CalendarName: element.CalendarName, + Category: element.Category, + EndDate: element.EndDate, + EventId: element.EventId, + EventRecurrence: element.EventRecurrence, + EventType: element.EventType, + HasAttachments: element.HasAttachments, + HumanDate: element.HumanDate, + IsAllDayEvent: element.IsAllDayEvent, + IsMeeting: element.IsMeeting, + IsRecurring: element.IsRecurring, + Location: element.Location, + Organizer: element.Organizer, + Profile: element.Profile, + StartDate: element.StartDate, + Subject: element.Subject + } + todayEvents.push(eventObject); + }) + + }) + }); + } + } + } + + addProcessToDb(list) { + + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + this.storage.set('process', list).then(() => { + // + }) + } else { + if (list.length > 0) { + list.forEach(element => { + this.sqliteservice.addProcess(element) + }); + } + } + } + + getEventsFromLocalDb() { + + let date = new Date(); + let month = date.getMonth() + 1; + //date.setMonth(date.getMonth() + 1); + let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); + // ('dateeeeee', dateToday) + if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + this.storage.get('events').then((events: any[] = []) => { + // + let todayEvents = new Array() + this.listToPresent = events + this.totalEvent = this.listToPresent.length + this.currentEvent = this.listToPresent[0].Subject + this.currentHoursMinutes = this.listToPresent[0].StartDate + // + }) + + this.storage.get('process').then((process: any[] = []) => { + // + const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) + this.listToPresentexpediente = ExpedienteTask; + }) + + this.showLoader = false; + + } else { + this.sqliteservice.getAllEvents().then((event: any[] = []) => { + let todayEvents = new Array() + event.forEach((element) => { + let eventObject = { + AppointmentState: element.AppointmentState, + Attachments: element.Attachments, + Attendees: element.Attendees, + CalendarId: element.CalendarId, + CalendarName: element.CalendarName, + Category: element.Category, + EndDate: element.EndDate, + EventId: element.EventId, + EventRecurrence: element.EventRecurrence, + EventType: element.EventType, + HasAttachments: element.HasAttachments, + HumanDate: element.HumanDate, + IsAllDayEvent: element.IsAllDayEvent, + IsMeeting: element.IsMeeting, + IsRecurring: element.IsRecurring, + Location: element.Location, + Organizer: element.Organizer, + Profile: element.Profile, + StartDate: element.StartDate, + Subject: element.Subject + } + let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); + // + if (dateToday == starteDate) { + todayEvents.push(eventObject); + } + }) + this.listToPresent = todayEvents + this.totalEvent = this.listToPresent.length + this.currentEvent = this.listToPresent[0].Subject + this.currentHoursMinutes = this.listToPresent[0].StartDate + // + }) + + this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[] = []) => { + + // + + if (process.length > 0 || process != undefined) { + + var expedientlist: any = new Array(); + process.forEach((element) => { + if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) { + + let task = { + activityInstanceName: element.activityInstanceName, + deadline: null, + serialNumber: element.serialNumber, + taskStartDate: element.taskStartDate, + totalDocuments: element.totalDocuments, + workflowDisplayName: element.workflowDisplayName, + workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) + } + expedientlist.push(task); + + } + }) + + // + const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) + this.listToPresentexpediente = ExpedienteTask; + + } + + this.showLoader = false; + }) + } + // }); + } + + + + showGreeting() { + if (this.today.getHours() >= 6 && this.today.getHours() < 12) { + this.greetting = this.grettings[0]; + } + else if (this.today.getHours() >= 12 && this.today.getHours() < 18) { + this.greetting = this.grettings[1]; + } + else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */ { + this.greetting = this.grettings[2]; + } + } + + gotTo() { + this.router.navigate(['/home/events']); + } + + changeProfile() { + if (this.profile == "mdgpr") { + // + this.profile = "pr"; + this.RefreshEvents(); + } + else { + // + this.profile = "mdgpr"; + this.RefreshEvents(); + } + } + + async openEventDetail1(id: any) { + // + + const modal = await this.modalController.create({ + component: EventDetailPage, + componentProps: { + eventId: id, + }, + cssClass: 'event-detail', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + + } + + async openEventDetail(id: any) { + // + + const modal = await this.modalController.create({ + component: ViewEventPage, + componentProps: { + eventId: id, + }, + cssClass: 'view-event', + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + + } + + LoadList() { + this.showCorrespondenciasLoader = true + this.processes.GetTaskListExpediente(false).subscribe(result => { + this.addProcessToDb(result); + + let ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e)) + + this.listToPresentexpediente = ExpedienteTask; + + this.showCorrespondenciasLoader = false + }, ((error) => { + + this.showCorrespondenciasLoader = false + // + this.getEventsFromLocalDb(); + })); + } + + sortArrayISODate(myArray: any) { + return myArray.sort(function (a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } + + goToEvent(event: any) { + let navigationExtras: NavigationExtras = { queryParams: { CalendarId: event.CalendarId } } + + + this.router.navigate(['/home/events', event.EventId, 'agenda'], navigationExtras); + } + + goToExpediente(SerialNumber: any) { + this.router.navigate(['/home/events/expediente', SerialNumber, 'events']); + } + + viewExpedientListPage() { + + if (this.sessoStore.user.Profile == 'PR') { + if (window.innerWidth < 701) { + this.router.navigate(['/home/gabinete-digital/expedientes-pr']); + } + else { + let navigationExtras: NavigationExtras = { queryParams: { "expedientes-pr": true, } }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } else { + + if (window.innerWidth < 701) { + this.router.navigate(['/home/gabinete-digital/expediente']); + } + else { + let navigationExtras: NavigationExtras = { queryParams: { "expedientes": true, } }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } + } + + - ngOnInit() {} } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 2cdd2458f..6e6ea1234 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -144,8 +144,11 @@ export class ApproveEventModalPage implements OnInit { } async getAttachments() { - this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); - + try { + this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise; + } catch (error) { + console.error('getAttachments', error) + } } diff --git a/src/app/services/events/attachments/attachments.page.ts b/src/app/services/events/attachments/attachments.page.ts index 27bf95b81..f5debd1a8 100644 --- a/src/app/services/events/attachments/attachments.page.ts +++ b/src/app/services/events/attachments/attachments.page.ts @@ -30,7 +30,9 @@ export class AttachmentsPage implements OnInit { this.attachamentsService.getAttachmentsById(eventid).subscribe(attachments => { this.loadedEventAttachments = attachments; this.pageId = eventid; - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) diff --git a/src/app/services/events/edit-event/edit-event.page.ts b/src/app/services/events/edit-event/edit-event.page.ts index 0abc741ee..d6566596d 100644 --- a/src/app/services/events/edit-event/edit-event.page.ts +++ b/src/app/services/events/edit-event/edit-event.page.ts @@ -189,7 +189,9 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments = res; - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts index 91b79c410..7edc0a417 100644 --- a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts @@ -186,10 +186,9 @@ export class EventDetailModalPage implements OnInit { this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { - },(error) => { - - - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/services/events/event-detail/event-detail.page.ts b/src/app/services/events/event-detail/event-detail.page.ts index 7752966a7..fd77669ad 100644 --- a/src/app/services/events/event-detail/event-detail.page.ts +++ b/src/app/services/events/event-detail/event-detail.page.ts @@ -187,7 +187,9 @@ export class EventDetailPage implements OnInit { this.loadedEventAttachments = res; - }); + },((erro) => { + console.error('loadAttchament', erro) + })); } async viewDocument(documenturl:string) { diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index bf42e49f8..e808c866b 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -117,7 +117,12 @@ export class ApproveEventPage implements OnInit { } async getAttachments() { - this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + try { + this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + } catch (error) { + console.error('getAttchaments',error) + } + } diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 7548f5d22..c913efd2b 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -481,9 +481,13 @@ export class EditEventToApprovePage implements OnInit { async getAttachments() { - - let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); - + let result: any; + try { + result = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + } catch (error) { + console.error('getAttachment',error) + } + result.forEach((e)=>{ e.action = false }) 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 c686fffa5..32893bf60 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -456,7 +456,12 @@ export class EditEventPage implements OnInit { } async getAttachments(eventId: string){ - const rest: any = this.attachmentsService.getAttachmentsById(eventId).toPromise() + let rest: any; + try { + rest = this.attachmentsService.getAttachmentsById(eventId).toPromise() + } catch (error) { + console.error('getAttchment', error) + } this.loadedEventAttachments = rest; } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index 9db2446d8..86e1b0ea0 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -404,8 +404,12 @@ export class EditEventToApproveComponent implements OnInit { async getAttachments() { - - let result: any = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + let result: any; + try { + result = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); + } catch (error) { + console.error('getAttachments', error) + } result.forEach((e)=>{ e.action = false