From 40e5bb9987f150e5b6f2acd8b6cab3bc8b08ffe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 21 Dec 2022 14:41:24 +0100 Subject: [PATCH 1/3] add loader to else condition --- src/app/pages/events/events.page.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 02121b9e1..13184b805 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -148,7 +148,7 @@ export class EventsPage implements OnInit { async RefreshEvents() { - + console.log('im here') this.currentEvent = ""; this.showLoader = true; this.showAgendaLoader = true; @@ -167,7 +167,8 @@ export class EventsPage implements OnInit { this.showLoader = false; this.showAgendaLoader = false; } else { - + this.showLoader = true; + this.showAgendaLoader = true; } } From 93bbe3f18803f91ed257ab70d271bb8dcfe13248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Wed, 21 Dec 2022 16:25:09 +0100 Subject: [PATCH 2/3] catch added to getattachmentsbyid call --- src/app/pages/agenda/edit-event/edit-event.page.ts | 4 +++- src/app/pages/events/attachments/attachments.page.ts | 4 +++- src/app/pages/events/edit-event/edit-event.page.ts | 4 +++- .../event-detail-modal/event-detail-modal.page.ts | 7 +++---- src/app/pages/events/event-detail/event-detail.page.ts | 4 +++- .../approve-event-modal/approve-event-modal.page.ts | 7 +++++-- .../services/events/attachments/attachments.page.ts | 4 +++- src/app/services/events/edit-event/edit-event.page.ts | 4 +++- .../event-detail-modal/event-detail-modal.page.ts | 7 +++---- .../services/events/event-detail/event-detail.page.ts | 4 +++- .../shared/agenda/approve-event/approve-event.page.ts | 7 ++++++- .../edit-event-to-approve.page.ts | 10 +++++++--- src/app/shared/agenda/edit-event/edit-event.page.ts | 7 ++++++- .../edit-event-to-approve/edit-event.page.ts | 8 ++++++-- 14 files changed, 57 insertions(+), 24 deletions(-) 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/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 From 69242c42276d305d7fad0691c422f547a43cd398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 22 Dec 2022 12:32:56 +0100 Subject: [PATCH 3/3] incompatible package name on project solved --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 4 ++-- .../src/main/assets/capacitor.plugins.json | 24 +++++++++---------- .../capacitorjs/app/testapp/MainActivity.java | 5 ---- 4 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 android/app/src/main/java/com/capacitorjs/app/testapp/MainActivity.java 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 {}