Merge branch 'feature/calendar' into developer

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<any>();
 
 
-  @Output() cloneAllmobileComponent = new EventEmitter<any>();
   @Output() openAttendeesComponent = new EventEmitter<any>();
+  @Output() closeComponent = new EventEmitter<any>();
 
   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();
   }
 

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) => {