diff --git a/.vs/ProjectEvaluation/sportcompetitions.metadata.v7.bin b/.vs/ProjectEvaluation/sportcompetitions.metadata.v7.bin index e023f61..318fece 100644 Binary files a/.vs/ProjectEvaluation/sportcompetitions.metadata.v7.bin and b/.vs/ProjectEvaluation/sportcompetitions.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/sportcompetitions.projects.v7.bin b/.vs/ProjectEvaluation/sportcompetitions.projects.v7.bin index 0d01198..eb68bc1 100644 Binary files a/.vs/ProjectEvaluation/sportcompetitions.projects.v7.bin and b/.vs/ProjectEvaluation/sportcompetitions.projects.v7.bin differ diff --git a/.vs/SportCompetitions/DesignTimeBuild/.dtbcache.v2 b/.vs/SportCompetitions/DesignTimeBuild/.dtbcache.v2 index 602e1d6..d31ca5b 100644 Binary files a/.vs/SportCompetitions/DesignTimeBuild/.dtbcache.v2 and b/.vs/SportCompetitions/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/SportCompetitions/FileContentIndex/1f3510c4-a822-47c7-8418-521e0db0fcc1.vsidx b/.vs/SportCompetitions/FileContentIndex/1f3510c4-a822-47c7-8418-521e0db0fcc1.vsidx deleted file mode 100644 index fbbbaac..0000000 Binary files a/.vs/SportCompetitions/FileContentIndex/1f3510c4-a822-47c7-8418-521e0db0fcc1.vsidx and /dev/null differ diff --git a/.vs/SportCompetitions/FileContentIndex/2ede42c9-91fc-496c-b9dd-330acebbd502.vsidx b/.vs/SportCompetitions/FileContentIndex/2ede42c9-91fc-496c-b9dd-330acebbd502.vsidx new file mode 100644 index 0000000..269c285 Binary files /dev/null and b/.vs/SportCompetitions/FileContentIndex/2ede42c9-91fc-496c-b9dd-330acebbd502.vsidx differ diff --git a/.vs/SportCompetitions/FileContentIndex/3ed18e8a-9078-43b2-9a9b-cf899196a96f.vsidx b/.vs/SportCompetitions/FileContentIndex/3ed18e8a-9078-43b2-9a9b-cf899196a96f.vsidx new file mode 100644 index 0000000..ddba3d7 Binary files /dev/null and b/.vs/SportCompetitions/FileContentIndex/3ed18e8a-9078-43b2-9a9b-cf899196a96f.vsidx differ diff --git a/.vs/SportCompetitions/FileContentIndex/4dbf6f3c-7a17-4ee9-b376-3c0d23b6c60e.vsidx b/.vs/SportCompetitions/FileContentIndex/4dbf6f3c-7a17-4ee9-b376-3c0d23b6c60e.vsidx new file mode 100644 index 0000000..c2bab7c Binary files /dev/null and b/.vs/SportCompetitions/FileContentIndex/4dbf6f3c-7a17-4ee9-b376-3c0d23b6c60e.vsidx differ diff --git a/.vs/SportCompetitions/FileContentIndex/52fd81fb-d94e-4486-a66a-4f0f5a0ddab7.vsidx b/.vs/SportCompetitions/FileContentIndex/52fd81fb-d94e-4486-a66a-4f0f5a0ddab7.vsidx deleted file mode 100644 index a8b8c52..0000000 Binary files a/.vs/SportCompetitions/FileContentIndex/52fd81fb-d94e-4486-a66a-4f0f5a0ddab7.vsidx and /dev/null differ diff --git a/.vs/SportCompetitions/FileContentIndex/98113743-2fb1-4a26-b5ec-30c9266bc956.vsidx b/.vs/SportCompetitions/FileContentIndex/98113743-2fb1-4a26-b5ec-30c9266bc956.vsidx deleted file mode 100644 index 12e984d..0000000 Binary files a/.vs/SportCompetitions/FileContentIndex/98113743-2fb1-4a26-b5ec-30c9266bc956.vsidx and /dev/null differ diff --git a/.vs/SportCompetitions/FileContentIndex/aa542a7a-73fb-44ec-b209-fc1721ce53e7.vsidx b/.vs/SportCompetitions/FileContentIndex/aa542a7a-73fb-44ec-b209-fc1721ce53e7.vsidx deleted file mode 100644 index c83b38f..0000000 Binary files a/.vs/SportCompetitions/FileContentIndex/aa542a7a-73fb-44ec-b209-fc1721ce53e7.vsidx and /dev/null differ diff --git a/.vs/SportCompetitions/FileContentIndex/d47b6473-79a4-4de8-932e-59db2e1d9f0d.vsidx b/.vs/SportCompetitions/FileContentIndex/d47b6473-79a4-4de8-932e-59db2e1d9f0d.vsidx new file mode 100644 index 0000000..136a79e Binary files /dev/null and b/.vs/SportCompetitions/FileContentIndex/d47b6473-79a4-4de8-932e-59db2e1d9f0d.vsidx differ diff --git a/.vs/SportCompetitions/FileContentIndex/f9fa2e26-50b1-4857-86f5-ef4ce5b82eb0.vsidx b/.vs/SportCompetitions/FileContentIndex/f9fa2e26-50b1-4857-86f5-ef4ce5b82eb0.vsidx deleted file mode 100644 index b6c4962..0000000 Binary files a/.vs/SportCompetitions/FileContentIndex/f9fa2e26-50b1-4857-86f5-ef4ce5b82eb0.vsidx and /dev/null differ diff --git a/.vs/SportCompetitions/v17/.futdcache.v2 b/.vs/SportCompetitions/v17/.futdcache.v2 index 5ad01ef..ce804af 100644 Binary files a/.vs/SportCompetitions/v17/.futdcache.v2 and b/.vs/SportCompetitions/v17/.futdcache.v2 differ diff --git a/.vs/SportCompetitions/v17/.suo b/.vs/SportCompetitions/v17/.suo index 1b1636d..f0e329c 100644 Binary files a/.vs/SportCompetitions/v17/.suo and b/.vs/SportCompetitions/v17/.suo differ diff --git a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll index be2350e..5900d4b 100644 Binary files a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll and b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll differ diff --git a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb index 86469dc..44e6c98 100644 Binary files a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb and b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb differ diff --git a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.dll b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.dll index f1eefae..3355b32 100644 Binary files a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.dll and b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.pdb b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.pdb index 580fc38..177bbc7 100644 Binary files a/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.pdb and b/SportCompetitionsBusinessLogic/bin/Debug/net7.0/SportCompetitionsContracts.pdb differ diff --git a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.csproj.AssemblyReference.cache b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.csproj.AssemblyReference.cache index 944bb09..1be4069 100644 Binary files a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.csproj.AssemblyReference.cache and b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.csproj.AssemblyReference.cache differ diff --git a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.dll b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.dll index be2350e..5900d4b 100644 Binary files a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.dll and b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.dll differ diff --git a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.pdb b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.pdb index 86469dc..44e6c98 100644 Binary files a/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.pdb and b/SportCompetitionsBusinessLogic/obj/Debug/net7.0/SportCompetitionsBusinessLogic.pdb differ diff --git a/SportCompetitionsContracts/BindingModels/MemberBindingModel.cs b/SportCompetitionsContracts/BindingModels/MemberBindingModel.cs index e8414ab..cf710fe 100644 --- a/SportCompetitionsContracts/BindingModels/MemberBindingModel.cs +++ b/SportCompetitionsContracts/BindingModels/MemberBindingModel.cs @@ -11,7 +11,7 @@ namespace SportCompetitionsContracts.BindingModels { public int Id { get; set; } public string? MemberFCs { get; set; } - public DateTime MemberBirthDate { get; } + public DateTime MemberBirthDate { get; set; } public string? MemberGender { get; set; } public int TeamId { get; set; } diff --git a/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.dll b/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.dll index f1eefae..3355b32 100644 Binary files a/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.dll and b/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.pdb b/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.pdb index 580fc38..177bbc7 100644 Binary files a/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.pdb and b/SportCompetitionsContracts/bin/Debug/net7.0/SportCompetitionsContracts.pdb differ diff --git a/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.dll b/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.dll index f1eefae..3355b32 100644 Binary files a/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.dll and b/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.pdb b/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.pdb index 580fc38..177bbc7 100644 Binary files a/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.pdb and b/SportCompetitionsContracts/obj/Debug/net7.0/SportCompetitionsContracts.pdb differ diff --git a/SportCompetitionsContracts/obj/Debug/net7.0/ref/SportCompetitionsContracts.dll b/SportCompetitionsContracts/obj/Debug/net7.0/ref/SportCompetitionsContracts.dll index 9dc7a5a..80fe161 100644 Binary files a/SportCompetitionsContracts/obj/Debug/net7.0/ref/SportCompetitionsContracts.dll and b/SportCompetitionsContracts/obj/Debug/net7.0/ref/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsContracts/obj/Debug/net7.0/refint/SportCompetitionsContracts.dll b/SportCompetitionsContracts/obj/Debug/net7.0/refint/SportCompetitionsContracts.dll index 9dc7a5a..80fe161 100644 Binary files a/SportCompetitionsContracts/obj/Debug/net7.0/refint/SportCompetitionsContracts.dll and b/SportCompetitionsContracts/obj/Debug/net7.0/refint/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.Designer.cs b/SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.Designer.cs similarity index 98% rename from SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.Designer.cs rename to SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.Designer.cs index 590520e..ed8f7cf 100644 --- a/SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.Designer.cs +++ b/SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.Designer.cs @@ -12,8 +12,8 @@ using SportCompetitionsDatabaseImplement; namespace SportCompetitionsDatabaseImplement.Migrations { [DbContext(typeof(SportCompetitionsDatabase))] - [Migration("20240423180214_last")] - partial class last + [Migration("20240423195756_aboba")] + partial class aboba { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.cs b/SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.cs similarity index 99% rename from SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.cs rename to SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.cs index d4904f4..91ee6bd 100644 --- a/SportCompetitionsDatabaseImplement/Migrations/20240423180214_last.cs +++ b/SportCompetitionsDatabaseImplement/Migrations/20240423195756_aboba.cs @@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace SportCompetitionsDatabaseImplement.Migrations { /// - public partial class last : Migration + public partial class aboba : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll index be2350e..5900d4b 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.dll differ diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb index 86469dc..44e6c98 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsBusinessLogic.pdb differ diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.dll b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.dll index f1eefae..3355b32 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.dll and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.pdb b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.pdb index 580fc38..177bbc7 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.pdb and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsContracts.pdb differ diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.dll b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.dll index 1e73981..4719753 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.dll and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.dll differ diff --git a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb index be5e4c1..f0caa7c 100644 Binary files a/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb and b/SportCompetitionsDatabaseImplement/bin/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb differ diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.AssemblyReference.cache b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.AssemblyReference.cache index b609757..046f810 100644 Binary files a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.AssemblyReference.cache and b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.AssemblyReference.cache differ diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.CoreCompileInputs.cache b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.CoreCompileInputs.cache index f736f0d..85d99db 100644 --- a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.CoreCompileInputs.cache +++ b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -dce225f560b6b8a2a84a1ab842296c141b60b367 +d89e18ed28ccf4ae959e922b6f0a3c8811f846a1 diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.dll b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.dll index 1e73981..4719753 100644 Binary files a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.dll and b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.dll differ diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb index be5e4c1..f0caa7c 100644 Binary files a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb and b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/SportCompetitionsDatabaseImplement.pdb differ diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/ref/SportCompetitionsDatabaseImplement.dll b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/ref/SportCompetitionsDatabaseImplement.dll index 3ba2907..36d7e96 100644 Binary files a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/ref/SportCompetitionsDatabaseImplement.dll and b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/ref/SportCompetitionsDatabaseImplement.dll differ diff --git a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/refint/SportCompetitionsDatabaseImplement.dll b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/refint/SportCompetitionsDatabaseImplement.dll index 3ba2907..36d7e96 100644 Binary files a/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/refint/SportCompetitionsDatabaseImplement.dll and b/SportCompetitionsDatabaseImplement/obj/Debug/net7.0/refint/SportCompetitionsDatabaseImplement.dll differ diff --git a/SportCompetitionsView/FormMain.Designer.cs b/SportCompetitionsView/FormMain.Designer.cs index b6d37cd..8a59b65 100644 --- a/SportCompetitionsView/FormMain.Designer.cs +++ b/SportCompetitionsView/FormMain.Designer.cs @@ -32,6 +32,7 @@ menuStrip1 = new MenuStrip(); toolStripMenuItem1 = new ToolStripMenuItem(); toolStripMenuItem2 = new ToolStripMenuItem(); + мемберToolStripMenuItem = new ToolStripMenuItem(); button1 = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); menuStrip1.SuspendLayout(); @@ -48,7 +49,7 @@ // // menuStrip1 // - menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2 }); + menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2, мемберToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(800, 24); @@ -69,6 +70,13 @@ toolStripMenuItem2.Text = "Команды"; toolStripMenuItem2.Click += TeamsToolStripMenuItem_Click; // + // мемберToolStripMenuItem + // + мемберToolStripMenuItem.Name = "мемберToolStripMenuItem"; + мемберToolStripMenuItem.Size = new Size(47, 20); + мемберToolStripMenuItem.Text = "мем)"; + мемберToolStripMenuItem.Click += MembersToolStripMenuItem_Click; + // // button1 // button1.Location = new Point(620, 41); @@ -103,5 +111,6 @@ private ToolStripMenuItem toolStripMenuItem1; private ToolStripMenuItem toolStripMenuItem2; private Button button1; + private ToolStripMenuItem мемберToolStripMenuItem; } } \ No newline at end of file diff --git a/SportCompetitionsView/FormMain.cs b/SportCompetitionsView/FormMain.cs index b990a81..7e45778 100644 --- a/SportCompetitionsView/FormMain.cs +++ b/SportCompetitionsView/FormMain.cs @@ -34,5 +34,14 @@ namespace SportCompetitionsView form.ShowDialog(); } } + + private void MembersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMembers)); + if (service is FormMembers form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/SportCompetitionsView/FormMember.Designer.cs b/SportCompetitionsView/FormMember.Designer.cs index 76251e0..9803166 100644 --- a/SportCompetitionsView/FormMember.Designer.cs +++ b/SportCompetitionsView/FormMember.Designer.cs @@ -34,6 +34,10 @@ label2 = new Label(); textBoxGender = new TextBox(); label3 = new Label(); + comboBoxTeam = new ComboBox(); + label4 = new Label(); + button1 = new Button(); + buttonCanc = new Button(); SuspendLayout(); // // label1 @@ -84,11 +88,52 @@ label3.TabIndex = 5; label3.Text = "Гендер"; // + // comboBoxTeam + // + comboBoxTeam.FormattingEnabled = true; + comboBoxTeam.Location = new Point(108, 135); + comboBoxTeam.Name = "comboBoxTeam"; + comboBoxTeam.Size = new Size(200, 23); + comboBoxTeam.TabIndex = 6; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(12, 138); + label4.Name = "label4"; + label4.Size = new Size(55, 15); + label4.TabIndex = 7; + label4.Text = "Команда"; + // + // button1 + // + button1.Location = new Point(108, 167); + button1.Name = "button1"; + button1.Size = new Size(100, 40); + button1.TabIndex = 8; + button1.Text = "Сохранить"; + button1.UseVisualStyleBackColor = true; + button1.Click += buttonSave_Click; + // + // buttonCanc + // + buttonCanc.Location = new Point(214, 167); + buttonCanc.Name = "buttonCanc"; + buttonCanc.Size = new Size(94, 40); + buttonCanc.TabIndex = 9; + buttonCanc.Text = "Отмена"; + buttonCanc.UseVisualStyleBackColor = true; + buttonCanc.Click += buttonCancel_Click; + // // FormMember // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(345, 219); + Controls.Add(buttonCanc); + Controls.Add(button1); + Controls.Add(label4); + Controls.Add(comboBoxTeam); Controls.Add(label3); Controls.Add(textBoxGender); Controls.Add(label2); @@ -96,7 +141,8 @@ Controls.Add(textBoxFCs); Controls.Add(label1); Name = "FormMember"; - Text = "FormMember"; + Text = "Пользователь"; + Load += FormMember_Load; ResumeLayout(false); PerformLayout(); } @@ -109,5 +155,9 @@ private Label label2; private TextBox textBoxGender; private Label label3; + private ComboBox comboBoxTeam; + private Label label4; + private Button button1; + private Button buttonCanc; } } \ No newline at end of file diff --git a/SportCompetitionsView/FormMember.cs b/SportCompetitionsView/FormMember.cs index e24f201..2389784 100644 --- a/SportCompetitionsView/FormMember.cs +++ b/SportCompetitionsView/FormMember.cs @@ -1,4 +1,10 @@ -using System; +using Microsoft.VisualBasic.Logging; +using SportCompetitionsContracts.BindingModels; +using SportCompetitionsContracts.BusinessLogicsContracts; +using SportCompetitionsContracts.SearchModels; +using SportCompetitionsContracts.ViewModels; +using SportCompetitionsDataModels.Models; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,9 +18,62 @@ namespace SportCompetitionsView { public partial class FormMember : Form { - public FormMember() + private readonly IMemberLogic _logicM; + private readonly ITeamLogic _logicT; + private int? _id; + public int Id { set { _id = value; } } + + public FormMember(IMemberLogic logicM, ITeamLogic logicT) { InitializeComponent(); + _logicM = logicM; + _logicT = logicT; + } + + private void FormMember_Load(object sender, EventArgs e) + { + var _listP = _logicT.ReadList(null); + if (_listP != null) + { + comboBoxTeam.DisplayMember = "TeamName"; + comboBoxTeam.ValueMember = "Id"; + comboBoxTeam.DataSource = _listP; + comboBoxTeam.SelectedItem = null; + } + } + + private void buttonSave_Click(object sender, EventArgs e) + { + try + { + var model = new MemberBindingModel + { + Id = _id ?? 0, + MemberFCs = textBoxFCs.Text, + MemberBirthDate = dateTimePicker1.Value, + MemberGender = textBoxGender.Text, + TeamId = comboBoxTeam.SelectedIndex, + }; + var operationResult = _id.HasValue ? _logicM.Update(model) : _logicM.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Доп информация в логах"); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + + private void buttonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); } } } diff --git a/SportCompetitionsView/FormMembers.Designer.cs b/SportCompetitionsView/FormMembers.Designer.cs new file mode 100644 index 0000000..2f6c50f --- /dev/null +++ b/SportCompetitionsView/FormMembers.Designer.cs @@ -0,0 +1,100 @@ +namespace SportCompetitionsView +{ + partial class FormMembers + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView1 = new DataGridView(); + buttonDel = new Button(); + buttonEdit = new Button(); + buttonAdd = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + SuspendLayout(); + // + // dataGridView1 + // + dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView1.Location = new Point(12, 12); + dataGridView1.Name = "dataGridView1"; + dataGridView1.RowTemplate.Height = 25; + dataGridView1.Size = new Size(452, 408); + dataGridView1.TabIndex = 0; + // + // buttonDel + // + buttonDel.Location = new Point(501, 137); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(128, 42); + buttonDel.TabIndex = 6; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += buttonDel_Click; + // + // buttonEdit + // + buttonEdit.Location = new Point(501, 74); + buttonEdit.Name = "buttonEdit"; + buttonEdit.Size = new Size(128, 44); + buttonEdit.TabIndex = 5; + buttonEdit.Text = "Изменить"; + buttonEdit.UseVisualStyleBackColor = true; + buttonEdit.Click += buttonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(501, 12); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(128, 43); + buttonAdd.TabIndex = 4; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // FormMembers + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(653, 450); + Controls.Add(buttonDel); + Controls.Add(buttonEdit); + Controls.Add(buttonAdd); + Controls.Add(dataGridView1); + Name = "FormMembers"; + Text = "FormMembers"; + Load += FormMembers_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView1; + private Button buttonDel; + private Button buttonEdit; + private Button buttonAdd; + } +} \ No newline at end of file diff --git a/SportCompetitionsView/FormMembers.cs b/SportCompetitionsView/FormMembers.cs new file mode 100644 index 0000000..53c3b92 --- /dev/null +++ b/SportCompetitionsView/FormMembers.cs @@ -0,0 +1,100 @@ +using SportCompetitionsContracts.BindingModels; +using SportCompetitionsContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SportCompetitionsView +{ + public partial class FormMembers : Form + { + private readonly IMemberLogic _logic; + + public FormMembers(IMemberLogic logic) + { + InitializeComponent(); + _logic = logic; + } + + private void FormMembers_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView1.DataSource = list; + dataGridView1.Columns["Id"].Visible = false; + dataGridView1.Columns["MemberFCs"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMember)); + if (service is FormMember form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void buttonUpd_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormMember)); + if (service is FormMember form) + { + form.Id = Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void buttonDel_Click(object sender, EventArgs e) + { + if (dataGridView1.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView1.SelectedRows[0].Cells["Id"].Value); + try + { + if (!_logic.Delete(new MemberBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Доп информация в логах"); + } + LoadData(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + } +} diff --git a/SportCompetitionsView/FormMembers.resx b/SportCompetitionsView/FormMembers.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/SportCompetitionsView/FormMembers.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SportCompetitionsView/Program.cs b/SportCompetitionsView/Program.cs index 55eff1f..ce58007 100644 --- a/SportCompetitionsView/Program.cs +++ b/SportCompetitionsView/Program.cs @@ -41,7 +41,9 @@ namespace SportCompetitionsView services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/SportCompetitionsView/SportCompetitionsView.csproj.user b/SportCompetitionsView/SportCompetitionsView.csproj.user index 847747d..53f69e9 100644 --- a/SportCompetitionsView/SportCompetitionsView.csproj.user +++ b/SportCompetitionsView/SportCompetitionsView.csproj.user @@ -13,6 +13,9 @@ Form + + Form + Form diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.dll b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.dll index be2350e..5900d4b 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.dll and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.dll differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.pdb b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.pdb index 86469dc..44e6c98 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.pdb and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsBusinessLogic.pdb differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.dll b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.dll index f1eefae..3355b32 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.dll and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.dll differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.pdb b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.pdb index 580fc38..177bbc7 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.pdb and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsContracts.pdb differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.dll b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.dll index 1e73981..4719753 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.dll and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.dll differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.pdb b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.pdb index be5e4c1..f0caa7c 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.pdb and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsDatabaseImplement.pdb differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.dll b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.dll index 7a847f3..b6430ee 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.dll and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.dll differ diff --git a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.pdb b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.pdb index 62d3e2d..cb782fb 100644 Binary files a/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.pdb and b/SportCompetitionsView/bin/Debug/net7.0-windows/SportCompetitionsView.pdb differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.FormMembers.resources b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.FormMembers.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.FormMembers.resources differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.AssemblyReference.cache b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.AssemblyReference.cache index eca2d5a..29ce93a 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.AssemblyReference.cache and b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.AssemblyReference.cache differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.CoreCompileInputs.cache b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.CoreCompileInputs.cache index 25f867d..67e2b3e 100644 --- a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.CoreCompileInputs.cache +++ b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e76f2d8bcb154b2bf271d2de6a8a4cd77655306d +a81d53a79144686f8f4c98939ab7ebd87a994c03 diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.FileListAbsolute.txt b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.FileListAbsolute.txt index 3005937..290cfe4 100644 --- a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.FileListAbsolute.txt +++ b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.FileListAbsolute.txt @@ -47,3 +47,4 @@ F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\Sp F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\SportCompetitionsView.FormCompetitions.resources F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\SportCompetitionsView.FormTeam.resources F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\SportCompetitionsView.FormTeams.resources +F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\SportCompetitionsView.FormMembers.resources diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.GenerateResource.cache b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.GenerateResource.cache index 1c38830..4e64e2a 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.GenerateResource.cache and b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.csproj.GenerateResource.cache differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.dll b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.dll index 7a847f3..b6430ee 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.dll and b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.dll differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.pdb b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.pdb index 62d3e2d..cb782fb 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.pdb and b/SportCompetitionsView/obj/Debug/net7.0-windows/SportCompetitionsView.pdb differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/ref/SportCompetitionsView.dll b/SportCompetitionsView/obj/Debug/net7.0-windows/ref/SportCompetitionsView.dll index ba9f149..613e568 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/ref/SportCompetitionsView.dll and b/SportCompetitionsView/obj/Debug/net7.0-windows/ref/SportCompetitionsView.dll differ diff --git a/SportCompetitionsView/obj/Debug/net7.0-windows/refint/SportCompetitionsView.dll b/SportCompetitionsView/obj/Debug/net7.0-windows/refint/SportCompetitionsView.dll index ba9f149..613e568 100644 Binary files a/SportCompetitionsView/obj/Debug/net7.0-windows/refint/SportCompetitionsView.dll and b/SportCompetitionsView/obj/Debug/net7.0-windows/refint/SportCompetitionsView.dll differ