diff --git a/package-lock.json b/package-lock.json index 9f0848316..5d2bbde89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2167,6 +2167,11 @@ "resolved": "https://registry.npmjs.org/@capacitor/ios/-/ios-3.3.0.tgz", "integrity": "sha512-KImT4hVoQJuAfe01wUYiMLnutMu7PxVCv4c8HVWiW+OuyyOua3lC8wQ5gAauGDugAo6mdM7fVva5a0Vtyhnbdg==" }, + "@capacitor/push-notifications": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-1.0.7.tgz", + "integrity": "sha512-vbvAptFq5cI6xKYYWMb7tsWvA88/PTG4v6ptxN0Ygtc1fQ4l/AzONQiYqdtFpbBhF2fML2kXQ/5eSAfn8HY9aw==" + }, "@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", diff --git a/package.json b/package.json index 926cfc6a7..d7e90f259 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "@capacitor/filesystem": "^1.0.6", "@capacitor/haptics": "^1.1.3", "@capacitor/ios": "3.3.0", + "@capacitor/push-notifications": "^1.0.7", "@fortawesome/angular-fontawesome": "^0.9.0", "@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-svg-core": "^1.2.35", diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index a26270b9b..5e500863d 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -104,7 +104,7 @@ - +
@@ -118,8 +118,10 @@ + + diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index fe345d4d2..c383d3af7 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -34,8 +34,8 @@
@@ -67,13 +67,13 @@
Lista vazia
-
+
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 21c9503fb..60f62acd2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -25,7 +25,8 @@ export class ExpedientePage implements OnInit { taskslist = []; serialNumber: string; - expedienteGdStore = ExpedienteGdStore + //expedienteGdStore = ExpedienteGdStore; + expedientegbstore = ExpedienteGdStore expedienteTaskPipe = new ExpedienteTaskPipe() onlinecheck: boolean; @@ -63,38 +64,23 @@ export class ExpedientePage implements OnInit { } - async LoadList() { + LoadList() { - this.processes.GetTaskListExpediente(false).subscribe(async res => { - this.skeletonLoader = true + this.skeletonLoader = true - try { - const expediente: object[] = await this.processes.GetTaskListExpediente(false).toPromise() - const result = expediente + this.processes.GetTaskListExpediente(false).subscribe(result => { + this.taskslist = []; + this.skeletonLoader = false - this.taskslist = new Array(); - let res = result.reverse().filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); + res.forEach(element => { + let task = this.expedienteTaskPipe.transform(element) + this.taskslist.push(task); - res.forEach((element: any) => { - - let task = this.expedienteTaskPipe.transform(element) - this.taskslist.push(task); - this.sqliteservice.addProcess(task); - }); - - this.listToPresent = this.taskslist - console.log('expediente list', this.listToPresent) - - } catch (error) { - this.toastService.badRequest('Processo não encontrado') - this.goBack() - } finally { - this.skeletonLoader = false; - } - }, (error) => { - this.getEventsFromLocalDb(); - }) + }); + this.expedientegbstore.reset(this.taskslist); + }); } async refreshing() { diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html index dc04af69d..c830407f6 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -14,6 +14,7 @@ +
@@ -22,18 +23,21 @@ +
- + +
- + +
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index 17d9f16b8..b8d1bb688 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -66,6 +66,10 @@ export class OptsExpedientePage implements OnInit { }; } + openNewGroupPage(){ + + } + close() { if( window.innerWidth < 801) { this.popoverController.dismiss();