Improve generic components

This commit is contained in:
2021-02-24 10:08:50 +01:00
parent 7f5a698b20
commit 2336e6b83f
6 changed files with 59 additions and 29 deletions
+3 -4
View File
@@ -286,8 +286,8 @@
<div class="event-details bg-blue "> <div class="event-details bg-blue ">
<!-- New --> <!-- New -->
<app-new-event *ngIf="mobileComponent.showAddNewEvent" <app-new-event *ngIf="mobileComponent.showAddNewEvent"
style="height: 100%;display: flex;flex-wrap: wrap;"
[profile]="profile" [profile]="profile"
[selectedSegment]=segment [selectedSegment]=segment
@@ -296,8 +296,7 @@
></app-new-event> ></app-new-event>
<!-- Edit --> <!-- Edit -->
<app-edit-event *ngIf="mobileComponent.showEditEvent" <app-edit-event *ngIf="mobileComponent.showEditEvent"
style="height: 100%;display: flex;flex-wrap: wrap;"
[profile]="profile" [profile]="profile"
[selectedSegment]="segment" [selectedSegment]="segment"
+24
View File
@@ -544,3 +544,27 @@ td.monthview-primary-with-event {
display: block; display: block;
} }
} }
app-view-event{
height: 100%;
display: flex;
flex-wrap: wrap-reverse;
flex-direction: column;
}
app-edit-even{
height: 100%;
display: flex;
flex-wrap: wrap;
}
app-new-event{
height: 100%;
display: flex;
flex-wrap: wrap;
flex-direction: column;
}
+17 -14
View File
@@ -629,21 +629,24 @@ export class AgendaPage implements OnInit {
openAddEventDismiss(data){ openAddEventDismiss(data){
this.cloneAllmobileComponent(); this.cloneAllmobileComponent();
let postEvent: Event = data; if(data.type == 'save'){
if (postEvent.Subject != null) let postEvent: Event = data;
{ if (postEvent.Subject != null)
this.eventSource.push({ {
title: postEvent.Subject, this.eventSource.push({
startTime: new Date(postEvent.StartDate), title: postEvent.Subject,
endTime: new Date(postEvent.EndDate), startTime: new Date(postEvent.StartDate),
allDay: false, endTime: new Date(postEvent.EndDate),
event: postEvent allDay: false,
}); event: postEvent
this.myCal.update(); });
this.myCal.loadEvents(); this.myCal.update();
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); this.myCal.loadEvents();
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
this.mobileComponent.showAddNewEvent = false;
} }
this.mobileComponent.showAddNewEvent = false;
} }
async viewEventDetail(eventId:any) { async viewEventDetail(eventId:any) {
@@ -3,7 +3,7 @@
<div class="main-header"> <div class="main-header">
<div class="title-content"> <div class="title-content">
<div class="middle"> <div class="middle">
<ion-label class="title">Novo Evento1</ion-label> <ion-label class="title">Novo Evento</ion-label>
</div> </div>
</div> </div>
</div> </div>
@@ -90,12 +90,12 @@ export class NewEventPage implements OnInit {
} }
} }
close(){ close(){
this.modalController.dismiss(); this.onAddEvent.emit({
type:'close',
data: this.postEvent
});
} }
save(){ save(){
console.log(this.postEvent);
console.log(this.profile);
if(this.profile=='mdgpr'){ if(this.profile=='mdgpr'){
this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(); this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe();
@@ -104,7 +104,10 @@ export class NewEventPage implements OnInit {
this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(); this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe();
} }
this.onAddEvent.emit(this.postEvent); this.onAddEvent.emit({
type:'save',
data: this.postEvent
});
} }
async openAttendees() async openAttendees()
@@ -1,4 +1,4 @@
<ion-header class="ion-no-border">
<ion-toolbar class="header-toolbar"> <ion-toolbar class="header-toolbar">
<div class="main-header"> <div class="main-header">
<div class="title-content"> <div class="title-content">
@@ -15,9 +15,9 @@
</div> </div>
</div> </div>
</ion-toolbar> </ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content"> <div class="main-content">
<div class="upper-content"> <div class="upper-content">
<div class="content-location"> <div class="content-location">
@@ -67,3 +67,4 @@
</ion-list> </ion-list>
</div> </div>
</div> </div>
</ion-content>