diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 1e7874633..b66a79c7d 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -112,7 +112,6 @@ export class AgendaPage implements OnInit {
// this will make toggle add event and.
showEventEditOrOpen: "edit" | "add" | "" = ""
-
prEventList: Event[];
mdEventList: Event[]
@@ -894,7 +893,8 @@ export class AgendaPage implements OnInit {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
- eventId: eventId
+ eventId: eventId,
+ adding: this.adding
},
cssClass: 'modal modal-desktop',
backdropDismiss: false
@@ -986,7 +986,6 @@ export class AgendaPage implements OnInit {
}
async AproveEventEditEvent(data){
- console.log(data)
this.postEvent =data;
this.mobileComponent.transparentEventToApprove= true;
this.mobileComponent.showAddNewEvent = true;
@@ -997,9 +996,7 @@ export class AgendaPage implements OnInit {
if(Array.isArray(data)){
if(data.length >= 1){
-
- console.log('save!!!',data.length);
- console.log(data);
+
this.contacts = data ;
}
}
diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
index b8fa2eef2..0ed22b7f7 100644
--- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts
@@ -34,10 +34,9 @@ export class ApproveEventModalPage implements OnInit {
private popoverController: PopoverController,
private menu: MenuController,
private alertService: AlertService,
- )
- {
+ ) {
this.serialNumber = this.navParams.get('serialNumber');
- }
+ }
ngOnInit() {
this.getTask();
@@ -72,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
}
approveTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Aprovar" }
- console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -80,7 +78,6 @@ export class ApproveEventModalPage implements OnInit {
}
emendTask(serialNumber:string){
- /* console.log('Emendar'); */
this.menu.close();
this.openEmendMessageModal(serialNumber);
this.modalController.dismiss(null);
@@ -89,7 +86,6 @@ export class ApproveEventModalPage implements OnInit {
rejectTask(serialNumber:string){
let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
- console.log(body);
this.processes.PostTaskAction(body);
this.alertService.presentAlert('Operação realizada com sucesso!');
this.router.navigate(['/home/gabinete-digital/event-list']);
@@ -134,7 +130,6 @@ export class ApproveEventModalPage implements OnInit {
"ReviewerComments": res.data,
}
}
- console.log(body);
this.processes.PostTaskAction(body);
this.router.navigate(['/home/gabinete-digital/event-list']);
this.alertService.presentAlert('Operação realizada com sucesso!');
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index f4a7d4e74..501d7f7ea 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -144,7 +144,7 @@
- Adicionar intervenientes
+ Adicionar intervenientes
{{participant.Name}}
@@ -164,7 +164,7 @@
- Adicionar intervenientes
+ Adicionar intervenientes
{{participant.Name}}
@@ -224,7 +224,7 @@
[taskParticipants]="taskParticipants"
[taskParticipantsCc]="taskParticipantsCc"
[adding]="adding"
- (dynamicSetIntervenient)="dynamicSetIntervenient($event)"
+
>
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 ceeebcdd1..240c75cc7 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -71,9 +71,11 @@ export class EditEventPage implements OnInit {
};
}
+
close(){
this.modalController.dismiss();
}
+
save(){
this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
@@ -90,13 +92,13 @@ export class EditEventPage implements OnInit {
async openAttendees() {
- this.adding = 'intervenient';
-
if(window.innerWidth <= 1024) {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
- eventAttendees: this.postEvent.Attendees
+ adding: this.adding,
+ taskParticipants: this.taskParticipants,
+ taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
backdropDismiss: false
@@ -105,41 +107,39 @@ export class EditEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
- if (data['data'] != null)
- {
- let newattendees: EventPerson[] = data['data'];
- this.setIntervenient(newattendees);
+
+ if(data){
+ data = data['data'];
+
+ const newAttendees: EventPerson[] = data['taskParticipants'];
+ const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+ this.setIntervenient(newAttendees);
+ this.setIntervenientCC(newAttendeesCC);
}
});
}
}
- async dynamicSetIntervenient(data){
- this.taskParticipants = data['taskParticipants'];
- this.taskParticipantsCc = data['taskParticipantsCc'];
- }
-
- async setIntervenient(data){
+ setIntervenient(data){
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
- async setIntervenientCC(data){
+ setIntervenientCC(data){
this.taskParticipantsCc = data;
}
- async addParticipants(){
+ addParticipants(){
this.adding = 'intervenient'
this.openAttendees();
}
- async addParticipantsCC(){
+ addParticipantsCC(){
this.adding = 'CC'
-
this.openAttendees();
}
- async closeComponent(){}
}
\ No newline at end of file
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 00c5a0d15..51efa7332 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -15,7 +15,6 @@
-
@@ -130,22 +129,30 @@
-
+
+
@@ -155,12 +162,19 @@
- Com conhecimento
- Text
-
+ Com conhecimento
+
+
+
+ Adicionar intervenientes
+ {{participant.Name}}
+
+
+
+
-
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 df72417e4..996aa1e9b 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -11,6 +11,7 @@ import { AttendeesPage } from '../../events/attendees/attendees.page';
templateUrl: './new-event.page.html',
styleUrls: ['./new-event.page.scss'],
})
+
export class NewEventPage implements OnInit {
postEvent: Event;
eventBody: EventBody;
@@ -21,6 +22,11 @@ export class NewEventPage implements OnInit {
selectedDate: Date;
minDate: string;
+ adding: "intervenient" | "CC";
+
+ taskParticipants: any = [];
+ taskParticipantsCc: any = [];
+
constructor(
private modalController: ModalController,
private navParams: NavParams,
@@ -28,7 +34,7 @@ export class NewEventPage implements OnInit {
) {
this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
- this.postEvent.Body = this.eventBody;
+ this.postEvent.Body = this.eventBody;
this.profile = this.navParams.get('profile');
this.selectedSegment = this.navParams.get('segment');
@@ -88,21 +94,19 @@ export class NewEventPage implements OnInit {
};
}
-
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
-
}
close(){
this.modalController.dismiss();
}
save(){
- console.log(this.postEvent);
- console.log(this.profile);
+/* console.log(this.postEvent);
+ console.log(this.profile); */
if(this.profile=='mdgpr'){
@@ -114,12 +118,13 @@ export class NewEventPage implements OnInit {
this.modalController.dismiss(this.postEvent);
}
- async openAttendees()
- {
+ async openAttendees() {
const modal = await this.modalController.create({
component: AttendeesPage,
componentProps: {
- eventAttendees: this.postEvent.Attendees
+ eventAttendees: this.postEvent.Attendees,
+ adding: this.adding,
+ taskParticipants: this.taskParticipants
},
cssClass: 'attendee',
backdropDismiss: false
@@ -128,12 +133,36 @@ export class NewEventPage implements OnInit {
await modal.present();
modal.onDidDismiss().then((data) => {
- if (data['data'] != null)
- {
- let newattendees: EventPerson[] = data['data'];
- this.postEvent.Attendees = newattendees;
+
+ if(data){
+ data = data['data'];
+
+ const newAttendees: EventPerson[] = data['taskParticipants'];
+ const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
+
+ this.setIntervenient(newAttendees);
+ this.setIntervenientCC(newAttendeesCC);
}
});
-}
+ }
-}
+ setIntervenient(data){
+ this.taskParticipants = data;
+ this.postEvent.Attendees = data;
+ }
+
+ setIntervenientCC(data){
+ this.taskParticipantsCc = data;
+ }
+
+ addParticipants(){
+ this.adding = 'intervenient'
+ this.openAttendees();
+ }
+
+ addParticipantsCC(){
+ this.adding = 'CC'
+ this.openAttendees();
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index 380e808b5..d3090535a 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -1,55 +1,84 @@
-
-
- Participantes
-
-
-
-
- Intervenientes
-
-
- Com Conhecimento
-
-
+
+
+ Adicionar intervenientes
+
+
-
-
-
- Adicionar participantes
-
-
-
-
-
-
- Apagar
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ attendee.Name }}
+ {{ attendee.EmailAddress }}
+
+
+
+
+
+
+
+
+
+ = 1 && adding == 'intervenient' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+ = 1 || taskParticipantsCc.length >= 1" > Destinatário
+
+
+
+
+
{{ attendee.Name }}
{{ attendee.EmailAddress }}
-
+
+
+ X
+
+
+
+
+ = 1 && adding == 'CC' " class="flex-grow-1 overflow-y-auto height-100 pb-0" >
+ = 1 || taskParticipantsCc.length >= 1" > Destinatário
+
+
+
+
+
+
+
+ {{ attendee.Name }}
+ {{ attendee.EmailAddress }}
+
+
+ X
+
+
-
-
-
+
+
+
Cancelar
-
- OK
+ Gravar
diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts
index 381044836..0f4ad656d 100644
--- a/src/app/pages/events/attendees/attendees.page.ts
+++ b/src/app/pages/events/attendees/attendees.page.ts
@@ -1,8 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { EventPerson } from 'src/app/models/eventperson.model';
-import { EventsService } from 'src/app/services/events.service';
-import { ModalController, NavController } from '@ionic/angular';
-import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
+import { ModalController, NavParams } from '@ionic/angular';
+import { ContactsService } from 'src/app/services/contacts.service';
@Component({
selector: 'app-attendees',
@@ -11,69 +10,143 @@ import { AttendeeModalPage } from '../attendee-modal/attendee-modal.page';
})
export class AttendeesPage implements OnInit {
- eventAttendees: EventPerson[];
- segment:string = "true";
- shouldShowCancel:boolean = true;
-
- searchCountryString = ''; // initialize your searchCountryString string empty
-
- constructor(private eventService: EventsService, private modalCtrl: ModalController,
- private navCtrl: NavController) {
- }
+ // Defined by the API
+ contacts: EventPerson[];
+ showLoader: boolean = false;
+ selectedContact: EventPerson[] =[];
+ eventPersons: EventPerson[];
+ adding: "intervenient" | "CC";
+ currentPath = window.location.pathname;
+
+ taskParticipants:EventPerson[] = [];
+ taskParticipantsCc:EventPerson[] = [];
+ constructor(
+ private modalCtrl: ModalController,
+ private contactsService: ContactsService,
+ private navParams: NavParams,
+ private modalController: ModalController) {
+ this.adding = this.navParams.get('adding');
+ this.taskParticipants = this.navParams.get('taskParticipants');
+ this.taskParticipantsCc = this.navParams.get('taskParticipantsCc');
+ }
ngOnInit() {
+ this.fetchContacts("");
+
+ if(this.taskParticipants == null || this.taskParticipants == undefined){
+ this.taskParticipants = [];
+ }
+
+ if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){
+ this.taskParticipantsCc = [];
+ }
+
}
+
+ ngOnChanges(event){}
save(){
- this.modalCtrl.dismiss(this.eventAttendees);
+
+ this.modalController.dismiss({
+ 'taskParticipants': this.taskParticipants,
+ 'taskParticipantsCc': this.taskParticipantsCc
+ });
}
close(){
- this.modalCtrl.dismiss(null);
+ this.modalController.dismiss(false);
}
- removeAttendee(attendee: EventPerson)
- {
- let index: number = this.eventAttendees.findIndex((att) => {
- return att.EmailAddress == attendee.EmailAddress
- });
-
- this.eventAttendees.splice(index, 1);
+ onChange(evt: any) {
+ this.fetchContacts(evt.detail.value);
}
+
+ filterSearchList(itm: EventPerson): boolean {
+
+ if(this.adding == "intervenient"){
+ const result = this.taskParticipants.find((contact, index)=>{
+
+ if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
+ index = index;
+ return contact;
+ }
+ });
+ return undefined == result;
+
+ } else if (this.adding == "CC") {
+
+ const result = this.taskParticipantsCc.find((contact, index)=>{
+
+ if(contact.Name == itm.Name && contact.EmailAddress == itm.EmailAddress){
+ index = index;
+ return contact;
+ }
+ });
+
+ return undefined == result;
+ }
+
+ }
+
+ remove(itm: EventPerson){
+
+ if(this.adding == "intervenient"){
+
+ this.taskParticipants = this.taskParticipants.filter((contact, index) =>{
+
+ if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
+ return contact;
+ }
+ return false;
- async addAttendees()
- {
- const modal = await this.modalCtrl.create({
- component: AttendeeModalPage,
- componentProps: {
- eventPersons: this.eventAttendees
- },
- cssClass: 'attendee-modal',
- backdropDismiss: false
- });
+ });
- await modal.present();
+ } else if (this.adding == "CC") {
- modal.onDidDismiss().then((data) => {
- let newattendees: EventPerson[] = data['data'];
+ this.taskParticipantsCc = this.taskParticipantsCc.filter((contact, index) =>{
+
+ if(contact.Name != itm.Name && contact.EmailAddress != itm.EmailAddress){
+ return contact;
+ }
+ return false;
+
+ });
+ }
+
+ }
+
+ async selectContact(itm: EventPerson){
+ if(this.adding == "intervenient"){
+
+ this.taskParticipants.push(itm);
- if (newattendees != null)
+ } else if (this.adding == "CC") {
+
+ this.taskParticipantsCc.push(itm);
+ }
+ }
+
+ async fetchContacts(filter: string) {
+ this.showLoader = true;
+
+ this.contactsService.getContacts(filter).subscribe(result =>
{
- newattendees.forEach(newattendee => {
- let att = {
- "EmailAddress": newattendee.EmailAddress,
- "Name": newattendee.Name,
- "IsRequired": (this.segment == "true")
- };
- if (this.eventAttendees == null)
- {
- this.eventAttendees = new Array();
- }
- this.eventAttendees.push(att);
- });
+ if (this.eventPersons != null)
+ {
+ this.eventPersons.forEach(attendee => {
+ const index: number = result.findIndex((cont) => {
+ return cont.EmailAddress == attendee.EmailAddress
+ });
+
+ result.splice(index, 1);
+ });
+ }
+
+ this.contacts = result;
+ this.showLoader = false;
}
- });
+ );
}
}
\ No newline at end of file
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 402f4f98a..bb2c41c9d 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
@@ -134,4 +134,4 @@
-
+
\ No newline at end of file