diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6c37371b..dd298170 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -129,20 +129,6 @@ const routes: Routes = [ (m) => m.HelferPageModule ), }, - { - path: "helfer-add", - loadChildren: () => - import("./pages/helfer/helfer-add/helfer-add.module").then( - (m) => m.HelferAddPageModule - ), - }, - { - path: "helfer-detail", - loadChildren: () => - import("./pages/helfer/helfer-detail/helfer-detail.module").then( - (m) => m.HelferDetailPageModule - ), - }, { path: "lineup", loadChildren: () => diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d94084e5..d90c576c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -47,19 +47,26 @@ import { TeamPage } from "./pages/team/team-detail/team.page"; import { Capacitor } from "@capacitor/core"; import { TranslateModule, TranslateLoader } from "@ngx-translate/core"; import { TranslateHttpLoader } from "@ngx-translate/http-loader"; +import { HelferDetailPage } from "./pages/helfer/helfer-detail/helfer-detail.page"; +import { HelferAddPage } from "./pages/helfer/helfer-add/helfer-add.page"; @NgModule({ declarations: [ AppComponent, NewsDetailPage, MemberPage, + HelferPunktePage, + HelferDetailPage, + HelferAddPage, // ChampionshipDetailPage, TrainingExercisesPage, TrainingDetailPage, TrainingCreatePage, + EventAddPage, EventDetailPage, + OnboardingPage, ClubPage, TeamPage, diff --git a/src/app/pages/event/events/events.page.ts b/src/app/pages/event/events/events.page.ts index cf638f21..cde7aee8 100644 --- a/src/app/pages/event/events/events.page.ts +++ b/src/app/pages/event/events/events.page.ts @@ -64,7 +64,7 @@ export class EventsPage implements OnInit { this.activatedRoute.url.subscribe(data=>{ if ( this.router.getCurrentNavigation().extras && this.router.getCurrentNavigation().extras.state && this.router.getCurrentNavigation().extras.state.type === "clubEvent") { const pushData = this.router.getCurrentNavigation().extras.state; - console.log("PUSHDATA " + pushData); + console.log("PUSHDATA " + JSON.stringify(pushData)); let clubEvent: Veranstaltung = { id: pushData.id, name: "", @@ -438,6 +438,8 @@ export class EventsPage implements OnInit { } async openEventDetailModal(event: Veranstaltung, isFuture: boolean) { + console.log("Open Modal"); + console.log(JSON.stringify(event)); const modal = await this.modalCtrl.create({ component: EventDetailPage, presentingElement: this.routerOutlet.nativeEl, diff --git a/src/app/pages/helfer/helfer-detail/helfer-detail.page.ts b/src/app/pages/helfer/helfer-detail/helfer-detail.page.ts index 4cd2e8e6..ecd03798 100644 --- a/src/app/pages/helfer/helfer-detail/helfer-detail.page.ts +++ b/src/app/pages/helfer/helfer-detail/helfer-detail.page.ts @@ -61,9 +61,7 @@ export class HelferDetailPage implements OnInit { ngOnInit() { this.event = this.navParams.get("data"); - console.log(this.event); this.event$ = of(this.event); - this.event$ = this.getHelferEvent(this.event.clubId, this.event.id); this.schichten$ = this.getHelferEventSchichtenWithAttendees( diff --git a/src/app/pages/helfer/helfer/helfer.page.ts b/src/app/pages/helfer/helfer/helfer.page.ts index 8fa81a28..f490a86a 100644 --- a/src/app/pages/helfer/helfer/helfer.page.ts +++ b/src/app/pages/helfer/helfer/helfer.page.ts @@ -67,7 +67,7 @@ export class HelferPage implements OnInit { this.activatedRoute.url.subscribe(data=>{ if ( this.router.getCurrentNavigation().extras && this.router.getCurrentNavigation().extras.state && this.router.getCurrentNavigation().extras.state.type === "helferEvent") { const pushData = this.router.getCurrentNavigation().extras.state; - console.log("PUSHDATA " + pushData); + console.log("PUSHDATA " + JSON.stringify(pushData)); let helferEvent: HelferEvent = { id: "", name: "", @@ -445,7 +445,8 @@ export class HelferPage implements OnInit { } async openEventDetailModal(event: HelferEvent, isFuture: boolean) { - // const presentingElement = await this.modalCtrl.getTop(); + console.log("Open Modal"); + console.log(JSON.stringify(event)); const modal = await this.modalCtrl.create({ component: HelferDetailPage, presentingElement: this.routerOutlet.nativeEl,