diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 1cc83898c..64062f9b8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -176,19 +176,15 @@ export class PedidoPage implements OnInit { }, (error) => { if (error.status == 0) { this.getfromDb(); + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') } else { + this.toastService._badRequest('Processo não encontrado') try { this.goBack() this.close() } catch (e) { window.history.back(); } - if(error.status == 0) { - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') - } else { - - this.toastService._badRequest('Processo não encontrado') - } } }); diff --git a/version/git-version.ts b/version/git-version.ts index 9885c2e4a..b1c5c2daa 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "715e1cff3", - "SHA": "715e1cff3ed7ab49b219c29bdeda477f4640811e", + "shortSHA": "cddddf982", + "SHA": "cddddf982b924dbca51d9deba781dc1182d4b2b5", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Fri Feb 3 14:40:09 2023 +0100'", - "lastCommitMessage": "Bug solved on despacho pr", - "lastCommitNumber": "4718", + "lastCommitTime": "'Fri Feb 3 14:45:16 2023 +0100'", + "lastCommitMessage": "merge with Peter changes", + "lastCommitNumber": "4721", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\trenamed: src/firebase-messaging-sw.js -> src/assets/firebase-messaging-sw.js\n\tnew file: src/assets/js/firebase-app.js\n\tnew file: src/assets/js/firebase-messaging.js\n\tmodified: src/index.html\n\tnew file: www.rar", + "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 2 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tdeleted: www.rar", "changeAuthor": "eudes.inacio" } \ No newline at end of file diff --git a/www.rar b/www.rar deleted file mode 100644 index 5575a7494..000000000 Binary files a/www.rar and /dev/null differ