- Despachos Presidenciais
- Despachos
+ Despachos Presidenciais
+ Despachos
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 1e6d73458..6e6b13f03 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,8 +6,8 @@
{{ deplomasStore.diplomasParaAssinartCount }} Documentos
- + diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss index 14a992c15..a536bfa80 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss @@ -24,8 +24,6 @@ } .bottom-title{ width: calc(100% - 40px); - margin-left: 20px !important; - margin-right: 20px !important; margin: 0 auto; align-items: center; justify-content: center; diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 9b7fa835d..6c68005f6 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -63,8 +63,6 @@ export class DiplomasAssinarPage implements OnInit { async LoadList() { - - this.skeletonLoader = true let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); @@ -80,7 +78,6 @@ export class DiplomasAssinarPage implements OnInit { this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') - this.deplomasStore.resetDiplomasParaAssinar(this.diplomasList); } diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index fd454c526..5b46dabbf 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -42,7 +42,7 @@ export class DiplomasPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomas=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.refreshing() + this.LoadList() } else { this.LoadList() } diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts index bd265b13c..215e14258 100644 --- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts +++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts @@ -112,14 +112,18 @@ export class DiplomasGerarOptionsPage implements OnInit { const loader = this.toastService.loading() this.despachoService.sendExpedienteToPending(this.serialNumber).subscribe(res => { this.goBack(); - this.toastService.successMessage() + this.toastService._badRequest("Processo enviado para Pendentes") loader.remove() }, - error => { - loader.remove() - this.toastService.badRequest("Processo não enviado para despacho") - }); - + error => { + loader.remove() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest("Processo não enviado para Pendentes") + } + }); } diff --git a/src/firebase-messaging-sw.js b/src/assets/firebase-messaging-sw.js similarity index 93% rename from src/firebase-messaging-sw.js rename to src/assets/firebase-messaging-sw.js index f2423c01d..627521a5c 100644 --- a/src/firebase-messaging-sw.js +++ b/src/assets/firebase-messaging-sw.js @@ -6,8 +6,7 @@ } // Scripts for firebase and firebase messaging - -/* importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js'); +importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js'); importScripts('https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js'); // Initialize the Firebase app in the service worker by passing the generated config @@ -37,4 +36,4 @@ messaging.onBackgroundMessage(function(payload) { self.registration.showNotification(notificationTitle, notificationOptions); -}); */ \ No newline at end of file +}); \ No newline at end of file diff --git a/src/assets/js/firebase-app.js b/src/assets/js/firebase-app.js new file mode 100644 index 000000000..578bd726a --- /dev/null +++ b/src/assets/js/firebase-app.js @@ -0,0 +1,36 @@ +/*! @license Firebase v3.5.2 + Build: 3.5.2-rc.1 + Terms: https://developers.google.com/terms */ + var firebase = null; (function() { for(var aa="function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(c.get||c.set)throw new TypeError("ES3 does not support getters and setters.");a!=Array.prototype&&a!=Object.prototype&&(a[b]=c.value)},h="undefined"!=typeof window&&window===this?this:"undefined"!=typeof global&&null!=global?global:this,ba=function(){ba=function(){};h.Symbol||(h.Symbol=ca)},da=0,ca=function(a){return"jscomp_symbol_"+(a||"")+da++},m=function(){ba();var a=h.Symbol.iterator;a||(a=h.Symbol.iterator= + h.Symbol("iterator"));"function"!=typeof Array.prototype[a]&&aa(Array.prototype,a,{configurable:!0,writable:!0,value:function(){return ea(this)}});m=function(){}},ea=function(a){var b=0;return fa(function(){return b