Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

My event removal fix #56

Merged
merged 1 commit into from
Jul 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/googol-card/googol-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export class GoogolCardComponent {
@Input() place: string;
@Input() action: string;
@Input() addEventFn: Function;
@Input() reloadView: Function;
@Input() address: string;
@Input() phone: string;

Expand Down Expand Up @@ -95,7 +96,4 @@ export class GoogolCardComponent {
actionSheet.present();
}

private reloadView() {
this.navCtrl.setRoot(this.navCtrl.getActive().component);
}
}
2 changes: 1 addition & 1 deletion src/pages/User/events/events.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

<ion-tabs tabsPlacement="top" style="margin-top: 45px;" (ionChange)="tabSelected($event)">
<ion-tab tabTitle="Todos" [root]="tab1" [rootParams]="allEvents"></ion-tab>
<ion-tab tabTitle="Criados por mim" [root]="tab2" [rootParams]="myEvents"></ion-tab>
<ion-tab tabTitle="Criados por mim" [root]="tab2" [rootParams]="myEventsParams"></ion-tab>
</ion-tabs>
</div>
29 changes: 20 additions & 9 deletions src/pages/User/events/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export class EventsPage implements OnInit{
private allEvents = [];
private myEvents = [];
currentTab = 0;
myEventsParams = {};

constructor(public navCtrl: NavController, private modalCtrl: ModalController,
private loadingController: LoadingController,
Expand All @@ -32,6 +33,11 @@ export class EventsPage implements OnInit{
ngOnInit() {
this.fetchAllEvents();
this.fetchMyEvents();

this.myEventsParams = {
myEvents: this.myEvents,
fetchMyEventsCb: this.fetchMyEvents.bind(this)
};
}

tabSelected(tab: Tab) {
Expand Down Expand Up @@ -61,10 +67,16 @@ export class EventsPage implements OnInit{
});
}

loading = this.loadingController.create({
content: 'Buscando eventos...',
spinner: 'bubbles'
});
loading(){
let loading = this.loadingController.create({
content: 'Por favor, aguarde...',
spinner: 'bubbles'
});

loading.present();

return loading;
}

filterAllEvents(bars, teams) {
bars = bars.map((bar) => bar._id);
Expand All @@ -85,21 +97,20 @@ export class EventsPage implements OnInit{
}

async fetchAllEvents(){
this.loading.present();
const loading = this.loading();

const events = await this.eventsService.getAll().toPromise();
events.sort((e1, e2) => {
return (+new Date(e1.match.matchDate)) - (+new Date(e2.match.matchDate));
});
this.allEvents.splice(0, this.allEvents.length);
this.allEvents.push(...events);
console.log('terminou fetch all events')
this.loading.dismiss();
loading.dismiss();

}

async fetchMyEvents(){
this.loading.present();
const loading = this.loading();

const auth = localStorage.getItem('authUser');
const userId = JSON.parse(auth).userId;
Expand All @@ -110,7 +121,7 @@ export class EventsPage implements OnInit{
});
this.myEvents.splice(0, this.myEvents.length);
this.myEvents.push(...events);
this.loading.dismiss();
loading.dismiss();
}

}
2 changes: 1 addition & 1 deletion src/pages/User/events/my-events/my-events.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ion-content padding>
<p *ngIf="events.length === 0" class="text-default-medium" text-center> Você ainda não criou nenhum evento!</p>
<googol-card *ngFor="let myEvent of events" [myEvent]="myEvent" action="CONFIRM_PRESENCE"></googol-card>
<googol-card *ngFor="let myEvent of events" [myEvent]="myEvent" [reloadView]="reload" action="CONFIRM_PRESENCE"></googol-card>
</ion-content>
12 changes: 7 additions & 5 deletions src/pages/User/events/my-events/my-events.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { LoadingController, NavParams } from 'ionic-angular/';
import { EventsService } from '../../../../_services/events';
import { Component } from '@angular/core';
import { NavParams, NavController } from 'ionic-angular/';
import { Event } from '../../../../_models/event';

@Component({
Expand All @@ -11,8 +10,11 @@ import { Event } from '../../../../_models/event';
export class MyEventsTab {

private events: Event[] = [];
reload: Function;

constructor(private navParams: NavParams){
this.events = navParams.data;
constructor(private navParams: NavParams, private navCtrl: NavController){
this.events = navParams.data.myEvents;
this.reload = navParams.data.fetchMyEventsCb;
}

}