${subject}
@@ -823,6 +831,7 @@ export class AgendaPage implements OnInit {
await this.cloneAllmobileComponent();
this.showEventEditOrOpen = 'add';
+ this.IsEvent = 'add';
if( window.innerWidth <= 1024){
const modal = await this.modalCtrl.create({
@@ -1033,4 +1042,15 @@ export class AgendaPage implements OnInit {
}
+ //
+ async closeComponentEditEventOrAdd(){
+
+ if(this.IsEvent ='edit') {
+ this.eventClicked(this.viewingEventObject);
+ } else if (this.IsEvent = 'add') {
+ this.cloneAllmobileComponent();
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index e1fa93468..7cf1473f5 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -4,10 +4,7 @@ import { EventBody } from 'src/app/models/eventbody.model';
import { EventPerson } from 'src/app/models/eventperson.model';
import { EventsService } from 'src/app/services/events.service';
import { Event } from 'src/app/models/event.model';
-import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
-import { AlertController, NavParams } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
-
+import { AlertController } from '@ionic/angular';
@Component({
selector: 'app-edit-event',
@@ -31,8 +28,8 @@ export class EditEventComponent implements OnInit {
@Output() clearContact = new EventEmitter
();
- @Output() cloneAllmobileComponent = new EventEmitter();
@Output() openAttendeesComponent = new EventEmitter();
+ @Output() closeComponent = new EventEmitter();
constructor(
private modalController: ModalController,
@@ -53,8 +50,8 @@ export class EditEventComponent implements OnInit {
}
}
close(){
- // this.modalController.dismiss();
- this.cloneAllmobileComponent.emit();
+ console.log('!!!!!!!!!!!!!!!!! close')
+ this.closeComponent.emit();
this.clearContact.emit();
}
save(){
@@ -67,10 +64,9 @@ export class EditEventComponent implements OnInit {
});
await alert.present();
});
- this.isEventEdited = true;
- // this.modalController.dismiss(this.isEventEdited);
- this.cloneAllmobileComponent.emit(this.isEventEdited);
+
+ this.closeComponent.emit();
this.clearContact.emit();
}
diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.component.ts
index 5d4408e9c..ba845ab01 100644
--- a/src/app/shared/agenda/event-list/event-list.component.ts
+++ b/src/app/shared/agenda/event-list/event-list.component.ts
@@ -36,7 +36,14 @@ export class EventListComponent implements OnInit {
ngOnInit() {
- console.log(this.profile);
+ /* console.log(this.profile); */
+
+ if(this.profile == "mdgpr"){
+ this.profile = 'MDGPR'
+ } else {
+ this.profile = 'PR'
+ }
+
this.LoadToApproveEvents();
this.router.events.forEach((event) => {