From dd813618f6cb293778cd8ed88e7d0b81fc995b6c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 15 Jun 2021 11:55:36 +0100 Subject: [PATCH] save --- .../create-process/create-process.page.ts | 2 +- .../events/attendees/attendees.page.html | 2 +- src/app/pages/events/events.page.html | 2 +- .../add-participants-modal.page.html | 2 +- .../expedient-task-modal.page.html | 2 +- .../expedient-task-modal.page.ts | 125 +++++++----------- .../attendee-modal/attendee-modal.page.html | 1 + .../event/attendees/attendees.page.html | 2 +- .../edit-event-to-approve/edit-event.page.ts | 108 ++------------- 9 files changed, 67 insertions(+), 179 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index ea6f739ce..6f8595440 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -198,7 +198,7 @@ export class CreateProcessPage implements OnInit { console.log('this.postData', this.postData, this.taskType); try { - await this.processes.postDespatcho(this.postData).toPromise(); + //await this.processes.postDespatcho(this.postData).toPromise(); this.FinalizarDespacho(); this.toastService.badRequest('Despacho criado'); } catch (error) { diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html index 179d98509..4cc65b424 100644 --- a/src/app/pages/events/attendees/attendees.page.html +++ b/src/app/pages/events/attendees/attendees.page.html @@ -1,6 +1,6 @@ - Adicionar intervenientes + Adicionar intervenientes - A.M. diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index dcc5c5cf7..54e6d6ad3 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -79,7 +79,7 @@
Correspondência por ler
- diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html index ca7fdd41d..f654a2caa 100644 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html @@ -1,5 +1,5 @@ -

Adicionar Intervenientes

+

Adicionar Intervenientes - TK

 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 048c8da40..110602c06 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 @@ -65,7 +65,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} 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 ec60e0b5a..922d9e945 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 @@ -21,6 +21,7 @@ import { User } from 'src/app/models/user.model'; 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 { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-expedient-task-modal', @@ -175,7 +176,7 @@ export class ExpedientTaskModalPage implements OnInit { attendees = attendees.map(function(val) { return { UserEmail: val.EmailAddress, - UserType: val.IsRequired?"I": "CC" + UserType: val.IsRequired?"intervenient": "CC" }; }) @@ -218,7 +219,7 @@ export class ExpedientTaskModalPage implements OnInit { } console.log(this.postData); - this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); + //this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); await this.toastService.successMessage('Processo efetuado', () =>{ this.modalController.dismiss(action_despacho); }); @@ -367,89 +368,71 @@ export class ExpedientTaskModalPage implements OnInit { }); } - - async addParticipants() { - /* console.log('HERES'); */ - - this.adding = "intervenient"; - this.contacts = this.taskParticipants; - - if(window.innerWidth <=800){ - - this.showAttendees=false; + async openAttendees() { + if(window.innerWidth <= 1024) { const modal = await this.modalController.create({ - component: AddParticipantsModalPage, + component: AttendeesPage, componentProps: { - eventPersons: this.participants + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'add-participants-modal', + cssClass: 'attendee modal modal-desktop', 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 = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'I', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(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); } - this.postData.UsersSelected = this.participants; - console.log(this.postData); }); } else { - this.showAttendees=true + this.showAttendees = true } } + + /* setIntervenient(data){ + this.taskParticipants = data; + //this.postData.UsersSelected = data; + } + + setIntervenientCC(data){ + this.taskParticipantsCc = data; + } */ + + + async setIntervenient(data) { + this.taskParticipants = data; + } + + async setIntervenientCC(data) { + this.taskParticipantsCc = data; + } + + async addParticipants() { + this.adding = 'intervenient' + this.openAttendees(); + } async addParticipantsCc() { - this.adding = "CC"; - this.contacts = this.taskParticipantsCc; - - if(window.innerWidth <=800){ - this.showAttendees=false; - - const modal = await this.modalController.create({ - component: AddParticipantsCcModalPage, - componentProps: { - eventPersons: this.participants - }, - cssClass: 'add-participants-cc-modal', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - this.taskParticipantsCc = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees!= null){ - newattendees.forEach(newattendee => { - let att = { - 'UserEmail': newattendee.EmailAddress, - 'UserType': 'CC', - }; - if(this.participants == null){ - this.participants = new Array(); - } - this.participants.push(att); - }); - } - this.postData.UsersSelected = this.participants; - console.log(this.postData); - }); - } else { - this.showAttendees=true - } + this.openAttendees(); + } + dynamicSetIntervenient({taskParticipants, taskParticipantsCc}){ + this.taskParticipants = taskParticipants; + this.taskParticipantsCc = taskParticipantsCc; } async distartExpedientModal() { @@ -485,13 +468,7 @@ export class ExpedientTaskModalPage implements OnInit { } - async setIntervenient(data) { - this.taskParticipants = data; - } - async setIntervenientCC(data) { - this.taskParticipantsCc = data; - } async closeComponent() { this.showAttendees = false; diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index d0f026983..97b1d4b7b 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -1,6 +1,7 @@ Adicionar intervenientes + Agenda Desktop diff --git a/src/app/shared/event/attendees/attendees.page.html b/src/app/shared/event/attendees/attendees.page.html index 4a71dcbc8..50bae5f8d 100644 --- a/src/app/shared/event/attendees/attendees.page.html +++ b/src/app/shared/event/attendees/attendees.page.html @@ -16,7 +16,7 @@ - Adicionar participantes + Adicionar participantes XV 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 c55082221..1e58b380d 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 @@ -8,6 +8,7 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; +import { ToastService } from 'src/app/services/toast.service'; import { Event, EventToApproveEdit } from '../../../models/event.model'; import { BadRequestPage } from '../../popover/bad-request/bad-request.page'; import { SuccessMessagePage} from '../../popover/success-message/success-message.page'; @@ -140,7 +141,8 @@ export class EditEventToApproveComponent implements OnInit { public alertController: AlertController, private attachmentsService: AttachmentsService, private processes:ProcessesService, - private animationController: AnimationController + private animationController: AnimationController, + private toastService: ToastService, ) { this.serialNumber = this.navParams.get('serialNumber'); @@ -253,9 +255,9 @@ export class EditEventToApproveComponent implements OnInit { } this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ - this.successMessage('Evento editado') + this.toastService.successMessage('Evento editado'); }, error =>{ - this.badRequest('Evento não editado') + this.toastService.badRequest('Evento não editado'); }) @@ -263,16 +265,16 @@ export class EditEventToApproveComponent implements OnInit { if(document['action'] == 'add') { delete document.action this.attachmentsService.setEventAttachmentById(document).subscribe(()=>{ - //this.successMessage() + this.toastService.successMessage(); }, error =>{ - this.badRequest() + this.toastService.badRequest(); }); } else if(document['action'] == 'delete') { delete document.action this.attachmentsService.deleteEventAttachmentById(document.Id).subscribe( res=>{ - //this.successMessage() + this.toastService.successMessage() }, error =>{ - this.badRequest() + this.toastService.badRequest() }) } @@ -407,96 +409,4 @@ export class EditEventToApproveComponent implements OnInit { }); } - async successMessage(message?: any, callback?) { - - const enterAnimation = (baseEl: any) => { - const backdropAnimation = this.animationController.create() - .addElement(baseEl.querySelector('ion-backdrop')!) - .fromTo('opacity', '0.01', 'var(--backdrop-opacity)'); - - const wrapperAnimation = this.animationController.create() - .addElement(baseEl.querySelector('.modal-wrapper')!) - .keyframes([ - { offset: 0, opacity: '1', right: '-100%' }, - { offset: 1, opacity: '1', right: '0px' } - ]); - - return this.animationController.create() - .addElement(baseEl) - .easing('ease-out') - .duration(500) - .addAnimation([backdropAnimation, wrapperAnimation]); - } - - const leaveAnimation = (baseEl: any) => { - return enterAnimation(baseEl).direction('reverse'); - } - - - const modal = await this.modalController.create({ - enterAnimation, - leaveAnimation, - component: SuccessMessagePage, - componentProps: { - message: message || 'Processo efetuado' , - }, - cssClass: 'notification-modal' - }); - - modal.present() - - setTimeout(()=>{ - if (callback) { - callback() - } - modal.dismiss() - },7000) - - } - - async badRequest(message?: string, callback?) { - const enterAnimation = (baseEl: any) => { - const backdropAnimation = this.animationController.create() - .addElement(baseEl.querySelector('ion-backdrop')!) - .fromTo('opacity', '0.01', 'var(--backdrop-opacity)'); - - const wrapperAnimation = this.animationController.create() - .addElement(baseEl.querySelector('.modal-wrapper')!) - .keyframes([ - { offset: 0, opacity: '1', right: '-100%' }, - { offset: 1, opacity: '1', right: '0px' } - ]); - - return this.animationController.create() - .addElement(baseEl) - .easing('ease-out') - .duration(500) - .addAnimation([backdropAnimation, wrapperAnimation]); - } - - const leaveAnimation = (baseEl: any) => { - return enterAnimation(baseEl).direction('reverse'); - } - - - const modal = await this.modalController.create({ - enterAnimation, - leaveAnimation, - component: BadRequestPage, - componentProps: { - message: message || 'Processo efetuado' , - }, - cssClass: 'notification-modal' - }); - - modal.present() - - setTimeout(()=>{ - if (callback) { - callback() - } - modal.dismiss() - },7000) - } - } \ No newline at end of file