From 76428dbc1a261d30ed73f91dc36d6f030002dc26 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 12:03:17 +0100 Subject: [PATCH 1/5] save --- src/app/home/home-routing.module.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 9cc716326..8899495e2 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -187,16 +187,6 @@ const routes: Routes = [ path:':folderId/:publicationId', loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) }, - { - path:'publication-detail', - children: [ - { - path: ':id', - loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) - }, - ] - - }, ] }, { From 4bb5df08e4187d14d5624b0c3dd91d51130e25fb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 12:09:34 +0100 Subject: [PATCH 2/5] save --- src/app/modals/create-process/create-process.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index bc2011682..7b4b449ae 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -417,8 +417,6 @@ export class CreateProcessPage implements OnInit { this.setIntervenientCC(newAttendeesCC); } }); - - } else { this.showAttendees=true } From 6c39004f4d3d8fb03dc3105d4ad4d604cafd7065 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 12:09:44 +0100 Subject: [PATCH 3/5] save --- src/app/modals/delegar/delegar.page.ts | 79 +++++++++++++++++--------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index e18ed8185..5378e69ee 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -14,6 +14,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ToastService } from 'src/app/services/toast.service'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-delegar', @@ -105,44 +106,66 @@ export class DelegarPage implements OnInit { } } - async addParticipants(){ - console.log('HERE'); + /* async addParticipants() { this.adding = "intervenient"; - if(window.innerWidth <= 800){ + this.contacts = this.taskParticipants; + + if(window.innerWidth <=800) { + + this.showAttendees=false; + const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.eventAttendees + component: AttendeesPageModal, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'book-meeting-modal', + cssClass: 'attendee', backdropDismiss: false }); - + await modal.present(); - - modal.onDidDismiss().then((res) => { - /* this.taskParticipants = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees != null){ - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": true - }; - if(this.eventAttendees == null){ - this.eventAttendees = null; - } - this.eventAttendees = att; - console.log(att); - - }); - } */ + + modal.onDidDismiss().then((data) => { + + if(data) { + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); + } }); } else { - this.showAttendees = true; + this.showAttendees=true } + } */ + + async setContact(data:EventPerson[]) { + + if(this.adding == "intervenient"){ + this.taskParticipants = data; + } else if (this.adding == "CC") { + + this.taskParticipantsCc = data; + } + + } + + async setIntervenient(data) { + this.taskParticipants = data; + } + + async setIntervenientCC(data) { + this.taskParticipantsCc = data; + } + + async closeComponent() { + this.showAttendees = false; } async distartExpedientModal(){ From c6beb1252a64981545f37ea116170a3900787ed7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 14:32:50 +0100 Subject: [PATCH 4/5] save --- .../create-process/create-process.page.ts | 2 +- src/app/modals/delegar/delegar.page.ts | 20 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 7b4b449ae..f10383eb3 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -399,7 +399,7 @@ export class CreateProcessPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'attendee', + cssClass: 'modal attendee', backdropDismiss: false }); diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 5378e69ee..2f2b46f6a 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -83,7 +83,10 @@ export class DelegarPage implements OnInit { } async saveTask() { - if(this.taskParticipants.length > 1){ + if(this.taskParticipants.length < 1){ + this.toastService.badRequest("Selecione um destinatário"); + } + else if(this.taskParticipants.length > 1){ this.toastService.badRequest("Selecione apenas um destinatário"); } else { @@ -99,6 +102,7 @@ export class DelegarPage implements OnInit { this.processes.DelegateTask(body).subscribe(res=>{ console.log(res); this.toastService.successMessage('Processo delegado') + this.close(); }, (error)=>{ this.toastService.badRequest("Processo não delegado") @@ -106,15 +110,10 @@ export class DelegarPage implements OnInit { } } - /* async addParticipants() { - + async addParticipants() { this.adding = "intervenient"; - this.contacts = this.taskParticipants; - if(window.innerWidth <=800) { - this.showAttendees=false; - const modal = await this.modalController.create({ component: AttendeesPageModal, componentProps: { @@ -122,20 +121,17 @@ export class DelegarPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'attendee', + cssClass: 'modal attendee', backdropDismiss: false }); await modal.present(); modal.onDidDismiss().then((data) => { - if(data) { data = data['data']; - const newAttendees: EventPerson[] = data['taskParticipants']; const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; - this.setIntervenient(newAttendees); this.setIntervenientCC(newAttendeesCC); } @@ -143,7 +139,7 @@ export class DelegarPage implements OnInit { } else { this.showAttendees=true } - } */ + } async setContact(data:EventPerson[]) { From 06c8d525b09822a052d9b7a331ef06c9955d559b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 15:12:34 +0100 Subject: [PATCH 5/5] save --- src/app/modals/forward/forward.page.html | 2 +- .../despacho-pr/despacho-pr.page.ts | 17 ++++++++++------- .../despachos/despacho/despacho.page.ts | 14 ++++++++------ .../diploma-assinar/diploma-assinar.page.ts | 14 +++++++++----- .../diplomas/diploma/diploma.page.ts | 14 ++++++++------ 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 00f97ee0b..44bba9acb 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -4,7 +4,7 @@
- +
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 6a687823c..d5c8c46fa 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 @@ -85,13 +85,16 @@ export class DespachoPrPage implements OnInit { } goBack(){ - let navigationExtras: NavigationExtras = { - queryParams: { - "despachospr": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/despachos-pr']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "despachospr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } } 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 b2490b13d..b79c2a7ee 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -90,15 +90,17 @@ export class DespachoPage implements OnInit { goBack() { // window.history.back() - let navigationExtras: NavigationExtras = { - queryParams: { - // "serialNumber": serialNumber, - //'despachos': true + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/despachos']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + 'despachos': true + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); - } 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 df663c0fa..efc0b9380 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 @@ -56,13 +56,17 @@ export class DiplomaAssinarPage implements OnInit { } goBack() { - let navigationExtras: NavigationExtras = { - queryParams: { - "diplomas": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/diplomas-assinar']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomasassinar": true, + } } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } async openOptions(taskAction?: any) { 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 8e76d7eee..19cf3bffe 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -57,14 +57,16 @@ export class DiplomaPage implements OnInit { } goBack() { - - let navigationExtras: NavigationExtras = { - queryParams: { - "diplomas": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/diplomas']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomas": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); }