Changes on Intervenientes + New Event

This commit is contained in:
Tiago Kayaya
2020-09-04 01:25:32 +01:00
parent b9a70fecb8
commit d82271ae37
13 changed files with 181 additions and 126 deletions
+10 -6
View File
@@ -1,3 +1,4 @@
<ion-header>
<ion-toolbar>
<ion-buttons slot="end">
@@ -26,13 +27,10 @@
</ion-toolbar>
</ion-header>
<ion-content>
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<app-cal-modal></app-cal-modal>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
refreshingSpinner="circles"
refreshingText="A actualizar...">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
<div [ngSwitch]="segment">
@@ -64,6 +62,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
(onTimeSelected)="onTimeSelected($event)"
(onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
@@ -113,6 +113,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
(onTimeSelected)="onTimeSelected($event)"
(onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
@@ -163,6 +165,8 @@
(onEventSelected)="onEventSelected($event)"
(onTitleChanged)="onViewTitleChanged($event)"
(onRangeChanged)="onRangeChanged($event)"
(onTimeSelected)="onTimeSelected($event)"
(onCurrentDateChanged)="onCurrentChanged($event)"
queryMode="remote"
startHour="6"
endHour="20"
+22
View File
@@ -27,6 +27,8 @@ export class AgendaPage implements OnInit {
};
selectedDate: Date;
eventSelectedDate: Date;
eventSelectedDate2: Date;
rangeStartDate: Date;
rangeEndDate: Date;
@@ -43,6 +45,7 @@ export class AgendaPage implements OnInit {
endTime: Date;
constructor(
private alertCtrl: AlertController,
@Inject(LOCALE_ID) private locale: string,
@@ -54,6 +57,8 @@ export class AgendaPage implements OnInit {
ngOnInit() {
//Inicializar segment
/* localStorage.setItem('test', this.eventSelectedDate.toString()); */
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == "/home/agenda") {
if (this.segment == null)
@@ -68,6 +73,8 @@ export class AgendaPage implements OnInit {
});
}
//Go to the next view of the calendar month/week/day
next(){
this.myCal.slideNext();
@@ -85,6 +92,15 @@ export class AgendaPage implements OnInit {
this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
}
onCurrentChanged = (ev: Date) => {
this.eventSelectedDate = ev;
};
onTimeSelected = (ev: { selectedTime: Date, events: any[] }) => {
console.log('Selected time: ' + ev.selectedTime + ', hasEvents: ' + (ev.events !== undefined && ev.events.length !== 0));
this.eventSelectedDate2 = ev.selectedTime;
};
onRangeChanged (ev: { startTime: Date, endTime: Date }) {
this.rangeStartDate = ev.startTime;
this.rangeEndDate = ev.endTime;
@@ -95,6 +111,10 @@ export class AgendaPage implements OnInit {
async openCalModal() {
const modal = await this.modalCtrl.create({
component: CalModalPage,
componentProps:{
segment: this.segment,
eventSelectedDate: this.eventSelectedDate,
},
cssClass: 'cal-modal',
backdropDismiss: false
});
@@ -203,4 +223,6 @@ export class AgendaPage implements OnInit {
showAlert(){
this.alertCrontroller.presentAlert("Funcionalidade em desenvolvimento.");
}
}