peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-20 05:16:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve add event and edit event

Browse Source
This commit is contained in:
Peter Maquiran
2021-04-07 11:52:28 +01:00
parent 9718a9f98d
commit b7b5533260
9 changed files with 277 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/new-event/new-event.page.html
+24 -10
View File
@@ -15,7 +15,6 @@
<div class="ion-item-container">
<ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
</div>
<div class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
@@ -130,22 +129,30 @@
<div class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-person.svg"></ion-icon>
</div>
<div (click)="openAttendees()" class="ion-input-class-no-height">
<div class="ion-input-class-no-height">
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Adicionar participantes</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label *ngIf="taskParticipants.length == 0" class="list-people-title">Adicionar interveniente</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipants()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
</div>
</div>
<!-- HIDDEN -->
<div hidden class="container-div">
<div class="ion-item-class-2">
<div class="ion-icon-class">
@@ -155,12 +162,19 @@
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<ion-label hidden >Text</ion-label>
</ion-list>
<ion-label class="list-people-title">Com conhecimento</ion-label>
<div class="list-people">
<ion-item lines="none">
<ion-list>
<ion-label *ngIf="!taskParticipants" class="list-people-title">Adicionar intervenientes</ion-label>
<ion-label *ngFor="let participant of taskParticipants">{{participant.Name}}</ion-label>
</ion-list>
</ion-item>
</div>
</ion-list>
</ion-item>
</div>
<div class="add-people">
<div (click)="addParticipantsCC()" class="add-people">
<ion-icon slot="start" src="assets/images/icons-arrow-forward.svg"></ion-icon>
</div>
</div>
src/app/pages/agenda/new-event/new-event.page.ts
+43 -14
View File
@@ -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();
}
}