Auto close modal for table

This commit is contained in:
2021-02-24 20:23:15 +01:00
parent 5337173b43
commit 388aa6d2d4
7 changed files with 54 additions and 18 deletions
+1 -1
View File
@@ -556,7 +556,7 @@ app-view-event{
flex-direction: column; flex-direction: column;
} }
app-edit-even{ app-edit-event{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
+12 -2
View File
@@ -147,6 +147,16 @@ export class AgendaPage implements OnInit {
} }
} }
}); });
window.onresize = (event) => {
// if not table remove all component
if( window.innerWidth <= 1024){
console.log('mobile')
this.cloneAllmobileComponent();
}
};
} }
//Go to the next view of the calendar month/week/day //Go to the next view of the calendar month/week/day
@@ -211,8 +221,8 @@ export class AgendaPage implements OnInit {
} }
onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => { onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0)); console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
this.eventSelectedDate2 = ev.selectedTime; this.eventSelectedDate2 = ev.selectedTime;
}; };
onRangeChanged (ev: { startTime: Date, endTime: Date }) { onRangeChanged (ev: { startTime: Date, endTime: Date }) {
@@ -42,6 +42,13 @@ export class ApproveEventModalPage implements OnInit {
ngOnInit() { ngOnInit() {
this.getTask(); this.getTask();
this.getAttachments(); this.getAttachments();
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss(null);
}
};
} }
notImplemented(){ notImplemented(){
@@ -49,6 +49,13 @@ export class EditEventPage implements OnInit {
console.log(this.profile); console.log(this.profile);
console.log(this.postEvent); console.log(this.postEvent);
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
} }
close(){ close(){
this.modalController.dismiss(); this.modalController.dismiss();
@@ -87,6 +87,15 @@ export class NewEventPage implements OnInit {
HasAttachments: false, HasAttachments: false,
}; };
} }
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss();
}
};
} }
close(){ close(){
this.modalController.dismiss(); this.modalController.dismiss();
@@ -56,6 +56,14 @@ export class ViewEventPage implements OnInit {
this.loadEvent(); this.loadEvent();
this.getAttachments(); this.getAttachments();
window.onresize = (event) => {
// if not mobile remove all component
if( window.innerWidth >= 1024){
this.modalController.dismiss(this.isEventEdited);
}
};
} }
close(){ close(){
console.log(this.isEventEdited); console.log(this.isEventEdited);
@@ -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">
@@ -8,12 +8,12 @@
</div> </div>
</div> </div>
</ion-toolbar> </ion-toolbar>
</ion-header>
<ion-content>
<div class="main-content">
<div class="main-content" >
<div class="ion-item-container"> <div class="ion-item-container">
<ion-input class="text-black" placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input> <ion-input placeholder="Assunto" [(ngModel)]="postEvent.Subject"></ion-input>
</div> </div>
<div class="container-div"> <div class="container-div">
<div class="ion-item-class-2"> <div class="ion-item-class-2">
@@ -21,7 +21,7 @@
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon> <ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
</div> </div>
<div class="ion-input-class"> <div class="ion-input-class">
<ion-input class="text-black" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input> <ion-input placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
</div> </div>
</div> </div>
<!-- Error messages --> <!-- Error messages -->
@@ -39,7 +39,6 @@
<div class="ion-input-class"> <div class="ion-input-class">
<ion-select disabled placeholder="Selecione agenda" <ion-select disabled placeholder="Selecione agenda"
selectedText="{{postEvent.CalendarName}}" selectedText="{{postEvent.CalendarName}}"
class="text-black"
[(ngModel)]="postEvent.CalendarName" [(ngModel)]="postEvent.CalendarName"
interface="action-sheet" Cancel-text="Cancelar" interface="action-sheet" Cancel-text="Cancelar"
required> required>
@@ -60,7 +59,6 @@
[(ngModel)]="postEvent.Categories[0]" [(ngModel)]="postEvent.Categories[0]"
selectedText="{{postEvent.Categories[0]}}" selectedText="{{postEvent.Categories[0]}}"
interface="action-sheet" interface="action-sheet"
class="text-black"
Cancel-text="Cancelar" required> Cancel-text="Cancelar" required>
<ion-select-option value="Reunião">Reunião</ion-select-option> <ion-select-option value="Reunião">Reunião</ion-select-option>
<ion-select-option value="Viagem">Viagem</ion-select-option> <ion-select-option value="Viagem">Viagem</ion-select-option>
@@ -85,7 +83,6 @@
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2018" min="2018"
max="2022" max="2022"
class="text-black"
> >
</ion-datetime> </ion-datetime>
<!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> --> <!-- <ion-input placeholder="Data início" [(ngModel)]="postData.StartDate"></ion-input> -->
@@ -107,7 +104,6 @@
monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez" monthShortNames="Jan, Fev, Mar, Abr, Mai, Jun, Jul, Aug, Sep, Out, Nov, Dez"
min="2018" min="2018"
max="2022" max="2022"
class="text-black"
> >
</ion-datetime> </ion-datetime>
<!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> --> <!-- <ion-input placeholder="Data fim" [(ngModel)]="postData.EndDate"></ion-input> -->
@@ -122,7 +118,6 @@
</div> </div>
<div class="ion-input-class"> <div class="ion-input-class">
<ion-select placeholder="Selecione repetição" <ion-select placeholder="Selecione repetição"
class="text-black"
[(ngModel)]="postEvent.IsRecurring" [(ngModel)]="postEvent.IsRecurring"
selectedText="{{isRecurring}}" selectedText="{{isRecurring}}"
interface="action-sheet" interface="action-sheet"
@@ -212,10 +207,9 @@
</ion-list> </ion-list>
</div> </div>
</div> </div>
</ion-content>
<ion-footer class="ion-no-border">
<ion-toolbar class="btn-div">
<ion-toolbar class="btn-div d-flex justofy-center">
<ion-buttons slot="start"> <ion-buttons slot="start">
<ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()"> <ion-button class="btn-cancel" fill="clear" color="#061b52" (click)="close()">
<ion-label>Cancelar</ion-label> <ion-label>Cancelar</ion-label>
@@ -228,3 +222,4 @@
</ion-button> </ion-button>
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-footer>