diff --git a/TrackerUI/CreatePrizeForm.cs b/TrackerUI/CreatePrizeForm.cs index 1df5eb5..92ffe11 100644 --- a/TrackerUI/CreatePrizeForm.cs +++ b/TrackerUI/CreatePrizeForm.cs @@ -14,9 +14,12 @@ namespace TrackerUI { public partial class CreatePrizeForm : Form { - public CreatePrizeForm() + IPrizeRequester callingForm; + + public CreatePrizeForm(IPrizeRequester caller) { InitializeComponent(); + callingForm = caller; } private void createPrizeButton_Click(object sender, EventArgs e) @@ -31,10 +34,12 @@ namespace TrackerUI GlobalConfig.Connection.CreatePrize(model); - placeNameValue.Text = ""; - placeNumberValue.Text = ""; - prizeAmountValue.Text = "0"; - prizePercentageValue.Text = "0"; + callingForm.PrizeComplete(model); + this.Close(); + //placeNameValue.Text = ""; + //placeNumberValue.Text = ""; + //prizeAmountValue.Text = "0"; + //prizePercentageValue.Text = "0"; } else { diff --git a/TrackerUI/CreateTeamForm.cs b/TrackerUI/CreateTeamForm.cs index ae55463..9359766 100644 --- a/TrackerUI/CreateTeamForm.cs +++ b/TrackerUI/CreateTeamForm.cs @@ -14,11 +14,15 @@ namespace TrackerUI { public partial class CreateTeamForm : Form { + private ITeamRequester callingForm; + private List availableTeamMembers = GlobalConfig.Connection.GetPerson_All(); private List selectedTeamMembers = new List(); - public CreateTeamForm() + public CreateTeamForm(ITeamRequester caller) { InitializeComponent(); + callingForm = caller; + //CreateSampleData(); WireUpLists(); } @@ -128,9 +132,10 @@ namespace TrackerUI t.TeamName = createdTeamNameValue.Text; t.TeamMembers = selectedTeamMembers; - t = GlobalConfig.Connection.CreateTeam(t); - - // TODO - if we arent closing the form after insertion , reset the form + GlobalConfig.Connection.CreateTeam(t); + callingForm.TeamComplete(t); + this.Close(); + } } } diff --git a/TrackerUI/CreateTournamentForm.Designer.cs b/TrackerUI/CreateTournamentForm.Designer.cs index 5c1a5b2..1687240 100644 --- a/TrackerUI/CreateTournamentForm.Designer.cs +++ b/TrackerUI/CreateTournamentForm.Designer.cs @@ -41,8 +41,8 @@ this.cratePrizeButton = new System.Windows.Forms.Button(); this.tournamentTeamsListBox = new System.Windows.Forms.ListBox(); this.tournamentPlayersLabel = new System.Windows.Forms.Label(); - this.deleteSelectedPlayerButton = new System.Windows.Forms.Button(); - this.deleteSelectedPrizeButton = new System.Windows.Forms.Button(); + this.removeSelectedPlayerButton = new System.Windows.Forms.Button(); + this.removeSelectedPrizeButton = new System.Windows.Forms.Button(); this.prizesLabel = new System.Windows.Forms.Label(); this.prizesListBox = new System.Windows.Forms.ListBox(); this.createTournamentButton = new System.Windows.Forms.Button(); @@ -124,6 +124,7 @@ this.createNewTeamLink.TabIndex = 15; this.createNewTeamLink.TabStop = true; this.createNewTeamLink.Text = "Create New Team"; + this.createNewTeamLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.createNewTeamLink_LinkClicked); // // addTeamButton // @@ -138,6 +139,7 @@ this.addTeamButton.TabIndex = 16; this.addTeamButton.Text = "Add Team"; this.addTeamButton.UseVisualStyleBackColor = true; + this.addTeamButton.Click += new System.EventHandler(this.addTeamButton_Click); // // cratePrizeButton // @@ -152,6 +154,7 @@ this.cratePrizeButton.TabIndex = 17; this.cratePrizeButton.Text = "Create Prize"; this.cratePrizeButton.UseVisualStyleBackColor = true; + this.cratePrizeButton.Click += new System.EventHandler(this.cratePrizeButton_Click); // // tournamentTeamsListBox // @@ -174,33 +177,34 @@ this.tournamentPlayersLabel.TabIndex = 19; this.tournamentPlayersLabel.Text = "Teams / Players"; // - // deleteSelectedPlayerButton + // removeSelectedPlayerButton // - this.deleteSelectedPlayerButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; - this.deleteSelectedPlayerButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DimGray; - this.deleteSelectedPlayerButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.WhiteSmoke; - this.deleteSelectedPlayerButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.deleteSelectedPlayerButton.ForeColor = System.Drawing.Color.DodgerBlue; - this.deleteSelectedPlayerButton.Location = new System.Drawing.Point(796, 159); - this.deleteSelectedPlayerButton.Name = "deleteSelectedPlayerButton"; - this.deleteSelectedPlayerButton.Size = new System.Drawing.Size(125, 73); - this.deleteSelectedPlayerButton.TabIndex = 20; - this.deleteSelectedPlayerButton.Text = "Delete Selected"; - this.deleteSelectedPlayerButton.UseVisualStyleBackColor = true; + this.removeSelectedPlayerButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; + this.removeSelectedPlayerButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DimGray; + this.removeSelectedPlayerButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.WhiteSmoke; + this.removeSelectedPlayerButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.removeSelectedPlayerButton.ForeColor = System.Drawing.Color.DodgerBlue; + this.removeSelectedPlayerButton.Location = new System.Drawing.Point(796, 159); + this.removeSelectedPlayerButton.Name = "removeSelectedPlayerButton"; + this.removeSelectedPlayerButton.Size = new System.Drawing.Size(125, 73); + this.removeSelectedPlayerButton.TabIndex = 20; + this.removeSelectedPlayerButton.Text = "Remove Selected"; + this.removeSelectedPlayerButton.UseVisualStyleBackColor = true; + this.removeSelectedPlayerButton.Click += new System.EventHandler(this.removeSelectedPlayerButton_Click); // - // deleteSelectedPrizeButton + // removeSelectedPrizeButton // - this.deleteSelectedPrizeButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; - this.deleteSelectedPrizeButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DimGray; - this.deleteSelectedPrizeButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.WhiteSmoke; - this.deleteSelectedPrizeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.deleteSelectedPrizeButton.ForeColor = System.Drawing.Color.DodgerBlue; - this.deleteSelectedPrizeButton.Location = new System.Drawing.Point(796, 365); - this.deleteSelectedPrizeButton.Name = "deleteSelectedPrizeButton"; - this.deleteSelectedPrizeButton.Size = new System.Drawing.Size(125, 73); - this.deleteSelectedPrizeButton.TabIndex = 23; - this.deleteSelectedPrizeButton.Text = "Delete Selected"; - this.deleteSelectedPrizeButton.UseVisualStyleBackColor = true; + this.removeSelectedPrizeButton.FlatAppearance.BorderColor = System.Drawing.Color.Silver; + this.removeSelectedPrizeButton.FlatAppearance.MouseDownBackColor = System.Drawing.Color.DimGray; + this.removeSelectedPrizeButton.FlatAppearance.MouseOverBackColor = System.Drawing.Color.WhiteSmoke; + this.removeSelectedPrizeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.removeSelectedPrizeButton.ForeColor = System.Drawing.Color.DodgerBlue; + this.removeSelectedPrizeButton.Location = new System.Drawing.Point(796, 365); + this.removeSelectedPrizeButton.Name = "removeSelectedPrizeButton"; + this.removeSelectedPrizeButton.Size = new System.Drawing.Size(125, 73); + this.removeSelectedPrizeButton.TabIndex = 23; + this.removeSelectedPrizeButton.Text = "Remove Selected"; + this.removeSelectedPrizeButton.UseVisualStyleBackColor = true; // // prizesLabel // @@ -244,10 +248,10 @@ this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(945, 594); this.Controls.Add(this.createTournamentButton); - this.Controls.Add(this.deleteSelectedPrizeButton); + this.Controls.Add(this.removeSelectedPrizeButton); this.Controls.Add(this.prizesLabel); this.Controls.Add(this.prizesListBox); - this.Controls.Add(this.deleteSelectedPlayerButton); + this.Controls.Add(this.removeSelectedPlayerButton); this.Controls.Add(this.tournamentPlayersLabel); this.Controls.Add(this.tournamentTeamsListBox); this.Controls.Add(this.cratePrizeButton); @@ -284,8 +288,8 @@ private System.Windows.Forms.Button cratePrizeButton; private System.Windows.Forms.ListBox tournamentTeamsListBox; private System.Windows.Forms.Label tournamentPlayersLabel; - private System.Windows.Forms.Button deleteSelectedPlayerButton; - private System.Windows.Forms.Button deleteSelectedPrizeButton; + private System.Windows.Forms.Button removeSelectedPlayerButton; + private System.Windows.Forms.Button removeSelectedPrizeButton; private System.Windows.Forms.Label prizesLabel; private System.Windows.Forms.ListBox prizesListBox; private System.Windows.Forms.Button createTournamentButton; diff --git a/TrackerUI/CreateTournamentForm.cs b/TrackerUI/CreateTournamentForm.cs index 528123e..864c4ec 100644 --- a/TrackerUI/CreateTournamentForm.cs +++ b/TrackerUI/CreateTournamentForm.cs @@ -12,23 +12,84 @@ using TrackerLibrary.Models; namespace TrackerUI { - public partial class CreateTournamentForm : Form + public partial class CreateTournamentForm : Form, IPrizeRequester, ITeamRequester { List availableTeams = GlobalConfig.Connection.GetTeam_All(); List selectedTeams = new List(); + List selectedPrizes = new List(); public CreateTournamentForm() { InitializeComponent(); - InitializeLists(); + WireUpLists(); } - private void InitializeLists() + private void WireUpLists() { + selectTeamDropDown.DataSource = null; selectTeamDropDown.DataSource = availableTeams; selectTeamDropDown.DisplayMember = "TeamName"; + tournamentTeamsListBox.DataSource = null; tournamentTeamsListBox.DataSource = selectedTeams; tournamentTeamsListBox.DisplayMember = "TeamName"; + + prizesListBox.DataSource = null; + prizesListBox.DataSource = selectedPrizes; + prizesListBox.DisplayMember = "PlaceName"; + } + + private void addTeamButton_Click(object sender, EventArgs e) + { + TeamModel t = (TeamModel)selectTeamDropDown.SelectedItem; + if(t != null) + { + availableTeams.Remove(t); + selectedTeams.Add(t); + + WireUpLists(); + } + } + + private void cratePrizeButton_Click(object sender, EventArgs e) + { + // Call the CreatePrizeForm + CreatePrizeForm frm = new CreatePrizeForm(this); + frm.Show(); + + } + + public void PrizeComplete(PrizeModel model) + { + // Get back from the form a PrizeModel + // Take the PrizeModel and put it into our list of selected prizes + selectedPrizes.Add(model); + WireUpLists(); + } + + public void TeamComplete(TeamModel model) + { + selectedTeams.Add(model); + WireUpLists(); + } + + private void createNewTeamLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + CreateTeamForm frm = new CreateTeamForm(this); + frm.Show(); + } + + private void removeSelectedPlayerButton_Click(object sender, EventArgs e) + { + + //PersonModel p = (PersonModel)teamMembersListBox.SelectedItem; + + //if (p != null) + //{ + // selectedTeamMembers.Remove(p); + // availableTeamMembers.Add(p); + + // WireUpLists(); + //} } } } diff --git a/TrackerUI/IPrizeRequester.cs b/TrackerUI/IPrizeRequester.cs new file mode 100644 index 0000000..ee6ea76 --- /dev/null +++ b/TrackerUI/IPrizeRequester.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TrackerLibrary.Models; + +namespace TrackerUI +{ + public interface IPrizeRequester + { + void PrizeComplete(PrizeModel model); + } +} diff --git a/TrackerUI/ITeamRequester.cs b/TrackerUI/ITeamRequester.cs new file mode 100644 index 0000000..7e43645 --- /dev/null +++ b/TrackerUI/ITeamRequester.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TrackerLibrary.Models; + +namespace TrackerUI +{ + public interface ITeamRequester + { + void TeamComplete(TeamModel model); + } +} diff --git a/TrackerUI/TrackerUI.csproj b/TrackerUI/TrackerUI.csproj index 2615348..68f20fe 100644 --- a/TrackerUI/TrackerUI.csproj +++ b/TrackerUI/TrackerUI.csproj @@ -64,6 +64,8 @@ CreateTournamentForm.cs + + Form