diff --git a/MOBA-Manager/MOBA-Manager/Source/DataModel/Fixture.cs b/MOBA-Manager/MOBA-Manager/Source/DataModel/Fixture.cs index 1ffe27d..f15f0a5 100644 --- a/MOBA-Manager/MOBA-Manager/Source/DataModel/Fixture.cs +++ b/MOBA-Manager/MOBA-Manager/Source/DataModel/Fixture.cs @@ -9,8 +9,11 @@ public class Fixture private Team homeTeam; private Team awayTeam; - public Fixture(Team homeTeam, Team awayTeam) + public Fixture(Team homeTeam, Team awayTeam, DateTime matchTime) { + this.matchTime = matchTime; + this.homeTeam = homeTeam; + this.awayTeam = awayTeam; } } } \ No newline at end of file diff --git a/MOBA-Manager/MOBA-Manager/Source/Utilities/FixtureBuilder.cs b/MOBA-Manager/MOBA-Manager/Source/Utilities/FixtureBuilder.cs index a92dc22..2fd9de0 100644 --- a/MOBA-Manager/MOBA-Manager/Source/Utilities/FixtureBuilder.cs +++ b/MOBA-Manager/MOBA-Manager/Source/Utilities/FixtureBuilder.cs @@ -1,17 +1,25 @@ using MOBA_Manager.DataModel; +using MOBA_Manager.Game; using MOBA_Manager.Source.DataModel; using System; using System.Collections.Generic; +using System.Linq; namespace MOBA_Manager.Source.Utilities { public class FixtureBuilder { - private Team playerTeam; - public List GetNewFixtures(DateTime startingDate) + public List GetNewFixtures(DateTime startingDate, Session playerSession) { - throw new NotImplementedException(); + List fixtureList = new List(); + List teams = playerSession.TeamList; + for (int i = 0; i < teams.Count; i++) + { + Fixture f = new Fixture(playerSession.MainPlayer.Team, teams[i], startingDate); + + } + return fixtureList; } } diff --git a/MOBA-Manager/MOBA-Manager/Source/Utilities/SessionDirector.cs b/MOBA-Manager/MOBA-Manager/Source/Utilities/SessionDirector.cs index 585623d..e732ab5 100644 --- a/MOBA-Manager/MOBA-Manager/Source/Utilities/SessionDirector.cs +++ b/MOBA-Manager/MOBA-Manager/Source/Utilities/SessionDirector.cs @@ -1,5 +1,6 @@ using MOBA_Manager.DataModel; using MOBA_Manager.Source.DataModel; +using MOBA_Manager.Source.Utilities; using System; using System.Collections.Generic; @@ -42,12 +43,11 @@ private void LoadGameEntities() this.session.SetPlayerData(LoadPlayers()); this.session.BuyablePlayers = LoadBuyablePlayers(); this.session.SetTeamData(LoadTeams()); - this.session.FixturesList = GenerateInitialFixtures(); } private List GenerateInitialFixtures() { - return new List(); + return new FixtureBuilder().GetNewFixtures(this.session.GameTime, this.session); } private List LoadBuyablePlayers() @@ -75,7 +75,9 @@ private void SetUserCreationUI() public Session SetSessionUser(User user) { - return this.session.SetUser(user); + this.session.SetUser(user); + this.session.FixturesList = GenerateInitialFixtures(); + return this.session; } } } \ No newline at end of file diff --git a/MOBA-Manager/MOBA-Manager/Source/Utilities/TeamGenerator.cs b/MOBA-Manager/MOBA-Manager/Source/Utilities/TeamGenerator.cs index 8f174a0..a091f09 100644 --- a/MOBA-Manager/MOBA-Manager/Source/Utilities/TeamGenerator.cs +++ b/MOBA-Manager/MOBA-Manager/Source/Utilities/TeamGenerator.cs @@ -30,7 +30,7 @@ private List GenerateListOfTeams(List teamList) return teamList; } - private string[] GetTeamNames() + public static string[] GetTeamNames() { string[] teamNames = { "Blue Azuls",