чето сделал уже забыл че

This commit is contained in:
Леонид Малафеев 2024-04-24 00:08:24 +04:00
parent 486c484196
commit dc00c34c57
68 changed files with 464 additions and 11 deletions

Binary file not shown.

View File

@ -11,7 +11,7 @@ namespace SportCompetitionsContracts.BindingModels
{ {
public int Id { get; set; } public int Id { get; set; }
public string? MemberFCs { get; set; } public string? MemberFCs { get; set; }
public DateTime MemberBirthDate { get; } public DateTime MemberBirthDate { get; set; }
public string? MemberGender { get; set; } public string? MemberGender { get; set; }
public int TeamId { get; set; } public int TeamId { get; set; }

View File

@ -12,8 +12,8 @@ using SportCompetitionsDatabaseImplement;
namespace SportCompetitionsDatabaseImplement.Migrations namespace SportCompetitionsDatabaseImplement.Migrations
{ {
[DbContext(typeof(SportCompetitionsDatabase))] [DbContext(typeof(SportCompetitionsDatabase))]
[Migration("20240423180214_last")] [Migration("20240423195756_aboba")]
partial class last partial class aboba
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)

View File

@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
namespace SportCompetitionsDatabaseImplement.Migrations namespace SportCompetitionsDatabaseImplement.Migrations
{ {
/// <inheritdoc /> /// <inheritdoc />
public partial class last : Migration public partial class aboba : Migration
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)

View File

@ -1 +1 @@
dce225f560b6b8a2a84a1ab842296c141b60b367 d89e18ed28ccf4ae959e922b6f0a3c8811f846a1

View File

@ -32,6 +32,7 @@
menuStrip1 = new MenuStrip(); menuStrip1 = new MenuStrip();
toolStripMenuItem1 = new ToolStripMenuItem(); toolStripMenuItem1 = new ToolStripMenuItem();
toolStripMenuItem2 = new ToolStripMenuItem(); toolStripMenuItem2 = new ToolStripMenuItem();
мемберToolStripMenuItem = new ToolStripMenuItem();
button1 = new Button(); button1 = new Button();
((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
menuStrip1.SuspendLayout(); menuStrip1.SuspendLayout();
@ -48,7 +49,7 @@
// //
// menuStrip1 // menuStrip1
// //
menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2 }); menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, toolStripMenuItem2, мемберToolStripMenuItem });
menuStrip1.Location = new Point(0, 0); menuStrip1.Location = new Point(0, 0);
menuStrip1.Name = "menuStrip1"; menuStrip1.Name = "menuStrip1";
menuStrip1.Size = new Size(800, 24); menuStrip1.Size = new Size(800, 24);
@ -69,6 +70,13 @@
toolStripMenuItem2.Text = "Команды"; toolStripMenuItem2.Text = "Команды";
toolStripMenuItem2.Click += TeamsToolStripMenuItem_Click; toolStripMenuItem2.Click += TeamsToolStripMenuItem_Click;
// //
// мемберToolStripMenuItem
//
мемберToolStripMenuItem.Name = емберToolStripMenuItem";
мемберToolStripMenuItem.Size = new Size(47, 20);
мемберToolStripMenuItem.Text = "мем)";
мемберToolStripMenuItem.Click += MembersToolStripMenuItem_Click;
//
// button1 // button1
// //
button1.Location = new Point(620, 41); button1.Location = new Point(620, 41);
@ -103,5 +111,6 @@
private ToolStripMenuItem toolStripMenuItem1; private ToolStripMenuItem toolStripMenuItem1;
private ToolStripMenuItem toolStripMenuItem2; private ToolStripMenuItem toolStripMenuItem2;
private Button button1; private Button button1;
private ToolStripMenuItem мемберToolStripMenuItem;
} }
} }

View File

@ -34,5 +34,14 @@ namespace SportCompetitionsView
form.ShowDialog(); form.ShowDialog();
} }
} }
private void MembersToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormMembers));
if (service is FormMembers form)
{
form.ShowDialog();
}
}
} }
} }

View File

@ -34,6 +34,10 @@
label2 = new Label(); label2 = new Label();
textBoxGender = new TextBox(); textBoxGender = new TextBox();
label3 = new Label(); label3 = new Label();
comboBoxTeam = new ComboBox();
label4 = new Label();
button1 = new Button();
buttonCanc = new Button();
SuspendLayout(); SuspendLayout();
// //
// label1 // label1
@ -84,11 +88,52 @@
label3.TabIndex = 5; label3.TabIndex = 5;
label3.Text = "Гендер"; 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 // FormMember
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; 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(label3);
Controls.Add(textBoxGender); Controls.Add(textBoxGender);
Controls.Add(label2); Controls.Add(label2);
@ -96,7 +141,8 @@
Controls.Add(textBoxFCs); Controls.Add(textBoxFCs);
Controls.Add(label1); Controls.Add(label1);
Name = "FormMember"; Name = "FormMember";
Text = "FormMember"; Text = "Пользователь";
Load += FormMember_Load;
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }
@ -109,5 +155,9 @@
private Label label2; private Label label2;
private TextBox textBoxGender; private TextBox textBoxGender;
private Label label3; private Label label3;
private ComboBox comboBoxTeam;
private Label label4;
private Button button1;
private Button buttonCanc;
} }
} }

View File

@ -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.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Data; using System.Data;
@ -12,9 +18,62 @@ namespace SportCompetitionsView
{ {
public partial class FormMember : Form 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(); 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();
} }
} }
} }

View File

@ -0,0 +1,100 @@
namespace SportCompetitionsView
{
partial class FormMembers
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
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;
}
}

View File

@ -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);
}
}
}
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -41,7 +41,9 @@ namespace SportCompetitionsView
services.AddTransient<ITeamLogic, TeamLogic>(); services.AddTransient<ITeamLogic, TeamLogic>();
services.AddTransient<FormMain>(); services.AddTransient<FormMain>();
services.AddTransient<FormMember>(); services.AddTransient<FormMember>();
services.AddTransient<FormMembers>();
services.AddTransient<FormCompetition>(); services.AddTransient<FormCompetition>();
services.AddTransient<FormCompetitions>(); services.AddTransient<FormCompetitions>();

View File

@ -13,6 +13,9 @@
<Compile Update="FormMember.cs"> <Compile Update="FormMember.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Update="FormMembers.cs">
<SubType>Form</SubType>
</Compile>
<Compile Update="FormTeam.cs"> <Compile Update="FormTeam.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>

View File

@ -1 +1 @@
e76f2d8bcb154b2bf271d2de6a8a4cd77655306d a81d53a79144686f8f4c98939ab7ebd87a994c03

View File

@ -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.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.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.FormTeams.resources
F:\SUBD\lab4\SportCompetitions\SportCompetitionsView\obj\Debug\net7.0-windows\SportCompetitionsView.FormMembers.resources