Skip to content

Commit

Permalink
feat update code2
Browse files Browse the repository at this point in the history
gi
  • Loading branch information
sansan88 committed Jan 14, 2024
1 parent 3b8a5c9 commit 76a022f
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 19 deletions.
14 changes: 0 additions & 14 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: () =>
Expand Down
7 changes: 7 additions & 0 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/app/pages/event/events/events.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions src/app/pages/helfer/helfer-detail/helfer-detail.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
5 changes: 3 additions & 2 deletions src/app/pages/helfer/helfer/helfer.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: "",
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 76a022f

Please sign in to comment.