diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index 2a0a66c75..6c683d6fc 100644 --- a/src/app/modals/add-note/add-note.page.ts +++ b/src/app/modals/add-note/add-note.page.ts @@ -101,7 +101,7 @@ export class AddNotePage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -144,7 +144,7 @@ export class AddNotePage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 9b67e9240..995227bf3 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -131,16 +131,16 @@ export class CreateProcessPage implements OnInit { } async saveTask(){ - if(this.postData.Priority=='99999861'){ + if(this.postData.Priority=='99999861') { this.dispatchFolder.DeadlineType = 'Normal'; } - else if(this.postData.Priority=='99999862'){ + else if(this.postData.Priority=='99999862') { this.dispatchFolder.DeadlineType = 'Urgente'; } - else if(this.postData.Priority=='99999863'){ + else if(this.postData.Priority=='99999863') { this.dispatchFolder.DeadlineType = 'Muito Urgente'; } - else if(this.postData.Priority=='99999864'){ + else if(this.postData.Priority=='99999864') { this.dispatchFolder.DeadlineType = 'Urgentíssimo'; } @@ -177,7 +177,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise() - this.successMessage('') + //this.successMessage('') } catch (error) { this.badRequest() } @@ -197,7 +197,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise() - this.successMessage() + // this.successMessage() } catch (error) { this.badRequest() } @@ -216,7 +216,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise() - this.successMessage() + // this.successMessage() } catch (error) { this.badRequest() } @@ -247,7 +247,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise() - this.successMessage() + // this.successMessage() } catch (error) { this.badRequest() } @@ -267,7 +267,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise() - this.successMessage() + // this.successMessage() } catch (error) { this.badRequest() } @@ -286,7 +286,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise() - this.successMessage() + // this.successMessage() } catch (error) { this.badRequest() } @@ -301,7 +301,7 @@ export class CreateProcessPage implements OnInit { } - async executado(){ + async executado() { let body = { "serialNumber": this.task.serialNumber, "action": "Conhecimento", @@ -544,7 +544,7 @@ export class CreateProcessPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -587,7 +587,7 @@ export class CreateProcessPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index 2ac655fd2..47637771a 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -137,7 +137,7 @@ export class DarParecerPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 5b97e5a0a..5d765a059 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -72,22 +72,20 @@ export class DelegarPage implements OnInit { } - close(){ + close() { this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } - goBack() { - window.history.back() - } - cancelTask(){ + + cancelTask() { this.modalController.dismiss(null); } - async saveTask(){ + async saveTask() { if(this.taskParticipants.length > 1){ this.alertService.presentErrorMessage("Selecione apenas um destinatário"); } - else{ + else { let body = { "SerialNumber": this.task.SerialNumber, "DispatchDocId": this.task.DocId, @@ -104,7 +102,6 @@ export class DelegarPage implements OnInit { (error)=>{ this.badRequest("Processo não delegado") }); - this.goBack(); } } @@ -214,7 +211,7 @@ export class DelegarPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -257,7 +254,7 @@ export class DelegarPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 65f574f11..4c32025ef 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -226,7 +226,7 @@
-
+
{{event.event.StartDate | date: 'HH:mm'}}
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 b955f38ca..60fa0dce0 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -274,7 +274,7 @@ export class EditEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -317,7 +317,7 @@ export class EditEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 53e11a19c..ffb7c84bd 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -132,7 +132,7 @@ export class EventActionsPopoverPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -175,7 +175,7 @@ export class EventActionsPopoverPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } 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 854f9a005..b7717e19a 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -209,7 +209,7 @@ export class NewEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -252,7 +252,7 @@ export class NewEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } async openAttendees() { diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 845b4642b..ef7b51433 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -328,7 +328,8 @@ export class EventsPage implements OnInit { goToExpediente(serialNumber:any){ let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, + "from": "inicio" } }; this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); 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 cf7368de1..62522bc4d 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 @@ -83,14 +83,14 @@ export class DespachoPrPage implements OnInit { } goBack(){ - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "despachospr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + let navigationExtras: NavigationExtras = { + queryParams: { + "despachospr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + - window.history.back() } @@ -504,7 +504,7 @@ export class DespachoPrPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } async badRequest(message?) { @@ -546,6 +546,6 @@ export class DespachoPrPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 28b95e615..7b74ef63d 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -85,7 +85,17 @@ export class DespachoPage implements OnInit { } goBack() { - window.history.back() + // window.history.back() + + let navigationExtras: NavigationExtras = { + queryParams: { + // "serialNumber": serialNumber, + 'despachos': true + } + } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } @@ -209,7 +219,7 @@ export class DespachoPage implements OnInit { } - async reexecute(note:string, documents:any){ + async reexecute(note:string, documents:any) { let body = { "serialNumber": this.serialnumber, "action": "Reencaminhar", @@ -231,7 +241,7 @@ export class DespachoPage implements OnInit { } - sendExpedienteToPending(){ + async sendExpedienteToPending() { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.close(); @@ -454,7 +464,7 @@ export class DespachoPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -497,6 +507,6 @@ export class DespachoPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 791955cde..5fd18a7c0 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 @@ -54,7 +54,13 @@ export class DiplomaAssinarPage implements OnInit { } goBack(){ - window.history.back() + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomas": true, + } + } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } async openOptions(taskAction?: any) { @@ -195,7 +201,7 @@ export class DiplomaAssinarPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -238,7 +244,7 @@ export class DiplomaAssinarPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 f5aa91be5..8fe4186b0 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -55,14 +55,15 @@ export class DiplomaPage implements OnInit { } goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "diplomas": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back() + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomas": true, + } + } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } async openOptions(taskAction?: any) { @@ -311,7 +312,7 @@ export class DiplomaPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -354,7 +355,7 @@ export class DiplomaPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 9fd4654cc..fd2415699 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 @@ -71,7 +71,8 @@ export class ApproveEventModalPage implements OnInit { this.modalController.dismiss(null); } - getTask(){ + getTask() { + this.processes.GetTask(this.serialNumber).subscribe(res => { console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res); this.loadedEvent = res; @@ -83,6 +84,7 @@ export class ApproveEventModalPage implements OnInit { this.getAttachments() }) + } viewDocument(docId:string, applicationId:string){ @@ -94,11 +96,11 @@ export class ApproveEventModalPage implements OnInit { }); } - async approveTask(serialNumber:string){ + async approveTask(serialNumber:string) { console.log('approveTask SERIALNUMBER: ', serialNumber) let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); - try { + try { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); @@ -107,7 +109,6 @@ export class ApproveEventModalPage implements OnInit { this.badRequest('Evento não aprovado') } - } emendTask(serialNumber:string){ @@ -119,9 +120,8 @@ export class ApproveEventModalPage implements OnInit { } async rejectTask(serialNumber:string) { - // console.log('rejectTask: ',serialNumber) + let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - // console.log(body); try { await this.processes.PostTaskAction(body).toPromise() @@ -254,7 +254,7 @@ export class ApproveEventModalPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -297,7 +297,7 @@ export class ApproveEventModalPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 dfd4a72da..585e71a41 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 @@ -63,7 +63,15 @@ export class ApproveEventPage implements OnInit { } goBack() { - window.history.back(); + + let navigationExtras: NavigationExtras = { + queryParams: { + "eventos": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + + } async getTask(){ @@ -263,7 +271,7 @@ export class ApproveEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -306,7 +314,7 @@ export class ApproveEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 c6d9f57fa..cc44ed4e6 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 @@ -389,7 +389,7 @@ export class BookMeetingModalPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } goToGabinete() { 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 0733c95ac..c8277aad9 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 @@ -568,7 +568,7 @@ export class ExpedientTaskModalPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -611,7 +611,7 @@ export class ExpedientTaskModalPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file 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 ff8c63d82..3bf8869fb 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 @@ -109,7 +109,7 @@ - + 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 61c3f161a..7c681b379 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 @@ -39,6 +39,9 @@ export class ExpedienteDetailPage implements OnInit { intervenientes: any; cc: any = []; + hideSendToPendentes = true + + constructor(private activateRoute: ActivatedRoute, private processes: ProcessesService, private iab: InAppBrowser, @@ -53,12 +56,19 @@ export class ExpedienteDetailPage implements OnInit { private toastService: ToastService, private animationController: AnimationController ) { + this.activatedRoute.queryParams.subscribe(params => { + if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; - console.log(params["serialNumber"]); } + + if(params["type"] == "pendentes") { + this.hideSendToPendentes = false + } + }); + } ngOnInit() { @@ -76,29 +86,45 @@ export class ExpedienteDetailPage implements OnInit { this.LoadRelatedEvents(this.serialnumber); } - close(){ + close() { this.modalController.dismiss(); } - showToast(){ + showToast() { this.toastService.presentToast('Não foi possível fazer login"'); } - /* goBack() { - window.history.back() - } */ - goBack(){ - let navigationExtras: NavigationExtras = { - queryParams: { - "expedientes": true, + goBack() { + + + this.activatedRoute.queryParams.subscribe(params => { + if(params["from"] == "inicio") { + + + this.router.navigate(['/home/events']); + + } else { + + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes": true, + } + } + + if( window.innerWidth < 801) { + this.router.navigate(['/home/gabinete-digital/expediente']); + } else { + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } - }; - if( window.innerWidth < 801){ - this.router.navigate(['/home/gabinete-digital/expediente']); - } else { - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - } + + + + + }); + } sendExpedienteToPending(){ @@ -378,7 +404,7 @@ export class ExpedienteDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -421,7 +447,7 @@ export class ExpedienteDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 9f892750d..5cededd0a 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -87,17 +87,24 @@ export class ExpedientePage implements OnInit { }, 2000); } - goBack(){ + goBack() { + this.router.navigate(['/home/gabinete-digital']); + } - goToExpediente(serialNumber:any){ + goToExpediente(serialNumber:any) { + let navigationExtras: NavigationExtras = { queryParams: { - "serialNumber": serialNumber, + "serialNumber": serialNumber, + "from": "gabinete", + "type": "pendentes" } - }; + } + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + } } 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 31e57a034..175689850 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 @@ -88,14 +88,14 @@ export class ExpedientePrPage implements OnInit { } goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "expedientes-pr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back(); + } @@ -480,7 +480,7 @@ export class ExpedientePrPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } 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 de2056806..1605ddb95 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 @@ -150,14 +150,14 @@ export class ExpedientesPrPage implements OnInit { } goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "expedientes-pr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back(); + // window.history.back(); } 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 113e45855..687c215b4 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -407,12 +407,16 @@ export class PedidoPage implements OnInit { } goBack() { - - window.history.back(); + + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } + } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - async successMessage(message?: string) { @@ -454,7 +458,7 @@ export class PedidoPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index f9dcf01cb..4c7d0d072 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -54,8 +54,16 @@ export class PendentesPage implements OnInit { } goBack() { + + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } + } - window.history.back(); + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + + // window.history.back(); } notImplemented(){ @@ -168,7 +176,8 @@ export class PendentesPage implements OnInit { let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, - "from": "pendentes" + "from": "pendentes", + "type": "pendentes" } }; this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 608058aa6..c0fe0f58b 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -1,9 +1,18 @@
- + +
+
+
+
+ +
+
+
+

Inicie a sessão

Nome de utilizador

@@ -62,11 +71,11 @@
-
+
Entrar com senha
-
+
Limpar
diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 6ebe5b4de..a5fc0de1a 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -23,10 +23,55 @@ ion-content{ margin: auto !important; overflow: auto; } +.logo{ + width: 400px; + height: 400px; + background-image: url("/assets/background/auth.svg"); + background-position: center; + background-repeat: no-repeat; +} +.bg-1{ + width: 250px; + height: 250px; + overflow: auto; + border-radius: 50%; + background: #4cb9f825; + margin: auto; + .bg-2{ + width: 225px; + height: 225px; + overflow: auto; + border-radius: 50%; + background: #61bdf2b4; + margin: auto; + .bg-3{ + width: 200px; + height: 200px; + overflow: auto; + border-radius: 50%; + background: #96d3f8be; + margin: auto; + .bg-4{ + width: 175px; + height: 175px; + overflow: auto; + border-radius: 50%; + background: rgba(255, 255, 255, 0.918); + padding: 15px; + margin: auto; + + .bg-4 img{ + width: 100%; + } + } + } + } +} .div-logo{ - width: 200px; + width: 200px !important; margin: 0 auto; padding-bottom: 15px; + } .div-logo img{ width: 100%; @@ -71,7 +116,7 @@ ion-item{ border: 0!important; } -.div-logo { +/* .div-logo { background: transparent; width: em(140px); justify-content: center; @@ -80,7 +125,7 @@ ion-item{ .div-logo img{ width: 100%; margin: 0px auto; -} +} */ @@ -141,10 +186,11 @@ ion-item{ align-items: center; justify-content: center; background-image: url("/assets/background/auth.svg"); - background-size: 686px 674px; + background-size: 596px 584px; background-position: center; - background-position-y: 78px; + background-position-y: 160px; background-repeat: no-repeat; + margin: auto; } .voltar{ diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 1165d7a67..c5c9c73be 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -59,6 +59,7 @@ export class LoginPage implements OnInit { this.userLoginPreference = userData.loginPreference } else { this.userLoginPreference = '' + this.setPint = true } } @@ -118,7 +119,10 @@ export class LoginPage implements OnInit { domainName: environment.domain, BasicAuthKey: "" } - if (await this.authService.login(this.userattempt)) { + let attempt = await this.authService.login(this.userattempt); + console.log(JSON.stringify(attempt)); + + if (attempt) { //this.loginRocketChat(); this.authService.loginChat(this.userattempt); //this.getToken(); @@ -132,7 +136,7 @@ export class LoginPage implements OnInit { } else { - this.toastService.badRequest('O nome de utilizador e palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar'); + this.toastService.badRequest('O nome de utilizador e/ou palavra-passe estão incorretas ou verifique a sua conexão com a internet e volte a tentar'); } } else{ @@ -235,7 +239,7 @@ export class LoginPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 8108d746a..7f75b0396 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -96,7 +96,7 @@ export class NewActionPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -139,7 +139,7 @@ export class NewActionPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index f4adc3908..f4640cfea 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -162,7 +162,7 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -205,6 +205,6 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index b448c62aa..86df6850c 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -164,7 +164,7 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -207,7 +207,7 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 1585007f6..922b85145 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -51,29 +51,35 @@ export class AuthService { } const service = environment.apiURL + "userauthentication/GetValidateAuth"; - let result: boolean | PromiseLike; + let result: boolean | PromiseLike = false; let response: any; - result = await this.http.get(service, options).toPromise(); - response = await this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise(); + try { + result = await this.http.get(service, options).toPromise(); + response = await this.http.post(environment.apiURL + "UserAuthentication/Login", '', this.opts).toPromise(); - console.log(response) + console.log(response); - if (result) { + if (result) { + if( response.RoleID == 100000014) { + response.Profile = 'PR' + } else if(response.RoleID == 100000011) { + response.Profile = 'MDGPR' + } + response.BasicAuthKey = user.BasicAuthKey + this.ValidatedUser = response; - if( response.RoleID == 100000014) { - response.Profile = 'PR' - } else if(response.RoleID == 100000011) { - response.Profile = 'MDGPR' + localStorage.setItem('user', JSON.stringify(response)); + + this.storageService.store(AuthConnstants.USER, response); + + return result; } - response.BasicAuthKey = user.BasicAuthKey - this.ValidatedUser = response; - - localStorage.setItem('user', JSON.stringify(response)); - - this.storageService.store(AuthConnstants.USER, response); + + } catch (error) { + return result; } - return result; + } logout(){ 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 d75031bb3..8b0ea4869 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -275,7 +275,7 @@ export class ApproveEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -318,7 +318,7 @@ export class ApproveEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 bae43e372..8af66888a 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -355,7 +355,7 @@ export class NewEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -398,7 +398,7 @@ export class NewEventPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } diff --git a/src/app/shared/fingerprint/fingerprint.page.ts b/src/app/shared/fingerprint/fingerprint.page.ts index 7bb9187ef..abdc68912 100644 --- a/src/app/shared/fingerprint/fingerprint.page.ts +++ b/src/app/shared/fingerprint/fingerprint.page.ts @@ -154,7 +154,7 @@ export class FingerprintPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file 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 4bcd513d4..beb288a2d 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 @@ -447,7 +447,7 @@ export class EditEventToApproveComponent implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -490,7 +490,7 @@ export class EditEventToApproveComponent implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index ba409c126..8b6549a55 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -32,8 +32,10 @@ export class ExpedientsPage implements OnInit { private modalController: ModalController, private alertService: AlertService, private router: Router, + private activatedRoute: ActivatedRoute, ) { this.profile = 'mdgpr'; + } ngOnInit() { @@ -101,6 +103,8 @@ export class ExpedientsPage implements OnInit { let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, + "from": "gabinete", + "type": "pendentes" } }; this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 12fff9c1f..416b07535 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -155,29 +155,34 @@ export class PendentesPage implements OnInit { goToDespacho(serialNumber:any){ let navigationExtras: NavigationExtras = { - queryParams: { + queryParams: { "serialNumber": serialNumber, + } } - }; - this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); + this.router.navigate(['/home/gabinete-digital/despachos/despacho'], navigationExtras); } - goToPedido(serialNumber:any){ - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - } - }; - this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); - } + goToPedido(serialNumber:any) { + let navigationExtras: NavigationExtras = { + queryParams: { + "serialNumber": serialNumber, + } + } + this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras); + } goToExpediente(serialNumber:any){ + let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": serialNumber, + "from": "gabinete", + "type": "pendentes" } - }; - this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras); + } + + this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras) + } async openDespacho(serialNumber:string){ 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 d140f491f..8b56a055c 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -184,7 +184,7 @@ export class DeplomaOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -201,7 +201,7 @@ export class DeplomaOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } goBack() { 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 c0f4ab31e..d0392f587 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -321,7 +321,7 @@ export class DespachosOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -338,7 +338,7 @@ export class DespachosOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -365,14 +365,14 @@ export class DespachosOptionsPage implements OnInit { goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "despachospr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + let navigationExtras: NavigationExtras = { + queryParams: { + "despachospr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back() + // window.history.back() } } 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 f942fdd37..1d53ce904 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 @@ -322,7 +322,7 @@ export class DespachosPrOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -339,7 +339,7 @@ export class DespachosPrOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -366,14 +366,15 @@ export class DespachosPrOptionsPage implements OnInit { goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "despachospr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back() + let navigationExtras: NavigationExtras = { + queryParams: { + "despachospr": true, + } + }; + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } 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 f5d683176..63f013b88 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 @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { AnimationController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; import { User } from 'src/app/models/user.model'; @@ -42,7 +42,9 @@ export class OptsExpedientePrPage implements OnInit { private activatedRoute: ActivatedRoute, private userAuth: AuthService, private navParams: NavParams, - private animationController: AnimationController + private animationController: AnimationController, + private router: Router + ) { this.task = this.navParams.get('task'); @@ -275,14 +277,14 @@ export class OptsExpedientePrPage implements OnInit { } goBack() { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "expedientes-pr": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital'], navigationExtras); + let navigationExtras: NavigationExtras = { + queryParams: { + "expedientes-pr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); - window.history.back(); + // window.history.back(); } @@ -327,7 +329,7 @@ export class OptsExpedientePrPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } 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 add10b2ba..f25f33471 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -325,7 +325,7 @@ export class RequestOptionsPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } 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 c43558ea0..c7149029e 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -99,7 +99,7 @@ export class NewActionPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -142,7 +142,7 @@ export class NewActionPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 6dced0ef8..02572eb74 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -315,7 +315,7 @@ export class NewPublicationPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -358,7 +358,7 @@ export class NewPublicationPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } } 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 2703b1f85..c361c02b7 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 @@ -181,7 +181,7 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } @@ -224,7 +224,7 @@ export class PublicationDetailPage implements OnInit { setTimeout(()=>{ modal.dismiss() - },3000) + },7000) } }