peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-30 18:56:54 +01:00
parent 8de8e23212 23d73c6d5f
commit 5603715026
13 changed files with 235 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/edit-event/edit-event.page.ts
+8 -3
View File
@@ -265,7 +265,7 @@ export class EditEventPage implements OnInit {
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee',
cssClass: 'modal attendee modal-desktop',
backdropDismiss: false
});
@@ -279,8 +279,13 @@ export class EditEventPage implements OnInit {
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
if(newAttendees.length) {
this.setIntervenient(newAttendees);
}
if(newAttendeesCC) {
this.setIntervenientCC(newAttendeesCC);
}
}
});
}
src/app/pages/agenda/new-event/new-event.page.ts
+17 -9
View File
@@ -296,9 +296,9 @@ export class NewEventPage implements OnInit {
const modal = await this.modalController.create({
component: AttendeesPageModal,
componentProps: {
eventAttendees: this.postEvent.Attendees,
adding: this.adding,
taskParticipants: this.taskParticipants
taskParticipants: this.taskParticipants,
taskParticipantsCc: this.taskParticipantsCc
},
cssClass: 'attendee modal modal-desktop',
backdropDismiss: false
@@ -308,19 +308,27 @@ export class NewEventPage implements OnInit {
modal.onDidDismiss().then((data) => {
if(data){
if(data) {
data = data['data'];
if(data) {
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
const newAttendees: EventPerson[] = data['taskParticipants'];
const newAttendeesCC: EventPerson[] = data['taskParticipantsCc'];
if(newAttendees.length) {
this.setIntervenient(newAttendees);
}
if(newAttendeesCC) {
this.setIntervenientCC(newAttendeesCC);
}
}
this.setIntervenient(newAttendees);
this.setIntervenientCC(newAttendeesCC);
}
});
}
setIntervenient(data){
setIntervenient(data) {
this.taskParticipants = data;
this.postEvent.Attendees = data;
}
@@ -329,7 +337,7 @@ export class NewEventPage implements OnInit {
this.taskParticipantsCc = data;
}
addParticipants(){
addParticipants() {
this.adding = 'intervenient'
this.openAttendees();
}