From a08bb5d4f4fd2f598b3c297a303f863096251ce0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Wed, 26 Jul 2023 13:06:42 +0100 Subject: [PATCH] fix --- src/app/pages/agenda/agenda.page.html | 7 ++++++- .../pages/agenda/new-event/new-event.page.html | 7 ++++++- src/app/pages/agenda/new-event/new-event.page.ts | 1 + .../event-list/event-list.page.html | 8 +++++++- .../event-list/event-list.page.ts | 2 ++ .../gabinete-digital/gabinete-digital.page.ts | 7 +++---- .../pedidos/pedido/pedido.page.html | 4 ++-- src/app/services/background.service.ts | 14 +++++++++++--- src/app/services/http-error-handle.service.ts | 14 +++++++++++--- src/app/services/task.service.ts | 7 +++---- .../shared/agenda/event-list/event-list.page.html | 7 ++++++- .../shared/agenda/event-list/event-list.page.ts | 1 + .../all-processes/all-processes.page.ts | 5 ++--- .../events-to-approve/events-to-approve.page.html | 7 ++++++- .../events-to-approve/events-to-approve.page.ts | 1 + .../new-publication/convertBlobToBase64.worker.js | 15 +++++++++++++++ .../new-publication/new-publication.page.ts | 2 +- version/git-version.ts | 12 ++++++------ 18 files changed, 90 insertions(+), 31 deletions(-) create mode 100644 src/app/shared/publication/new-publication/convertBlobToBase64.worker.js diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 9b1dc6a9c..9fd1c0b10 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -62,7 +62,12 @@
PR
MDGPR
Agenda do {{calendars.Fullname}}
-
Minha agenda
+
+ + Minha agenda +
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 8b7c48bc9..7d63fce78 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -39,7 +39,12 @@
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
-
Minha agenda
+
+ + Minha agenda +
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 10ff02fdc..695a90364 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -78,6 +78,7 @@ export class NewEventPage implements OnInit { loggeduser: LoginUserRespose; members:any; CalendarName; + SessionStore = SessionStore; public listColors = ['primary', 'accent', 'warn']; public stepHours = [1, 2, 3, 4, 5]; diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 738d623bd..3a3e57f7d 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -62,7 +62,13 @@ --> -
Minha agenda
+
+ + + Minha agenda +
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 7c72d8c43..b42ca219f 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -47,6 +47,8 @@ export class EventListPage implements OnInit { delete(): void; } + SessionStore = SessionStore; + constructor( private processes: ProcessesService, private modalController: ModalController, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 0b2438c5c..77a0c56f1 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -312,13 +312,12 @@ export class GabineteDigitalPage implements OnInit { if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') { this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']); } - else if (activityName == 'Revisar Diploma' ) { + else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') { this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); - } - else if (activityName == 'Diploma Assinado' || activityName == 'Assinar Diploma') { + } else if ( activityName == 'Assinar Diploma') { this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); } else { - + throw('Bug!'); } } else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 9a5d316e5..1ae45681f 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -128,7 +128,7 @@
- +
@@ -137,7 +137,7 @@
- + diff --git a/src/app/services/background.service.ts b/src/app/services/background.service.ts index 7a6958674..c557c0d1f 100644 --- a/src/app/services/background.service.ts +++ b/src/app/services/background.service.ts @@ -72,7 +72,7 @@ export class BackgroundService { async offline() { if(this.status == 'offline') { - return false + return true } const hasReachedTheServer = await this.tryToReachTheServer() @@ -90,7 +90,11 @@ export class BackgroundService { e.funx() } }) + + return true } + + return false } @@ -101,11 +105,15 @@ export class BackgroundService { try { await this.http.post(environment.apiURL + "UserAuthentication/Login", '', opts).toPromise(); + return true } catch (error) { - if(error.status != 400) { + + if(error.status === 0) { return false - } + } + + return true } } diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts index 7d5a18a69..bc600918f 100644 --- a/src/app/services/http-error-handle.service.ts +++ b/src/app/services/http-error-handle.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@angular/core'; import { ToastService } from 'src/app/services/toast.service'; +import { BackgroundService } from 'src/app/services/background.service'; @Injectable({ providedIn: 'root' @@ -7,14 +8,21 @@ import { ToastService } from 'src/app/services/toast.service'; export class HttpErrorHandle { constructor( - private toastService: ToastService + private toastService: ToastService, + private backgroundService: BackgroundService ) { } - httpStatusHandle(error) { + async httpStatusHandle(error) { switch (error.status ) { case 0: - this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + const result = await this.backgroundService.offline() + if(result) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + } + break; case 400: this.toastService._badRequest('Lamentamos, mas houve um problema com sua solicitação. Por favor, tente novamente') diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index fbc55e8b0..61b1b1e76 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -399,13 +399,12 @@ export class TaskService { if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') { this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']); } - else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') { + else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') { this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); - } - else if (activityName == 'Diploma Assinado') { + } else if ( activityName == 'Assinar Diploma') { this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); } else { - + throw('Bug!'); } } else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') { diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index 7507f521c..a1b3994ee 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -12,7 +12,12 @@ -
Minha agenda
+
+ + Minha agenda +
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 3dc826663..7f249653f 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -30,6 +30,7 @@ export class EventListPage implements OnInit { eventoaprovacaostore = EventoAprovacaoStore; environment = environment color: 'pr' | 'mdgpr' + SessionStore = SessionStore; @Input() profile:string; @Input() showComponent:string; diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 4ef484e7b..92b76c7d8 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -148,10 +148,9 @@ export class AllProcessesPage implements OnInit { if (activityName == 'Tarefa de Despacho' || activityName == 'Concluir Despacho') { this.router.navigate(['/home/gabinete-digital/despachos-pr', serialNumber, 'gabinete-digital']); } - else if (activityName == 'Revisar Diploma' || activityName == 'Assinar Diploma') { + else if (activityName == 'Revisar Diploma' || activityName == 'Diploma Assinado') { this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); - } - else if (activityName == 'Diploma Assinado') { + } else if ( activityName == 'Assinar Diploma') { this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']); } else { throw('Bug!'); diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html index ee352f766..ff17d8e55 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html @@ -58,7 +58,12 @@ Minha agenda
--> -
Minha agenda
+
+ + Minha agenda +
{{ environment.agendaPR}}
{{ environment.agendaVP}}
Agenda do {{calendars.Fullname}}
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index c42856866..6c23eab19 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -45,6 +45,7 @@ export class EventsToApprovePage implements OnInit { delete(): void; } routerSubscription; + SessionStore = SessionStore; constructor( diff --git a/src/app/shared/publication/new-publication/convertBlobToBase64.worker.js b/src/app/shared/publication/new-publication/convertBlobToBase64.worker.js new file mode 100644 index 000000000..1d81ad388 --- /dev/null +++ b/src/app/shared/publication/new-publication/convertBlobToBase64.worker.js @@ -0,0 +1,15 @@ +convertBlobToBase64 = (blob) => new Promise((resolve, reject) => { + const reader = new FileReader; + reader.onerror = reject; + reader.onload = () => { + resolve(reader.result); + }; + reader.readAsDataURL(blob); +}).catch ((error) => { + console.error(error); +});; + +onmessage = async function(oEvent) { + const result = await convertBlobToBase64(oEvent.data); + postMessage(result); +}; \ No newline at end of file diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 63a5e2442..333a98453 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -86,7 +86,7 @@ export class NewPublicationPage implements OnInit { async takePicture() { const capturedImage = await Camera.getPhoto({ - quality: 90, + quality: 50, // allowEditing: true, resultType: CameraResultType.Base64, source: CameraSource.Camera diff --git a/version/git-version.ts b/version/git-version.ts index 772c9508b..ec7b2a3b6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "2628bc91e", - "SHA": "2628bc91e881fa3ee5f559cac57dace1fa1ccf41", + "shortSHA": "9e8bb92b9", + "SHA": "9e8bb92b9661c6ce4fbb415f07891e2cca809137", "branch": "developer-catch-merge", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jul 25 15:56:42 2023 +0100'", - "lastCommitMessage": "clear", - "lastCommitNumber": "5109", + "lastCommitTime": "'Tue Jul 25 16:49:51 2023 +0100'", + "lastCommitMessage": "fix issue 27", + "lastCommitNumber": "5110", "change": "", - "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/services/processes.service.ts", + "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/services/background.service.ts\n\tmodified: src/app/services/http-error-handle.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.html\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tnew file: src/app/shared/publication/new-publication/convertBlobToBase64.worker.js\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file