From 193b44eed8ab3e8279eb41423e4c908c2e056fcc Mon Sep 17 00:00:00 2001
From: Joachim <joachim@nielandt.be>
Date: Sat, 1 Sep 2018 13:41:47 +0200
Subject: [PATCH] can now display poules, have to fill in that functionality

---
 src/app/app-routing.module.ts              |  2 +-
 src/app/championship.service.ts            | 23 +++++++++++++++++++---
 src/app/content/poule/poule.component.html |  2 +-
 src/app/content/poule/poule.component.ts   | 14 +++++++++++--
 src/app/content/tier/tier.component.html   |  5 +----
 src/app/content/tier/tier.component.ts     | 23 +++++++++++++++++++++-
 6 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 31eab85..9c8f211 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -9,7 +9,7 @@ const routes: Routes = [
     path: 'championship/:idchampionship',
     component: ChampionshipComponent,
     children: [
-      {path: 'tier/:idtier', component: TierComponent},
+      {path: 'tier/:tier', component: TierComponent},
     ]
   },
 ];
diff --git a/src/app/championship.service.ts b/src/app/championship.service.ts
index 5779816..c6ee9f1 100644
--- a/src/app/championship.service.ts
+++ b/src/app/championship.service.ts
@@ -1,7 +1,7 @@
 import {Injectable, OnInit} from '@angular/core';
 import {HttpClient, HttpHeaders} from '@angular/common/http';
 import {ActivatedRoute} from '@angular/router';
-import {BehaviorSubject} from 'rxjs';
+import {BehaviorSubject, Observable} from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -35,7 +35,7 @@ export class ChampionshipService implements OnInit {
     this.idChampionship.subscribe(id => {
       console.log('idchamp');
       console.log(id);
-      if(id) {
+      if (id) {
         this.loadTiers(id);
       }
     });
@@ -54,7 +54,7 @@ export class ChampionshipService implements OnInit {
     this.http.get<any[]>(`${this.baseUrl}championship/${idChampionship}/tiers`, this.httpOptions).subscribe(val => {
       console.log('loaded tiers for championship');
       console.log(val);
-      this.tiers.next(val.map(v => v.tier));
+      this.tiers.next(val.map(v => v));
     });
   }
 
@@ -67,6 +67,7 @@ export class ChampionshipService implements OnInit {
    * @param idChampionship
    */
   setChampionship(idChampionship: number) {
+    console.log('championship is set to ' + idChampionship);
     this.idChampionship.next(idChampionship);
   }
 
@@ -74,6 +75,13 @@ export class ChampionshipService implements OnInit {
     return this.championships;
   }
 
+  getIdChampionship(): BehaviorSubject<number> {
+    return this.idChampionship;
+  }
+
+  /**
+   * This looks up the current state, synchronous, and returns the championship value.
+   */
   getCurrentChampionship() {
     const theOne = this.championships.filter(val => val.idchampionship === this.idChampionship.value);
     if (theOne && theOne.length > 0) {
@@ -85,4 +93,13 @@ export class ChampionshipService implements OnInit {
 
   ngOnInit(): void {
   }
+
+  /**
+   * Fetch the existing poule numbers for idchampionship / tier combination.
+   * @param tier
+   * @param idchampionship
+   */
+  getPoules(tier: number, idChampionship: any): Observable<number[]> {
+    return this.http.get<any[]>(`${this.baseUrl}championship/${idChampionship}/tier/${tier}/poules`, this.httpOptions);
+  }
 }
diff --git a/src/app/content/poule/poule.component.html b/src/app/content/poule/poule.component.html
index 2874c8a..f6f6969 100644
--- a/src/app/content/poule/poule.component.html
+++ b/src/app/content/poule/poule.component.html
@@ -1,7 +1,7 @@
 <mat-card>
   <mat-card-header>
     <mat-card-title>
-      Poule 1
+      Poule {{poule}} {{tier}} {{idChampionship}}
     </mat-card-title>
   </mat-card-header>
   <mat-card-content>
diff --git a/src/app/content/poule/poule.component.ts b/src/app/content/poule/poule.component.ts
index 84f6b79..0c364fd 100644
--- a/src/app/content/poule/poule.component.ts
+++ b/src/app/content/poule/poule.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
 @Component({
   selector: 'app-poule',
@@ -7,7 +7,17 @@ import { Component, OnInit } from '@angular/core';
 })
 export class PouleComponent implements OnInit {
 
-  constructor() { }
+  @Input()
+  poule: number;
+
+  @Input()
+  idChampionship: number;
+
+  @Input()
+  tier: number;
+
+  constructor() {
+  }
 
   ngOnInit() {
   }
diff --git a/src/app/content/tier/tier.component.html b/src/app/content/tier/tier.component.html
index 27eca84..d2d0635 100644
--- a/src/app/content/tier/tier.component.html
+++ b/src/app/content/tier/tier.component.html
@@ -1,4 +1 @@
-<app-poule></app-poule>
-<app-poule></app-poule>
-<app-poule></app-poule>
-<app-poule></app-poule>
+<app-poule *ngFor="let poule of poules" [poule]="poule" [idChampionship]="idChampionship" [tier]="tier"></app-poule>
diff --git a/src/app/content/tier/tier.component.ts b/src/app/content/tier/tier.component.ts
index b1e2e0e..6477672 100644
--- a/src/app/content/tier/tier.component.ts
+++ b/src/app/content/tier/tier.component.ts
@@ -1,6 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, ParamMap} from '@angular/router';
 import {ChampionshipService} from '../../championship.service';
+import {combineLatest} from 'rxjs';
+import {map} from 'rxjs/operators';
 
 @Component({
   selector: 'app-tier',
@@ -9,8 +11,27 @@ import {ChampionshipService} from '../../championship.service';
 })
 export class TierComponent implements OnInit {
 
+  protected tier: number;
+  protected poules: number[] = [];
+  protected idChampionship: number;
+
   constructor(private route: ActivatedRoute, private championshipService: ChampionshipService) {
 
+    // we need the current championship and we need the current tier... combine them
+    combineLatest(
+      this.route.paramMap.pipe(map(val => +val.get('tier'))),
+      this.championshipService.getIdChampionship()
+    ).subscribe(([tier, idChampionship]) => {
+      // now we have both, or one of them changed...
+      if (tier && idChampionship) {
+        this.tier = tier;
+        this.idChampionship = idChampionship;
+        // ... load the corresponding poules
+        this.championshipService.getPoules(tier, idChampionship).subscribe(poules => {
+          this.poules = poules;
+        });
+      }
+    });
   }
 
   ngOnInit() {