Commit 77a6d2df authored by Dennis Willers's avatar Dennis Willers
Browse files

New Start just reset the point and does not directly start a new game

parent 05b07704

src/app/overview/overview.component.ts

+25 −21
Original line number Original line Diff line number Diff line
@@ -55,26 +55,7 @@ export class OverviewComponent implements OnInit { 
        this.router.navigate(['error']);

        this.router.navigate(['error']);

        return;

        return;

      }

      }

      this.service.getGamestatus({spielname: this.sessionName}).then(value => {

      this.getGameStatus();

        const status = JSON.parse(value.status);

        if (status) {

          this.gameStatus.sessionID = JSON.parse(value.sessionID);

          this.gameStatus.red = JSON.parse(value.red);

          this.gameStatus.blue = JSON.parse(value.blue);

          this.gameStatus.redTurn = JSON.parse(value.redTurn);

          this.gameStatus.activeExplainer = JSON.parse(value.activeExplainer);

          this.gameStatus.activeWatchdog = JSON.parse(value.activeWatchdog);

          if (this.gameStatus.redTurn){

            this.nextTeam = 'Rot';

            this.buttonNextRoundDisabled = this.team !== 'red';

          }

          else{

            this.nextTeam = 'Blau';

            this.buttonNextRoundDisabled = this.team !== 'blue';

          }

        }

        console.log(this.gameStatus);

      }).catch(reason => console.log(reason));

    });

    });

  }

  }
@@ -83,7 +64,7 @@ export class OverviewComponent implements OnInit { 
      this.service.newGame({spielname: this.sessionName}).then(value => {

      this.service.newGame({spielname: this.sessionName}).then(value => {

        const status = JSON.parse(value.status);

        const status = JSON.parse(value.status);

        if (status) {

        if (status) {

          this.router.navigate([this.router.url + '/explainer']);

          this.getGameStatus();

        }

        }

      }).catch(reason => console.log(reason));

      }).catch(reason => console.log(reason));

    }

    }
@@ -97,4 +78,27 @@ export class OverviewComponent implements OnInit { 
    this.team = team;

    this.team = team;

    this.router.navigate([this.sessionName + '/' + team]);

    this.router.navigate([this.sessionName + '/' + team]);

  }

  }



  getGameStatus(): void {

    this.service.getGamestatus({spielname: this.sessionName}).then(value => {

      const status = JSON.parse(value.status);

      if (status) {

        this.gameStatus.sessionID = JSON.parse(value.sessionID);

        this.gameStatus.red = JSON.parse(value.red);

        this.gameStatus.blue = JSON.parse(value.blue);

        this.gameStatus.redTurn = JSON.parse(value.redTurn);

        this.gameStatus.activeExplainer = JSON.parse(value.activeExplainer);

        this.gameStatus.activeWatchdog = JSON.parse(value.activeWatchdog);

        if (this.gameStatus.redTurn){

          this.nextTeam = 'Rot';

          this.buttonNextRoundDisabled = this.team !== 'red';

        }

        else{

          this.nextTeam = 'Blau';

          this.buttonNextRoundDisabled = this.team !== 'blue';

        }

      }

      console.log(this.gameStatus);

    }).catch(reason => console.log(reason));

  }

}
 
}