diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index f9d675478..886ad13a3 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -87,7 +87,8 @@ export class HomePage implements OnInit { private NativeNotificationService: NativeNotificationService, private sqliteservice: SqliteService, private RochetChatConnectorService: RochetChatConnectorService, - private NetworkServiceService: NetworkServiceService + private NetworkServiceService: NetworkServiceService, + public eventService: EventsService, ) { if (SessionStore.exist) { this.user = SessionStore.user; @@ -169,15 +170,22 @@ export class HomePage implements OnInit { this.updateList() - // var myWorker = new Worker(new URL('./nice.worker.js', import.meta.url)); - - // myWorker.onmessage = function (oEvent) { - // console.log('Worker said : ' + oEvent.data); - // } - - // myWorker.postMessage('ali'); this.clearTabButtonSelection(); + setTimeout(() => { + if(this.p.userPermission([this.p.permissionList.Gabinete.md_tasks]) && this.p.userPermission([this.p.permissionList.Gabinete.pr_tasks])) { + throw(SessionStore.user.FullName + 'cant have MD and PR authorization at same time'); + } + + if(this.p.userPermission([this.p.permissionList.Chat.access]) && !SessionStore.user?.ChatData?.data) { + throw('Chat temporarily unavailable for '+SessionStore.user.FullName + '. No ChatData'); + } + + if(this.p.userPermission([this.p.permissionList.Agenda.access]) && !this.eventService.hasAnyCalendar) { + throw('User '+SessionStore.user.FullName + 'has No calendar'); + } + }, 1000) + } clearTabButtonSelection() { @@ -220,13 +228,6 @@ export class HomePage implements OnInit { updateList() { - // this.notificationsService.registerCallback( - // 'despachos', - // () => { - // // this.despachoRule.getList({ updateStore: true }) - // } - // ) - document.addEventListener('pause', function () { // console.log('App going to background'); }); diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 6efadc2f5..9be13754e 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -70,7 +70,7 @@ appearance="fill" class="width-100 d-block" appearance="none"> - + {{type.Description}} diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 5a6b5f37e..0a82d21eb 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -292,7 +292,12 @@ export class CreateProcessPage implements OnInit { this.modalController.dismiss(); this.toastService._successMessage('Despacho criado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error?.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() @@ -324,7 +329,12 @@ export class CreateProcessPage implements OnInit { this.toastService._successMessage('Pedido de Parecer enviado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error?.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() } @@ -349,7 +359,12 @@ export class CreateProcessPage implements OnInit { this.toastService._successMessage('Pedido de Deferimento criado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error?.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() @@ -377,7 +392,12 @@ export class CreateProcessPage implements OnInit { this.modalController.dismiss(); this.toastService._successMessage('Despacho criado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error?.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove(); } @@ -413,7 +433,12 @@ export class CreateProcessPage implements OnInit { this.toastService._successMessage('Pedido de Parecer criado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() } @@ -438,7 +463,12 @@ export class CreateProcessPage implements OnInit { this.toastService._successMessage('Pedido de Deferimento criado'); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() } @@ -493,7 +523,12 @@ export class CreateProcessPage implements OnInit { await this.processes.CompleteTask(body).toPromise(); this.toastService._successMessage(message); } catch (error) { - this.toastService._badRequest('Processo não efectuado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não efectuado'); + } } finally { loader.remove() } diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index 7846b1595..be35f0d87 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -68,7 +68,11 @@ export class DarParecerPage implements OnInit { this.modalController.dismiss('sucess'); this.toastService._successMessage('Parecer enviado'); } catch (error) { - this.toastService._badRequest("Parecer não solicitado"); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest("Parecer não solicitado"); + } } finally { loader.remove() } diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 2f05f8bfb..181908833 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -107,7 +107,11 @@ export class DelegarPage implements OnInit { this.close(); }, (error)=>{ + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { this.toastService._badRequest("Processo não delegado") + } }, ()=>{ loader.remove() diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index c75e7ad1d..bcbe56f9d 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -83,7 +83,7 @@
- + diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 90fda08ac..939804d9d 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -230,7 +230,7 @@ export class DocumentSetUpMeetingPage implements OnInit { this.docs.push({ ApplicationId: e.ApplicationId || e.ApplicationType, Source: 1, - SourceId: e.DocId || e.docID || e.docId || e.SourceId, + SourceId: e.DocId || e.docID || e.docId || e.SourceId || e.Id, SourceName: e.Assunto }) }) @@ -239,7 +239,7 @@ export class DocumentSetUpMeetingPage implements OnInit { this.docs.push({ ApplicationId: this.document.ApplicationId || this.document.ApplicationType, Source: 1, - SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId, + SourceId: this.document.DocId || this.document.docID || this.document.docId || this.document.SourceId || this.document.Id, SourceName: this.document.Assunto }) } @@ -249,7 +249,7 @@ export class DocumentSetUpMeetingPage implements OnInit { Subject: this.postData.Subject, Body: this.postData.Body.Text, Location: this.postData.Location, - CalendarId: this.postData.CalendarName, + CalendarId: this.selectedCalendarId(), CalendarName: this.postData.CalendarName, StartDate: this.postData.StartDate, EndDate: this.postData.EndDate, @@ -277,7 +277,12 @@ export class DocumentSetUpMeetingPage implements OnInit { this.modalController.dismiss() }, (error) => { laoder.remove() - this.toastService._badRequest('Não foi possível marcar a reunião'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Não foi possível marcar a reunião'); + } }, ()=>{ laoder.remove() }); @@ -369,6 +374,7 @@ export class DocumentSetUpMeetingPage implements OnInit { modal.onDidDismiss().then((res)=> { if(res){ const data = res.data; + console.log('data', data) this.attachments.push(data.selected); } }); @@ -378,13 +384,27 @@ export class DocumentSetUpMeetingPage implements OnInit { this.attachments = this.attachments.filter( (e, i) => index != i); } - validateFormInputs(){ + validateFormInputs() { let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ this.formLocationSatus = true; } } + selectedCalendarId () { + + if (this._eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') { + return this._eventService.calendarNamesType[this.CalendarName]['OficialId'] + + } else if (this._eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postData.CalendarName == 'Pessoal') { + + return this._eventService.calendarNamesType[this.CalendarName]['PessoalId'] + + } else { + return '11:11' + } + } + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}) { this.taskParticipants = taskParticipants; this.taskParticipantsCc = taskParticipantsCc; diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index 2eacdffe3..46f752f46 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -147,11 +147,16 @@ export class ForwardPage implements OnInit { "AttachmentList" :docs, } this.processes.CompleteParecerPrTask(body).subscribe(res=>{ - this.toastService._successMessage('Processo delegado'); + this.toastService._successMessage('Processo Reencaminhado'); this.goBack(); }, (error)=>{ - this.toastService._badRequest("Processo não delegado") + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest("Processo não delegado") + } }); } } diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index aa0103420..80e2775d3 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/src/app/modals/view-event/view-event.page.ts @@ -1,15 +1,11 @@ import { Component, OnInit } from '@angular/core'; import { AlertController, ModalController, PopoverController, Platform, NavParams } from '@ionic/angular'; import { EventBody } from 'src/app/models/eventbody.model'; -import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ProcessesService } from 'src/app/services/processes.service';import { ActivatedRoute, Router } from '@angular/router'; import { ToastService } from 'src/app/services/toast.service'; import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page'; -import { Location } from '@angular/common' import { SqliteService } from 'src/app/services/sqlite.service'; import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage'; import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page'; diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 0f08bdc40..f4db62035 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -365,7 +365,7 @@
-

{{event.event.Subject}} ....

+

{{event.event.Subject}}

{{event.event.Location}}
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 c129da113..60382ad0f 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -352,8 +352,12 @@ export class EditEventPage implements OnInit { this.toastService._successMessage(); }, error => { - if(error.status != 0) - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } }); } else { this.eventsService.editEvent(this.postEvent, 2, 3, this.postEvent.CalendarId).subscribe(async () => { @@ -376,8 +380,12 @@ export class EditEventPage implements OnInit { this.toastService._successMessage(); }, error => { - if(error.status != 0) - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } }); } 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 75ec9c57b..9de2af286 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -176,7 +176,7 @@ export class NewEventPage implements OnInit { } window.onresize = (event) => { - if( window.innerWidth >= 1024){ + if( window.innerWidth >= 1024) { this.modalController.dismiss(); } }; @@ -186,7 +186,6 @@ export class NewEventPage implements OnInit { } setDefaultTime() { - console.log(this.CalendarDate) this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate); this.postEvent.EndDate = this.postEvent.StartDate; } @@ -446,7 +445,12 @@ export class NewEventPage implements OnInit { this.modalController.dismiss(data); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 8cfe4296f..5a40b5cb3 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -85,7 +85,7 @@
Detalhes
-
{{ loadedEvent.Body.Text }}
+
{{ loadedEvent.Body.Text }} 
diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index d52a17c96..093422105 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -189,11 +189,7 @@ export class ViewEventPage implements OnInit { if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.getEvent(this.eventId).subscribe(res => { - const div = document.createElement("div") - div.innerHTML = res.Body.Text - res.Body.Text = div.innerText this.loadedEvent = res; - this.addEventToDb(res); loader.remove() diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 527beb5dc..2153db98c 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -20,7 +20,7 @@ - + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index a2dd565a2..d7b249733 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -126,13 +126,19 @@ export class EventsPage implements OnInit { } } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } this.RefreshEvents(); this.LoadList(); } onSegmentChange() { - this.doRefresh(); + this.RefreshEvents(); + this.LoadList(); } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 515e0b03a..29cd58fe8 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -126,11 +126,6 @@ export class DespachoPrPage implements OnInit { "activityInstanceName": res.activityInstanceName, } this.fulltask = res; - - - - - this.updateProcessOnDB(res); let thedate = new Date(this.task.CreateDate); @@ -279,7 +274,12 @@ export class DespachoPrPage implements OnInit { await this.processes.CompleteTask(body).toPromise() this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -304,7 +304,12 @@ export class DespachoPrPage implements OnInit { await this.processes.CompleteTask(body).toPromise() this.toastService._successMessage('Processo arquivado') } catch (error) { - this.toastService._badRequest('Processo não arquivado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não arquivado') + } } finally { loader.remove() @@ -326,7 +331,12 @@ export class DespachoPrPage implements OnInit { this.toastService._successMessage('Processo criado') } catch (error) { - this.toastService._badRequest('Processo não criado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não criado') + } } finally { loader.remove() @@ -351,7 +361,12 @@ export class DespachoPrPage implements OnInit { await this.processes.CompleteTask(body).toPromise() this.toastService._successMessage('') } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -376,7 +391,12 @@ export class DespachoPrPage implements OnInit { await this.processes.CompleteTask(body).toPromise() this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -395,9 +415,14 @@ export class DespachoPrPage implements OnInit { this.toastService._successMessage('Processo enviado para pendentes') this.goBack() loader.remove() - }, () => { + }, (error) => { loader.remove() - this.toastService._badRequest('Processo não encontrado') + 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/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index 55252ed45..1e6d73458 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 @@ -10,7 +10,7 @@ Despachos
-
@@ -20,7 +20,7 @@ --> - +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index d954e6d57..038f11b45 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -19,6 +19,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' import { SessionStore } from 'src/app/store/session.service'; +import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; @Component({ selector: 'app-despachos-pr', @@ -53,6 +54,8 @@ export class DespachosPrPage implements OnInit { despachoprstore = DespachosprStore listToPresent = []; + customTaskPipe = new CustomTaskPipe() + constructor( private processes: ProcessesService, private modalController: ModalController, @@ -65,7 +68,6 @@ export class DespachosPrPage implements OnInit { public ThemeService: ThemeService ) { - this.loggeduser = SessionStore.user; this.profile = 'mdgpr'; } @@ -82,7 +84,7 @@ export class DespachosPrPage implements OnInit { this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith(pathname)) { if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -113,8 +115,9 @@ export class DespachosPrPage implements OnInit { async LoadList() { - this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => { - this.skeletonLoader = true + this.skeletonLoader = true + + try { let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); this.despachoList = []; @@ -124,7 +127,7 @@ export class DespachosPrPage implements OnInit { let despachosPr; let despachos = this.sortService.sortArrayByDate(result); - if(this.loggeduser.Profile != "PR") { + if(SessionStore.user.Profile != "PR") { if(SessionStore.user.Profile != 'Consultant') { @@ -132,9 +135,8 @@ export class DespachosPrPage implements OnInit { } else { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); } - - } else if (this.loggeduser.Profile == "PR") { + } else if (SessionStore.user.Profile == "PR") { despachosPr = await despachos.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); } @@ -157,18 +159,24 @@ export class DespachosPrPage implements OnInit { "DocumentsQty": element.totalDocuments, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, + "FolderID": element?.workflowInstanceDataFields?.FolderID, "activityInstanceName": element.activityInstanceName, + "Status": element?.workflowInstanceDataFields?.Status, } this.despachoList.push(task); }); + this.despachoList = this.sortService.sortDate(this.despachoList, 'CreateDate') this.listToPresent = this.despachoList + this.despachoprstore.reset(this.despachoList) - }, (error) => { + } catch(error) { this.getFromDB() - }) + } + + this.skeletonLoader = false } @@ -181,9 +189,9 @@ export class DespachosPrPage implements OnInit { let despachosPr; - if(this.loggeduser.Profile != 'PR') { + if(SessionStore.user.Profile != 'PR') { despachosPr = await process.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); - } else if (this.loggeduser.Profile == 'PR') { + } else if (SessionStore.user.Profile == 'PR') { despachosPr = await process.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); } @@ -215,8 +223,12 @@ export class DespachosPrPage implements OnInit { }) } - doRefresh() { - + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 379cebf6f..9eacb4e33 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -279,7 +279,12 @@ export class DespachoPage implements OnInit { this.toastService._successMessage('Processo criado') this.close(); } catch (error) { - this.toastService._badRequest("Processo não criado") + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest("Processo não criado") + } } finally { loader.remove() @@ -295,7 +300,12 @@ export class DespachoPage implements OnInit { this.toastService._successMessage('Processo descartado') this.close(); } catch (error) { - this.toastService._badRequest("Processo não descartado") + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest("Processo não descartado") + } } finally { loader.remove() @@ -322,7 +332,12 @@ export class DespachoPage implements OnInit { this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -348,7 +363,12 @@ export class DespachoPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 71291bff1..03f7b9bf1 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -33,7 +33,7 @@
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index a6b77c933..6eb81fabd 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -110,7 +110,12 @@ export class DiplomaAssinarPage implements OnInit { }, (error)=>{ try { - this.toastService._badRequest('Processo não encontrado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } this.goBack() } catch (e) { window.history.back(); @@ -176,7 +181,12 @@ export class DiplomaAssinarPage implements OnInit { this.goBack(); }) } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index a07296c19..31ff7ae6e 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -73,19 +73,23 @@ export class DiplomasAssinarPage implements OnInit { }, 1000); } - async LoadList(){ + async LoadList() { this.skeletonLoader = true - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + try { + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); - + let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); + + + this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') + } catch(error) { - this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + } - this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate') this.skeletonLoader = false this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts index 48b8f3b1c..ac7ff6049 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts @@ -57,10 +57,9 @@ export class DiplomasGerarPage implements OnInit { - goToDiploma(serialNumber:any){ - this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']); - - } + goToDiploma(serialNumber:any) { + this.router.navigate(['/home/gabinete-digital/diplomas-gerar',serialNumber,'gabinete-digital']); + } async refreshing() { setTimeout(() => { @@ -77,24 +76,29 @@ export class DiplomasGerarPage implements OnInit { async LoadList(){ - this.skeletonLoader = true - - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = []; - - let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); - - gerarDiploma.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element) - this.diplomasList.push(task); - }); - - this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate'); - this.deplomasStore.resetDiplomaGerar(this.diplomasList); - - - this.skeletonLoader = false - this.showLoader = false; + this.skeletonLoader = true + + try { + let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + this.diplomasList = []; + + let gerarDiploma = diplomas.reverse().filter(data => data.activityInstanceName == "Gerar Diploma" || data.activityInstanceName == "Retificar Diploma"); + + gerarDiploma.forEach(element => { + let task: customTask = this.customTaskPipe.transform(element) + this.diplomasList.push(task); + }); + + this.diplomasList = this.sortService.sortDate(this.diplomasList, 'CreateDate'); + this.deplomasStore.resetDiplomaGerar(this.diplomasList); + + } catch(error) { + + } + + + this.skeletonLoader = false + this.showLoader = false; } diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 04e91a389..32c26f587 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -252,7 +252,12 @@ export class DiplomasGerarPage implements OnInit { this.toastService._successMessage(); this.goBack() } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } @@ -314,7 +319,12 @@ export class DiplomasGerarPage implements OnInit { this.goBack(); }) } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index e1769d53a..1517c080f 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -162,7 +162,12 @@ export class DiplomaPage implements OnInit { } catch (e) { window.history.back(); } - this.toastService._badRequest('Processo não encontrado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } } }); @@ -286,7 +291,12 @@ export class DiplomaPage implements OnInit { }) } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -309,7 +319,12 @@ export class DiplomaPage implements OnInit { await this.processes.CompleteTask(body).toPromise() this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -335,7 +350,12 @@ export class DiplomaPage implements OnInit { await this.processes.CompleteTask(body).toPromise(); this.toastService._successMessage('Processo concluído') } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index 503385732..db7e631ab 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -8,6 +8,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' import { PermissionService } from 'src/app/services/permission.service'; +import { DeplomasStore } from 'src/app/store/deplomas.service'; @Component({ @@ -26,7 +27,8 @@ export class DiplomasPage implements OnInit, OnDestroy { segment: string; skeletonLoader = true - + deplomasStore = DeplomasStore + constructor( private processes: ProcessesService, private router: Router, @@ -100,9 +102,7 @@ export class DiplomasPage implements OnInit, OnDestroy { } async LoadList() { - - this.processes.GetTasksList("Despacho do Presidente da República", false).subscribe(async res => { - + try { this.skeletonLoader = true let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); @@ -118,6 +118,8 @@ export class DiplomasPage implements OnInit, OnDestroy { diplomasList.push(task); }); + + this.deplomasStore.resetDiplomasReview(diplomasValidar) this.diplomasList = this.sortService.sortDate(diplomasList, 'CreateDate'); @@ -132,12 +134,19 @@ export class DiplomasPage implements OnInit, OnDestroy { }); this.diplomasAssinadoList = this.sortService.sortDate(diplomasAssinadoList, 'CreateDate') + this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados); + + + let diplomasAssinar = diplomas.filter(data => data.activityInstanceName == "Assinar Diploma"); + this.deplomasStore.resetDiplomasParaAssinar(diplomasAssinar) + // console.log('DIPLOMAS ASSINADOS', this.diplomasAssinadoList) - }, (error) => { + } catch(error) { + this.skeletonLoader = false this.getFromDb() - }) - + } + } getFromDb() { 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 6e6ea1234..d82b40569 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 @@ -107,7 +107,12 @@ export class ApproveEventModalPage implements OnInit { }) } catch (error) { - this.toastService._badRequest('Evento não aprovado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não aprovado') + } } finally { loader.remove() @@ -134,7 +139,12 @@ export class ApproveEventModalPage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list']); }) } catch (error) { - this.toastService._badRequest('Evento não rejeitado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não rejeitado') + } } finally { loader.remove() @@ -198,7 +208,12 @@ export class ApproveEventModalPage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list']); this.toastService._successMessage() } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } this.router.navigate(['/home/gabinete-digital/event-list']); } finally { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index f5acecbc1..7a6558bdf 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -218,7 +218,12 @@ export class ApproveEventPage implements OnInit { this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -264,7 +269,12 @@ export class ApproveEventPage implements OnInit { this.toastService._successMessage('Pedido enviado'); this.goBack(); } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } @@ -285,7 +295,12 @@ export class ApproveEventPage implements OnInit { await this.toastService._successMessage('Processo rejeitado'); this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -365,7 +380,12 @@ export class ApproveEventPage implements OnInit { this.toastService._successMessage(); this.goBack(); } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest(); + } } finally { loader.remove() } 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 40146a6e5..1b486a7d7 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 @@ -39,10 +39,10 @@
-
+
+ *ngFor="let event of eventoaprovacaostore.listmd" (click)="goToEventToApproveDetail(event.serialNumber)">
@@ -65,10 +65,10 @@ -
+
+ *ngFor="let event of eventoaprovacaostore.listpr" (click)="goToEventToApproveDetail(event.serialNumber)">

{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}

@@ -92,7 +92,7 @@
Lista vazia @@ -101,7 +101,7 @@
Lista vazia 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 df5af192a..1a9c14aa0 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 @@ -36,6 +36,7 @@ export class EventListPage implements OnInit { skeletonLoader = true eventaprovacaostore = EventoAprovacaoStore; + eventoaprovacaostore = EventoAprovacaoStore; constructor( private processes: ProcessesService, @@ -147,7 +148,7 @@ export class EventListPage implements OnInit { } async LoadToApproveEvents() { - this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => { + // this.processes.GetTasksList('Agenda Oficial MDGPR', false).subscribe(async res => { this.showLoader = true; this.skeletonLoader = true @@ -156,11 +157,10 @@ export class EventListPage implements OnInit { let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); + this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate') this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList) - // this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) { - // return item.activityInstanceName != 'Editar Evento' - // }) + this.eventoaprovacaostore.resetmd(this.eventsMDGPRList); this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => { @@ -171,11 +171,10 @@ export class EventListPage implements OnInit { let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); this.eventsPRList = prEventsOficial.concat(prEventsPessoal); + this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate') this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList) - // this.eventsPRList = (this.eventsPRList || []).filter(function(item) { - // return item.activityInstanceName != 'Editar Evento' - // }) + this.eventoaprovacaostore.resetpr(this.eventsPRList); this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { @@ -185,9 +184,9 @@ export class EventListPage implements OnInit { this.showLoader = false; this.skeletonLoader = false - }, (error) => { - this.getEventToAproveFromDB(); - }) + // }, (error) => { + // this.getEventToAproveFromDB(); + // }) } diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 174cfcd3e..f4c86aaa9 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -150,12 +150,12 @@ export class BookMeetingModalPage implements OnInit { this.postData.Category = 'Reunião' - if(!this.CalendarName) { + if(!this.CalendarOwnerName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { - this.CalendarName = 'Meu calendario'; + this.CalendarOwnerName = 'Meu calendario'; console.log(this.eventService.calendarNamesAry) } else { - this.CalendarName = this.eventService.calendarNamesAry[0] + this.CalendarOwnerName = this.eventService.calendarNamesAry[0] } } @@ -176,6 +176,7 @@ export class BookMeetingModalPage implements OnInit { this.getRecurrenceTypes(); } + getRecurrenceTypes() { this.calendarService.getRecurrenceTypes().subscribe(res=>{ @@ -208,8 +209,8 @@ export class BookMeetingModalPage implements OnInit { } setDefaultTime() { - this.postData.StartDate = new Date() - this.postData.EndDate = (new Date(new Date().getTime() + 15 * 60000)) + this.postData.StartDate = this.roundTimeQuarterHour(); + this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000)) } getAttachments() { @@ -318,7 +319,12 @@ export class BookMeetingModalPage implements OnInit { this.toastService._successMessage('Reunião criada'); } catch (error) { - this.toastService._badRequest('Reunião não criada') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Reunião não criada') + } } finally { loader.remove() @@ -338,7 +344,11 @@ export class BookMeetingModalPage implements OnInit { this.toastService._successMessage('Reunião criada'); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } @@ -351,6 +361,7 @@ export class BookMeetingModalPage implements OnInit { + selectedCalendarId () { if (this.calendarService.calendarNamesType[this.CalendarOwnerName]?.['Oficial'] && this.postData.CalendarName == 'Oficial') { @@ -501,8 +512,8 @@ export class BookMeetingModalPage implements OnInit { } - roundTimeQuarterHour() { - var timeToReturn = new Date(); + roundTimeQuarterHour(timeToReturn?) { + var timeToReturn = timeToReturn || new Date(); var minutes = timeToReturn.getMinutes(); var hours = timeToReturn.getHours(); @@ -515,14 +526,14 @@ export class BookMeetingModalPage implements OnInit { } timeToReturn.setHours(h); timeToReturn.setMinutes(m); - }else{ - if(minutes > m){ + } else { + if(minutes > m) { m = m + 15; timeToReturn.setHours(h); timeToReturn.setMinutes(m); - }else { + } else { timeToReturn.setHours(h); timeToReturn.setMinutes(m); } @@ -534,7 +545,7 @@ export class BookMeetingModalPage implements OnInit { return timeToReturn; } - setStartDate(){ + setStartDate() { this.postData.StartDate = this.roundTimeQuarterHour(); } diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 03a012339..06b039b26 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -109,7 +109,7 @@ appearance="fill" class="width-100 d-block" appearance="none"> - + {{type.Description}} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index bf2445956..a404030e8 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -320,7 +320,12 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(action_despacho); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -354,7 +359,12 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(action_parecer); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -385,7 +395,12 @@ export class ExpedientTaskModalPage implements OnInit { this.toastService._successMessage('Processo efetuado'); this.modalController.dismiss(action_deferimento); } catch (error) { - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } @@ -423,8 +438,12 @@ export class ExpedientTaskModalPage implements OnInit { await this.toastService._successMessage('Processo efetuado'); this.modalController.dismiss(action_despacho_pr); } catch (error) { - - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + await this.toastService._badRequest('Processo não efetuado') + } } finally { //loader.remove() } @@ -461,8 +480,12 @@ export class ExpedientTaskModalPage implements OnInit { await this.toastService._successMessage('Pedido enviado'); this.modalController.dismiss(action_parecer_pr); } catch (error) { - - await this.toastService._badRequest('Processo não efetuado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + await this.toastService._badRequest('Processo não efetuado') + } } finally { loader.remove() } 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 7b14d99c9..fb1087d1b 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 @@ -92,8 +92,8 @@
-
Enviar para o PR
- +
Enviar para o PR
+
Solicitar revisão
Outras opções
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 7793b028d..23a1d6e89 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -90,6 +90,8 @@ export class ExpedienteDetailPage implements OnInit { private userAuth: AuthService, ) { this.loggeduser = SessionStore.user + console.log('SessionStore', SessionStore) + this.activatedRoute.paramMap.subscribe(params => { if (params["params"].SerialNumber) { this.serialNumber = params["params"].SerialNumber; @@ -242,7 +244,12 @@ export class ExpedienteDetailPage implements OnInit { this.close(); this.toastService._successMessage('Processo aprovado') } catch (error) { - this.toastService._badRequest('Processo não aprovado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não aprovado') + } } finally { loader.remove() } @@ -267,7 +274,12 @@ export class ExpedienteDetailPage implements OnInit { this.close(); this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -334,7 +346,12 @@ export class ExpedienteDetailPage implements OnInit { }, (error) => { loader.remove() - this.toastService._badRequest('Processo não enviado para pendentes') + 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') + } }); } @@ -391,7 +408,12 @@ export class ExpedienteDetailPage implements OnInit { } catch (e) { window.history.back(); } - this.toastService._badRequest('Processo não encontrado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } } }); @@ -482,8 +504,13 @@ export class ExpedienteDetailPage implements OnInit { loader.remove() await this.attachmentsService.AddAttachment(body).toPromise() this.toastService._successMessage() - } catch(e) { + } catch(error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } }); } @@ -519,7 +546,12 @@ export class ExpedienteDetailPage implements OnInit { await this.processes.CompleteTask(body).toPromise(); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -553,7 +585,12 @@ export class ExpedienteDetailPage implements OnInit { this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -572,7 +609,12 @@ export class ExpedienteDetailPage implements OnInit { //this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -586,7 +628,12 @@ export class ExpedienteDetailPage implements OnInit { this.toastService._successMessage(); this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index f989f787d..a583eb11f 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -36,7 +36,7 @@
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 2e04cc42b..bc27d8bea 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -9,7 +9,7 @@ import { Platform } from '@ionic/angular'; import { BackgroundService } from '../../../services/background.service'; import { ThemeService } from 'src/app/services/theme.service' import { SortService } from 'src/app/services/functions/sort.service'; -import {Storage } from '@ionic/storage'; +import { Storage } from '@ionic/storage'; @Component({ selector: 'app-expediente', @@ -73,7 +73,7 @@ export class ExpedientePage implements OnInit { const result = res this.taskslist = new Array(); - let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "Active"); + let ress = result.filter((data: any) => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); ress.forEach((element: any) => { @@ -86,7 +86,8 @@ export class ExpedientePage implements OnInit { }) this.listToPresent = this.sortService.sortDate(this.taskslist, 'taskStartDate') - + this.expedientegbstore.reset(this.listToPresent); + this.skeletonLoader = false; }, (error) => { this.getEventsFromLocalDb(); diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 00f1bb75b..873801858 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -143,7 +143,12 @@ export class ExpedientePrPage implements OnInit { }, (error)=>{ loader.remove() - this.toastService._badRequest('Processo não enviado para pendentes') + 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') + } }); } @@ -309,7 +314,12 @@ export class ExpedientePrPage implements OnInit { this.close(); this.toastService._successMessage('Processo aprovado') } catch(error) { - this.toastService._badRequest('Processo não aprovado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não aprovado') + } } finally { loader.remove() } @@ -334,7 +344,12 @@ export class ExpedientePrPage implements OnInit { this.close(); this.toastService._successMessage() } catch(error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -455,7 +470,12 @@ export class ExpedientePrPage implements OnInit { this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -492,7 +512,12 @@ export class ExpedientePrPage implements OnInit { this.toastService._successMessage(); this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 0d873db35..97c563faf 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -75,14 +75,12 @@ export class ExpedientesPrPage implements OnInit { this.skeletonLoader = false this.showLoader =false this.taskslist = new Array(); - let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); - res.forEach(element => { - let task = this.expedienteTaskPipe.transform(element) - this.taskslist.push(task); - }); - + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); + + this.taskslist = res.map((element) => this.expedienteTaskPipe.transform(element)); this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') + this.expedienteGdStore.reset(this.taskslist); this.skeletonLoader = false }) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 472ba6643..ac5805b8e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -147,14 +147,14 @@

Todas as tarefas

-

{{ getAllProcessCount }} Documentos

+

{{ getAllProcessCount }} Documentos

Eventos para Aprovação

-

{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos

+

{{eventoaprovacaostore.countMd + eventoaprovacaostore.countPr}} Documentos

@@ -166,7 +166,7 @@

Expediente

-

{{expedientegbstore.count}} Documentos

+

{{expedientegbstore.count}} Documentos

@@ -179,7 +179,7 @@

Pendentes

Meus Pendentes

-

{{pendentesstore.count}} Documentos

+

{{pendentesstore.count}} Documentos

@@ -191,7 +191,7 @@

Despachos

-

{{despachoStore.count}} Documentos

+

{{despachoStore.count}} Documentos

@@ -204,7 +204,7 @@

Pedidos de Parecer

Pedidos de Parecer solicitados por mim

-

{{pedidosstore.countparecer}} Documentos

+

{{pedidosstore.countparecer}} Documentos

@@ -217,7 +217,7 @@

Pedidos de Deferimento

-

{{pedidosstore.countdeferimento}} Documentos

+

{{pedidosstore.countdeferimento}} Documentos

@@ -231,11 +231,12 @@

Despacho do {{ environment.despachoLabel }}

Despachos criados por mim

-

{{ despachoprstore.count }} Documentos

+

{{ despachoprstore.count }} Documentos

- + +
@@ -244,7 +245,7 @@

Diplomas por Validar

-

{{ deplomasStore.deplomasReviewCount }} Documentos

+

{{ deplomasStore.deplomasReviewCount }} Documentos

@@ -255,7 +256,7 @@

Diplomas assinados PR

Diplomas

-

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

+

{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos

@@ -268,7 +269,7 @@

Diplomas por elaborar

-

{{ deplomasStore.DiplomaGerarList.length }} Documentos

+

{{ deplomasStore.DiplomaGerarList.length }} Documentos

@@ -281,8 +282,21 @@

Diplomas para Assinar

-

{{ deplomasStore.diplomasParaAssinartCount }} Documentos

+

{{ deplomasStore.diplomasParaAssinartCount }} Documentos

+ + +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 72e782a4b..ab0b6f288 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -165,6 +165,8 @@ export class GabineteDigitalPage implements OnInit { this.segmentVista = "boxview" } + this.LoadCounts(); + const pathname = window.location.pathname this.router.events.forEach((event) => { if (event instanceof NavigationEnd && event.url == pathname) { @@ -183,6 +185,7 @@ export class GabineteDigitalPage implements OnInit { } }); + this.hideRefreshButton(); // this.waitForDomService.selector({ @@ -193,84 +196,87 @@ export class GabineteDigitalPage implements OnInit { // } // }) - this.backgroundservice.registerBackService('Online', () => { - // this.loadAllProcesses(); - }); + setTimeout(() => { + + this.backgroundservice.registerBackService('Online', () => { + // this.loadAllProcesses(); + }); + // this.NotificationsService.registerCallback({ + // type:'despachos', + // funx:() => { + // // this.loadCount(); + // console.log('refresh with notification') + // } + // }) - // this.NotificationsService.registerCallback({ - // type:'despachos', - // funx:() => { - // // this.loadCount(); - // console.log('refresh with notification') - // } - // }) + // this.NotificationsService.registerCallback({ + // type:'*', + // funx:() => { + // // this.LoadCounts(); + // console.log('refresh with notification *') + // } + // }) - // this.NotificationsService.registerCallback({ - // type:'*', - // funx:() => { - // // this.LoadCounts(); - // console.log('refresh with notification *') - // } - // }) - - // this.NotificationsService.registerCallback({ - // type:'despachos-pr', - // funx:() => { - // // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type:'expediente', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type:'gabinete-digital', - // funx:() => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type:'parecer', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type: 'deferimento', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type: 'diplomas-assinar', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type: 'diplomas', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) - // this.NotificationsService.registerCallback({ - // type: 'expedientes-pr', - // funx: () => { - // this.LoadCounts(); - // console.log('refresh with notification') - // } - // }) + // this.NotificationsService.registerCallback({ + // type:'despachos-pr', + // funx:() => { + // // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'expediente', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'gabinete-digital', + // funx:() => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type:'parecer', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'deferimento', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'diplomas-assinar', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'diplomas', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + // this.NotificationsService.registerCallback({ + // type: 'expedientes-pr', + // funx: () => { + // this.LoadCounts(); + // console.log('refresh with notification') + // } + // }) + }, 100); + } async loadAllProcesses() { @@ -614,7 +620,8 @@ export class GabineteDigitalPage implements OnInit { loadNum = 0 async LoadCounts() { - + this.updateAllProcess() + let expedientes; this.showLoader = true @@ -629,7 +636,7 @@ export class GabineteDigitalPage implements OnInit { this.loadNum++; - expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "Active") + expedientes = (expedientes || [] ).filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active") expedientes = expedientes.filter((item) => { return item.activityInstanceName != 'Retificar Expediente' 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 bc0d99233..b809f3b70 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -127,7 +127,7 @@
- +
@@ -136,7 +136,7 @@
- +
@@ -162,7 +162,7 @@ - +
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 c54d9bbee..1cc83898c 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -162,7 +162,8 @@ export class PedidoPage implements OnInit { let thedate = new Date(res.taskStartDate); this.customDate = this.days[thedate.getDay()] + ", " + thedate.getDate() + " de " + (this.months[thedate.getMonth()]); - this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe(users => { + this.processes.GetTaskParticipants(res.workflowInstanceDataFields.FolderID).subscribe((users = []) => { + this.updateProcessInterveners(users) this.intervenientes = users.filter(user => { return user.Type == 'I'; @@ -182,7 +183,12 @@ export class PedidoPage implements OnInit { } catch (e) { window.history.back(); } - this.toastService._badRequest('Processo não encontrado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } } }); @@ -373,7 +379,12 @@ export class PedidoPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -393,7 +404,12 @@ export class PedidoPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -418,7 +434,12 @@ export class PedidoPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -430,9 +451,14 @@ export class PedidoPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res => { this.goBack(); loader.remove() - }, () => { + }, (error) => { loader.remove() - this.toastService._badRequest('Processo não encontrado') + 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/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index ebcd60079..4fbdd39be 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -38,13 +38,13 @@
-
+
@@ -78,11 +78,11 @@
-
+
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html index 63bd7008b..c5d7b43d7 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html @@ -27,7 +27,7 @@ diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 3a5315aa6..4df108867 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -106,6 +106,7 @@ export class PendentesPage implements OnInit { pendentesList = removeDuplicate(pendentesList) pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate'); + this.pendentesstore.reset(pendentesList); this.listToPresent = pendentesList; this.storage.set('pendente-list',pendentesList).then(() => { diff --git a/src/app/pages/publications/edit-action/edit-action.page.ts b/src/app/pages/publications/edit-action/edit-action.page.ts index 714f77c3c..6c8a08d17 100644 --- a/src/app/pages/publications/edit-action/edit-action.page.ts +++ b/src/app/pages/publications/edit-action/edit-action.page.ts @@ -119,7 +119,12 @@ export class EditActionPage implements OnInit { this.updateDesktopComponent.emit(); this.toastService._successMessage('Acção presidencial atualizada') } catch (error) { - this.toastService._badRequest('Não foi possivel atualizar a acção presidencial') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Não foi possivel atualizar a acção presidencial') + } } finally { loader.remove() } diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index a8ffc6082..ea982cf74 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -255,8 +255,13 @@ export class PublicationsPage implements OnInit { try { await this.publications.DeletePresidentialAction(id).toPromise(); this.toastService._successMessage() - } catch (e) { - this.toastService._badRequest() + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 2d01c0d87..ef938f3a9 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -1,13 +1,13 @@ import { Injectable } from '@angular/core'; import { Message } from 'src/app/models/chatMethod'; import { SessionStore } from 'src/app/store/session.service'; -import { capitalizeTxt } from 'src/plugin/text' -import { NfService } from 'src/app/services/chat/nf.service' +import { capitalizeTxt } from 'src/plugin/text'; +import { NfService } from 'src/app/services/chat/nf.service'; import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'; import { showDateDuration } from 'src/plugin/showDateDuration'; -import { ChatMethodsService } from './chat-methods.service' -import { MessageModel } from '../../models/beast-orm' -import { AESEncrypt } from '../aesencrypt.service' +import { ChatMethodsService } from './chat-methods.service'; +import { MessageModel } from '../../models/beast-orm'; +import { AESEncrypt } from '../aesencrypt.service'; import { HttpEventType } from '@angular/common/http'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service'; @@ -182,7 +182,6 @@ export class MessageService { async send(): Promise { if(this.messageSend) { - console.log('sended') return new Promise((resolve, reject) => { resolve('solve') }) diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index 4681e0123..695670bd1 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -110,7 +110,7 @@ export class EventsService { if (SessionStore.user.Profile == 'MDGPR') { for (let calendar of SessionStore.user.OwnerCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if (calendar.CalendarName == 'Oficial') { @@ -133,7 +133,7 @@ export class EventsService { } for (let sharedCalendar of SessionStore.user.SharedCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if (sharedCalendar.CalendarName == 'Oficial') { @@ -158,7 +158,7 @@ export class EventsService { else if (SessionStore.user.Profile == 'PR') { for (let calendar of SessionStore.user.OwnerCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if (calendar.CalendarName == 'Oficial') { this.hasOwnOficial = true @@ -181,7 +181,7 @@ export class EventsService { } for (let calendar of SessionStore.user.OwnerCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if(!this.usersCalendarIds.includes(calendar.OwnerUserId)) { this.usersCalendarIds.push(calendar.OwnerUserId) } @@ -213,7 +213,7 @@ export class EventsService { } for (let sharedCalendar of SessionStore.user.SharedCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if(!this.usersCalendarIds.includes(sharedCalendar.OwnerUserId)) { this.usersCalendarIds.push(sharedCalendar.OwnerUserId) @@ -246,7 +246,7 @@ export class EventsService { for (let sharedCalendar of SessionStore.user.SharedCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true if(sharedCalendar?.OwnerUserId) { this.GetCalendarName(sharedCalendar.OwnerUserId).subscribe((e)=> { this.calendarNames[sharedCalendar.CalendarId] = e.FullName @@ -266,7 +266,7 @@ export class EventsService { } for (let sharedCalendar of SessionStore.user.OwnerCalendars) { - this.hasAnyCalendar = false + this.hasAnyCalendar = true this.calendarNames[sharedCalendar.CalendarId] = 'Meu calendario' diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 644494403..134d22127 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -12,6 +12,7 @@ import { EventTrigger } from '../services/eventTrigger.service'; import { SessionStore } from '../store/session.service'; import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications'; import { notificationObject } from '../models/notifications'; +import { v4 as uuidv4 } from 'uuid' @Injectable({ providedIn: 'root' @@ -38,43 +39,44 @@ export class NotificationsService { private platform: Platform, private router: Router, private zone: NgZone, - private eventtrigger: EventTrigger,) { + private eventtrigger: EventTrigger,) {} + + registerCallback({type, funx, id = uuidv4()} : { + type: notificationObject, + funx: Function + id?: string + }) { + this.callbacks[id] = { funx, id, type} + return id; } + deleteCallback(id) { + delete this.callbacks[id] + } - // registerCallback({type, funx, id = uuidv4()} : { - // type: notificationObject, - // funx: Function - // id?: string - // }) { - // this.callbacks[id] = { funx, id, type} - // return id; - // } + private async runNotificationCallback(notification) { + for (const [key, value] of Object.entries(this.callbacks)) { + if(value.type == notification.data.Object) { - // private async runNotificationCallback(notification) { + const dontRepeat = await value.funx(notification) - // for (const [key, value] of Object.entries(this.callbacks)) { - // if(value.type == notification.data.Object) { + if(dontRepeat) { + delete this.callbacks[key] + } - // const dontRepeat = await value.funx(notification) + } else if (value.type == '*') { + const dontRepeat = await value.funx(notification) - // if(dontRepeat) { - // delete this.callbacks[key] - // } + if(dontRepeat) { + delete this.callbacks[key] + } + } - // } else if (value.type == '*') { - // const dontRepeat = await value.funx(notification) + } - // if(dontRepeat) { - // delete this.callbacks[key] - // } - // } - - // } - - // } + } getTokenByUserIdAndId(user, userID) { // const geturl = environment.apiURL + 'notifications/user/' + userID; diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts index a4f4e1be3..cb03b0a69 100644 --- a/src/app/services/rules/event.service.ts +++ b/src/app/services/rules/event.service.ts @@ -21,9 +21,14 @@ export class EventService { if(this.p.userRole(['PR'])) { + alert('pr') return this.eventService.postEventPr(body, calendar) - } else { + } else if(this.p.userRole(['MDGPR'])) { + alert('md') return this.eventService.postEventMd(body, calendar) + } else { + alert('other') + return this.eventService.postEventGeneric(body, calendar, body.CalendarId) } } diff --git a/src/app/services/server-connection.service.spec.ts b/src/app/services/server-connection.service.spec.ts new file mode 100644 index 000000000..5c6082292 --- /dev/null +++ b/src/app/services/server-connection.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { ServerConnectionService } from './server-connection.service'; + +describe('ServerConnectionService', () => { + let service: ServerConnectionService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(ServerConnectionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/services/server-connection.service.ts b/src/app/services/server-connection.service.ts new file mode 100644 index 000000000..a54c3d54e --- /dev/null +++ b/src/app/services/server-connection.service.ts @@ -0,0 +1,20 @@ +import { Injectable } from '@angular/core'; +import { environment } from 'src/environments/environment'; +import { HttpClient } from '@angular/common/http'; + +@Injectable({ + providedIn: 'root' +}) +export class ServerConnectionService { + + constructor(private http: HttpClient,) { } + + async BaseAPI(): Promise { + try { + await this.http.get(environment.apiURL) + return true + } catch { + return false + } + } +} 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 bc3154af7..376173f5d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -192,7 +192,12 @@ export class ApproveEventPage implements OnInit { this.toastService._successMessage('Evento enviado para revisão'); this.close(); } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } 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 9aa8aff42..3c3e2666d 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 @@ -415,7 +415,12 @@ export class EditEventToApprovePage implements OnInit { this.toastService._successMessage(); this.goToApproveEventList(); } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } 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 788f91137..953e2c271 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -59,7 +59,7 @@ export class EventListPage implements OnInit { ngOnChanges() { this.LoadToApproveEvents(); setTimeout(() => { - this.LoadToApproveEvents(); + this.LoadToApproveEventsNoLoader(); }, 3000) } @@ -107,6 +107,43 @@ export class EventListPage implements OnInit { } + } + + async LoadToApproveEventsNoLoader() { + + try { + if(this.segment == 'MDGPR') { + let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); + let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); + + let allEvents = mdEventsOficial.concat(mdEventsPessoal); + if(allEvents.length > 0) { + this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse(); + } + this.showLoader = false; + } + else if(this.segment == 'PR') { + let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); + let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise(); + let allEvents = prEventsOficial.concat(prEventsPessoal); + + if(allEvents.length > 0) { + this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse(); + } + this.showLoader = false; + } else { + let genericEvents = await this.processes.GetTasksList('Agendar Evento', false).toPromise(); + if(genericEvents.length > 0) { + this.eventsGenericList = this.sortService.sortArrayByDate(genericEvents).reverse(); + } + this.showLoader = false; + } + + } catch(erro) { + this.showLoader = false; + } + + } async openApproveModal(eventSerialNumber, data) { diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 3fd33a44e..9d8b460ea 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -25,6 +25,7 @@ import { FormGroup, Validators } from '@angular/forms'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; import { ThemeService } from 'src/app/services/theme.service' import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service'; +import { ServerConnectionService } from 'src/app/services/server-connection.service'; import { SessionStore } from 'src/app/store/session.service'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -129,6 +130,7 @@ export class NewEventPage implements OnInit { private dateAdapter: DateAdapter, public ThemeService: ThemeService, private chatMethodService: ChatMethodsService, + private ServerConnectionService: ServerConnectionService // private translate: TranslateService ) { this.dateAdapter.setLocale('pt'); @@ -529,9 +531,15 @@ export class NewEventPage implements OnInit { }, error => { + console.log(error, 'error') loader.remove() this.showLoader = false - this.toastService._badRequest('Evento não criado') + + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Evento não criado') + } }); } @@ -585,10 +593,19 @@ export class NewEventPage implements OnInit { } this.toastService._successMessage('Evento criado') - },()=>{ + },(error) => { + + //const connectionToServer = this.ServerConnectionService.BaseAPI() + + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Evento não criado') + } + loader.remove() this.showLoader = false - this.toastService._badRequest('Evento não criado') + }); } else { @@ -641,10 +658,15 @@ export class NewEventPage implements OnInit { this.chatMethodService.sendMessage(this.roomId,data); } this.toastService._successMessage('Evento criado') - },()=>{ + },(error)=>{ + loader.remove() this.showLoader = false - this.toastService._badRequest('Evento não criado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Evento não criado') + } }); } diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 137f98ba9..9aecb93c1 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -82,7 +82,7 @@
Detalhes
-
{{ loadedEvent.Body.Text }}
+
{{ loadedEvent.Body.Text }} 
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index ae151e20b..d0af86e44 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -105,9 +105,6 @@ export class ViewEventPage implements OnInit { if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { this.eventsService.getEvent(this.eventId).subscribe(res => { - const div = document.createElement("div") - div.innerHTML = res.Body.Text - res.Body.Text = div.innerText this.loadedEvent = res; this.today = new Date(res.StartDate); diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html index 9d63acd23..fb5a22043 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html @@ -2,16 +2,16 @@
Todas as tarefas
-
+
- + { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.updateAllProcess(); }, 1000); diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index 245c01838..a1e4295c6 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,7 +6,7 @@ Despachos
-
@@ -14,7 +14,7 @@ - + { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); //event.target.complete(); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 22ef14217..6d344aa54 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -11,7 +11,7 @@ - + { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital?despachos=true')) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -45,8 +45,14 @@ export class DespachosPage implements OnInit { await this.despachoRule.getList({updateStore: true}) this.skeletonLoader = false; } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 325a11c39..ae3db3f54 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -3,14 +3,14 @@
Diplomas para assinar
-
- + { if (event instanceof NavigationStart && '/home/gabinete-digital?diplomasassinar=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -49,7 +49,13 @@ export class DiplomasAssinarPage implements OnInit { this.router.navigate(['/home/gabinete-digital/diplomas-assinar',serialNumber,'gabinete-digital']); } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html index c14e50284..9f73c76ea 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html +++ b/src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html @@ -3,14 +3,14 @@
Diplomas por gerar
-
- + { + event.target.complete(); + }, 2000); + } + setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html index 2da1413da..fd37380d0 100644 --- a/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html @@ -3,14 +3,14 @@
Expediente
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -94,8 +94,12 @@ export class ExpedientsPage implements OnInit { }) } - doRefresh() { - + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000) diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 1cda84e29..1c1511a4f 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -3,7 +3,7 @@
Diplomas
-
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index f0520eec2..fd454c526 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -123,8 +123,14 @@ export class DiplomasPage implements OnInit { this.LoadList(); }, 1000); } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { this.LoadList(); } 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 d023e5b6a..745cddf26 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 @@ -312,7 +312,12 @@ export class EditEventToApproveComponent implements OnInit { this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ this.toastService._successMessage('Evento editado'); }, error =>{ - this.toastService._badRequest('Evento não editado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Evento não editado'); + } }) @@ -322,14 +327,24 @@ export class EditEventToApproveComponent implements OnInit { this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ this.toastService._successMessage(); }, error =>{ - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ this.toastService._successMessage() }, error =>{ - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } }) } 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 045fab5a4..dc8b90026 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 @@ -3,7 +3,7 @@
-
@@ -20,20 +20,20 @@
- + -
+
-
+
- +
@@ -52,9 +52,9 @@
-
+
-
+
@@ -65,12 +65,12 @@
-
+
-
+
@@ -90,10 +90,10 @@
-
+
+ *ngIf="eventaprovacaostore.listpr.length < 1"> Lista vazia
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 83ec4a90d..e832ab727 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 @@ -51,7 +51,7 @@ export class EventsToApprovePage implements OnInit { '/home/gabinete-digital?eventos=true'.startsWith(event.url)) { if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadToApproveEvents() } else { this.LoadToApproveEvents() } @@ -81,7 +81,7 @@ export class EventsToApprovePage implements OnInit { }) - //this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate')); + this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate')); } else if(this.segment == 'PR') { let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise(); @@ -97,7 +97,7 @@ export class EventsToApprovePage implements OnInit { this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => { }) - //this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate')); + this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate')); } this.showLoader = false; } @@ -124,9 +124,13 @@ export class EventsToApprovePage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list/approve-event',event.serialNumber, 'gabinete-digital']) } + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { - setTimeout(()=>{ this.LoadToApproveEvents(); }, 1000) diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 634e32cd5..dcdaac781 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -66,11 +66,8 @@ export class ExpedientesPrPage implements OnInit { this.processes.GetTaskListExpediente(false).subscribe(result => { this.taskslist = []; - let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); - res.forEach(element => { - let task = this.expedienteTaskPipe.transform(element); - this.taskslist.push(task); - }); + let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); + this.taskslist = res.map((element) => this.expedienteTaskPipe.transform(element)); this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 45472bc3c..0a7053cc4 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -3,14 +3,14 @@
Expediente
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -65,17 +65,16 @@ export class ExpedientsPage implements OnInit { this.taskslist = []; this.skeletonLoader = false - let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active"); - res.forEach(element => { - let task = this.expedienteTaskPipe.transform(element) - this.taskslist.push(task); + let res = result.filter(data => data.workflowInstanceDataFields.Status == "" || data.workflowInstanceDataFields.Status == "Active"); - }); + this.taskslist = res.map((e) => this.expedienteTaskPipe.transform(e)) this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') this.addProcessTODb(this.taskslist); + this.taskslist = this.taskslist.filter(function(item) { return item.activityInstanceName != 'Retificar Expediente' - }) + }) + this.expedientegbstore.reset(this.taskslist); }, (error) => { this.getEventsFromLocalDb(); @@ -94,16 +93,21 @@ export class ExpedientsPage implements OnInit { }) } - doRefresh() { - + doRefresh(event) { + if (event) { setTimeout(() => { - this.LoadList(); - }, 1000) - + event.target.complete(); + }, 2000); } - goToExpediente(serialNumber: any) { - this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); - } + setTimeout(() => { + this.LoadList(); + }, 1000) + + } + + goToExpediente(serialNumber: any) { + this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']); + } } diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index 81adfc396..e2a576ce2 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -3,7 +3,7 @@
Pedidos
-
@@ -20,7 +20,7 @@ - + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -121,7 +121,12 @@ export class PedidosPage implements OnInit { this.skeletonLoader = false } - doRefresh() { + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } setTimeout(() => { this.LoadList(); }, 1000); diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html index 0a3c33f7c..f1129d7fe 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html @@ -3,14 +3,14 @@
Pendentes
-
- + = 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { - this.doRefresh() + this.LoadList() } else { this.LoadList() } @@ -86,8 +86,14 @@ export class PendentesPage implements OnInit { this.listToPresent =pendentes }) } + + doRefresh(event) { + if (event) { + setTimeout(() => { + event.target.complete(); + }, 2000); + } - doRefresh() { setTimeout(()=>{ this.LoadList(); }, 1000) diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 7ae04b5c7..fc2255adf 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -107,7 +107,12 @@ export class DeplomaOptionsPage implements OnInit { this.close(); this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -154,7 +159,12 @@ export class DeplomaOptionsPage implements OnInit { this.close(); this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -180,7 +190,11 @@ export class DeplomaOptionsPage implements OnInit { this.close(); this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } @@ -205,7 +219,12 @@ export class DeplomaOptionsPage implements OnInit { await this.processes.CompleteTask(body).toPromise(); this.toastService._successMessage('Processo concluído') } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html index 5a068d440..a53022fc5 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.html +++ b/src/app/shared/popover/despachos-options/despachos-options.page.html @@ -19,7 +19,7 @@
- +
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 677f6a6f7..644e62b35 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -78,9 +78,14 @@ export class DespachosOptionsPage implements OnInit { loader.remove() this.close(); - },()=>{ + },(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 encontrado') + } }); } @@ -173,7 +178,12 @@ export class DespachosOptionsPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -254,7 +264,12 @@ export class DespachosOptionsPage implements OnInit { this.toastService._successMessage('Processo arquivado') this.close(); } catch (error) { - this.toastService._badRequest('Processo não arquivado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não arquivado') + } } finally { loader.remove() } @@ -281,7 +296,12 @@ export class DespachosOptionsPage implements OnInit { this.close(); this.toastService._successMessage() } catch(error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -308,7 +328,12 @@ export class DespachosOptionsPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 17f217a5c..e81ac580f 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -104,10 +104,14 @@ export class DespachosPrOptionsPage implements OnInit { this.toastService._successMessage() this.popoverController.dismiss('close') loader.remove() - },()=>{ + },(error)=>{ loader.remove() - - this.toastService._badRequest('Processo não encontrado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } }); } @@ -206,7 +210,12 @@ export class DespachosPrOptionsPage implements OnInit { this.toastService._successMessage() this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -290,7 +299,12 @@ export class DespachosPrOptionsPage implements OnInit { this.toastService._successMessage('') this.close(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() 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 4a30c6333..bd265b13c 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 @@ -92,7 +92,12 @@ export class DiplomasGerarOptionsPage implements OnInit { this.toastService._successMessage(); this.goBack() } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html index e5920fe6c..f764fd430 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html @@ -3,7 +3,7 @@
- +
diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss index 5ece2929a..e69265ed8 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss @@ -30,28 +30,19 @@ margin-bottom: 5px !important; margin-top: 5px !important; } -@media only screen and (max-width: 800px) { - .btn-ok, .btn-cancel, .btn-delete{ - width: 100% !important; - } + +.arrow-right{ + display: flex; + justify-content: flex-end; } -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ +.btn-cancel{ + width: 100% !important; + margin-bottom: 10px !important; +} +.btn-delete, .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 0516d8a92..d66bf5833 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -142,7 +142,12 @@ export class OptsExpedientePrPage implements OnInit { this.close(); this.toastService._successMessage() } catch(error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -180,7 +185,12 @@ export class OptsExpedientePrPage implements OnInit { this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -199,7 +209,12 @@ export class OptsExpedientePrPage implements OnInit { // this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado'); + } } finally { loader.remove() } @@ -214,7 +229,12 @@ export class OptsExpedientePrPage implements OnInit { this.toastService._successMessage(); this.goBack(); } catch (error) { - this.toastService._badRequest(); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest(); + } } finally { loader.remove() } @@ -242,7 +262,12 @@ export class OptsExpedientePrPage implements OnInit { this.close(); this.toastService._successMessage() } catch(error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -255,9 +280,13 @@ export class OptsExpedientePrPage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ loader.remove() this.close(); - },()=>{ - - this.toastService._badRequest('Processo não encontrado') + }, (error) => { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } loader.remove() }); } @@ -295,7 +324,11 @@ export class OptsExpedientePrPage implements OnInit { // this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado'); + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Processo não descartado'); + } } finally { loader.remove() } 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 5ec3d42da..71c28949f 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html @@ -8,15 +8,15 @@
- - + + - + 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 6d271bde9..03b4c0e3e 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -17,7 +17,6 @@ import { PermissionService } from 'src/app/services/permission.service'; import { ThemeService } from 'src/app/services/theme.service' import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page'; import { RouteService } from 'src/app/services/route.service'; -import { LoginUserRespose } from 'src/app/models/user.model'; import { SessionStore } from 'src/app/store/session.service'; @Component({ @@ -36,7 +35,7 @@ export class OptsExpedientePage implements OnInit { searchDocumentPipe = new SearchDocumentPipe() documents:SearchList[] = []; - loggeduser: LoginUserRespose; + SessionStore = SessionStore; constructor( private popoverController: PopoverController, @@ -55,7 +54,7 @@ export class OptsExpedientePage implements OnInit { } ngOnInit() { - + console.log('SessionStore', SessionStore) } async openNewGroupPage(){ @@ -171,8 +170,13 @@ export class OptsExpedientePage implements OnInit { this.attachmentsService.AddAttachment(body).subscribe((res)=> { this.toastService._successMessage() - },()=> { - this.toastService._badRequest() + }, (error) => { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } },()=> { loader.remove() }); @@ -249,7 +253,12 @@ export class OptsExpedientePage implements OnInit { this.close(); this.toastService._successMessage() } catch(error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() } @@ -259,9 +268,13 @@ export class OptsExpedientePage implements OnInit { this.close(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.goBack(); - },()=>{ - - this.toastService._badRequest('Processo não encontrado') + },(error)=>{ + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não encontrado') + } }); } @@ -285,7 +298,12 @@ export class OptsExpedientePage implements OnInit { this.close(); this.toastService._successMessage('Processo aprovado') } catch(error) { - this.toastService._badRequest('Processo não aprovado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não aprovado') + } } finally { loader.remove() } @@ -341,7 +359,12 @@ export class OptsExpedientePage implements OnInit { await this.processes.CompleteTask(body).toPromise(); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -376,7 +399,12 @@ export class OptsExpedientePage implements OnInit { this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.toastService._badRequest('Processo não descartado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -396,7 +424,12 @@ export class OptsExpedientePage implements OnInit { this.toastService._successMessage('Processo descartado'); this.goBack(); } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Processo não descartado') + } } finally { loader.remove() } @@ -410,8 +443,12 @@ export class OptsExpedientePage implements OnInit { await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise(); this.toastService._successMessage(); this.goBack(); - } catch (error) { + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 6164e5652..55d683e44 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -5,7 +5,7 @@
- + @@ -15,7 +15,7 @@
- + @@ -46,7 +46,7 @@ - + diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index a7590a2dc..78ac68331 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -191,7 +191,12 @@ export class RequestOptionsPage implements OnInit { this.close(); this.toastService._successMessage() } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest() + } } finally { loader.remove() @@ -260,7 +265,12 @@ export class RequestOptionsPage implements OnInit { this.toastService._successMessage('Processo arquivado') } catch (error) { - this.toastService._badRequest('Processo não arquivado') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + + this.toastService._badRequest('Processo não arquivado') + } } finally { loader.remove() } diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.html b/src/app/shared/popover/searched-document-options/searched-document-options.page.html index 6068cd928..682b8b32b 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.html +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.html @@ -1,9 +1,7 @@ - -
- -
- - - -
-
+
+ +
+ + + +
\ No newline at end of file diff --git a/src/app/shared/publication/edit-action/edit-action.page.ts b/src/app/shared/publication/edit-action/edit-action.page.ts index 148a679fa..83c974c3a 100644 --- a/src/app/shared/publication/edit-action/edit-action.page.ts +++ b/src/app/shared/publication/edit-action/edit-action.page.ts @@ -111,7 +111,11 @@ export class EditActionPage implements OnInit { this.getActions.emit() } catch (error) { - this.toastService._badRequest('Não foi possivel atualizar a acção presidencial') + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Não foi possivel atualizar a acção presidencial') + } } finally { loader.remove() } diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index c34bf48ff..c6bbcef8c 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -133,7 +133,12 @@ export class NewActionPage implements OnInit { this.getActions.emit() } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest('Não foi possivel criar a acção presidencial') + } } finally { loader.remove() } 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 cbdedb65b..bec323ad1 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -159,7 +159,11 @@ export class NewPublicationPage implements OnInit { this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } @@ -188,7 +192,11 @@ export class NewPublicationPage implements OnInit { this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } @@ -216,7 +224,11 @@ export class NewPublicationPage implements OnInit { this.goBack(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } @@ -247,7 +259,11 @@ export class NewPublicationPage implements OnInit { this.goBackToViewPublications.emit(); } catch (error) { - this.toastService._badRequest() + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() } diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 5570b5f44..fa1aff7ef 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -90,7 +90,11 @@ export class PublicationDetailPage implements OnInit { this.toastService._successMessage("Publicação eliminado") this.goBackToViewPublications.emit(); } catch (error) { - this.toastService._badRequest("Publicação não eliminado") + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest("Publicação não eliminado") + } } finally { laoder.remove() } diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 817ec8e34..4c7141eb3 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -26,7 +26,7 @@ export class ViewPublicationsPage implements OnInit { getpublication = []; error: any; - @Input() folderId: string; + @Input() folderId: any; @Output() addNewPublication = new EventEmitter(); @Output() editPublication = new EventEmitter(); @Output() openPublicationDetails= new EventEmitter(); @@ -221,8 +221,13 @@ export class ViewPublicationsPage implements OnInit { try { await this.publications.DeletePresidentialAction(folderId).toPromise(); this.toastService._successMessage() - } catch (e) { + } catch (error) { + if(error.status == 0) { + this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão') + } else { + this.toastService._badRequest() + } } finally { loader.remove() diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 10909d23b..aaefbfe6d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr' import { doneITDev } from './suport/doneIt' -export const environment: Environment = oaprDev; \ No newline at end of file +export const environment: Environment = doneITDev; \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index 92657ef51..06a847a14 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1426,4 +1426,9 @@ $font-size: 11pt; ngx-mat-datetime-content button.mat-stroked-button { top: -56px; margin-bottom: -35px; +} + +pre { + font-family: 'Roboto' !important; + font-size: 12pt !important; } \ No newline at end of file diff --git a/version/git-version.ts b/version/git-version.ts index a214f268b..56ba4432a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "cc9c5a9cf", - "SHA": "cc9c5a9cf574d37b4d2269e37743f359bc1d7b8d", + "shortSHA": "f7791805f", + "SHA": "f7791805f3705a79b50fef5f4e3f242132a73669", "branch": "no_bug_movemente", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jan 30 23:21:47 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4700", + "lastCommitAuthor": "'Eudes Inácio'", + "lastCommitTime": "'Thu Feb 2 18:24:26 2023 +0100'", + "lastCommitMessage": "chat notification added", + "lastCommitNumber": "4701", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 8 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/modals/profile/profile.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/header/header.page.ts\n\tnew file: src/assets/images/icons-nav-agenda-active.svg\n\tmodified: src/environments/environment.prod.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 14 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/home/home.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/dar-parecer/dar-parecer.page.ts\n\tmodified: src/app/modals/delegar/delegar.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.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/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-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/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\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/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/edit-action/edit-action.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tnew file: src/app/services/server-connection.service.spec.ts\n\tnew file: src/app/services/server-connection.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.html\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.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\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.html\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.html\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.html\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.html\n\tmodified: src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified: src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts\n\tmodified: src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.scss\n\tmodified: src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.ts\n\tmodified: src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss\n\tnew file: www.rar", "changeAuthor": "eudes.inacio" } \ No newline at end of file diff --git a/www.rar b/www.rar new file mode 100644 index 000000000..546192517 Binary files /dev/null and b/www.rar differ