Serxionaft/PIbd-21_KozyrevSS_SewingDresses_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Lab5-Hard KozyrevSS SewingDresses #23

Closed
Serxionaft wants to merge 36 commits from Lab5-Hard into Lab5
pull from: Lab5-Hard
merge into: Serxionaft:Lab5
Conversation 1 Commits 36 Files Changed 144 +48 -119
6 changed files with 48 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8e31eb308 - Show all commits

4
SewingDresses/SewingDressesContracts/ViewModels/ShopViewModel.cs
View File

@ -1,6 +1,7 @@
using SewingDressesDataModels.Models;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@ -10,8 +11,11 @@ namespace SewingDressesContracts.ViewModels
public class ShopViewModel : IShopModel
{
public int Id { get; set; }
[DisplayName("Название магазина")]
public string ShopName { get; set; } = string.Empty;
[DisplayName("Адрес")]
public string Adress { get; set; } = string.Empty;
[DisplayName("Дата открытия")]
public DateTime DateOpen { get; set; }
public Dictionary<int, (IDressModel, int)> ShopDresses { get; set; } = new();
}

4
SewingDresses/SewingDressesView/MainForm.cs
View File

@ -154,8 +154,8 @@ namespace SewingDressesView
private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(ShopsForm));
if (service is ShopsForm form)
var service = Program.ServiceProvider?.GetService(typeof(SupplyForm));
if (service is SupplyForm form)
{
form.ShowDialog();
}

77
SewingDresses/SewingDressesView/ShopForm.Designer.cs generated
View File

@ -32,15 +32,15 @@
textBoxName = new TextBox();
textBoxAdress = new TextBox();
dataGridView = new DataGridView();
Column1 = new DataGridViewTextBoxColumn();
Column2 = new DataGridViewTextBoxColumn();
Column3 = new DataGridViewTextBoxColumn();
Column4 = new DataGridViewTextBoxColumn();
buttonSave = new Button();
buttonCancel = new Button();
label1 = new Label();
label2 = new Label();
label3 = new Label();
IdColumn = new DataGridViewTextBoxColumn();
Title = new DataGridViewTextBoxColumn();
Cost = new DataGridViewTextBoxColumn();
Count = new DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout();
//
@ -68,42 +68,14 @@
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3, Column4 });
dataGridView.Columns.AddRange(new DataGridViewColumn[] { IdColumn, Title, Cost, Count });
dataGridView.Location = new Point(10, 32);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
dataGridView.RowTemplate.Height = 29;
dataGridView.Size = new Size(553, 380);
dataGridView.Size = new Size(554, 380);
dataGridView.TabIndex = 3;
//
// Column1
//
Column1.HeaderText = "Column1";
Column1.MinimumWidth = 6;
Column1.Name = "Column1";
Column1.Width = 125;
//
// Column2
//
Column2.HeaderText = "Column2";
Column2.MinimumWidth = 6;
Column2.Name = "Column2";
Column2.Width = 125;
//
// Column3
//
Column3.HeaderText = "Column3";
Column3.MinimumWidth = 6;
Column3.Name = "Column3";
Column3.Width = 125;
//
// Column4
//
Column4.HeaderText = "Column4";
Column4.MinimumWidth = 6;
Column4.Name = "Column4";
Column4.Width = 125;
//
// buttonSave
//
buttonSave.Location = new Point(714, 219);
@ -151,6 +123,35 @@
label3.TabIndex = 8;
label3.Text = "Адрес";
//
// IdColumn
//
IdColumn.HeaderText = "Номер платья";
IdColumn.MinimumWidth = 6;
IdColumn.Name = "IdColumn";
IdColumn.Visible = false;
IdColumn.Width = 125;
//
// Title
//
Title.HeaderText = "Название";
Title.MinimumWidth = 6;
Title.Name = "Title";
Title.Width = 125;
//
// Cost
//
Cost.HeaderText = "Цена";
Cost.MinimumWidth = 6;
Cost.Name = "Cost";
Cost.Width = 125;
//
// Count
//
Count.HeaderText = "Количество";
Count.MinimumWidth = 6;
Count.Name = "Count";
Count.Width = 125;
//
// ShopForm
//
AutoScaleDimensions = new SizeF(8F, 20F);
@ -179,14 +180,14 @@
private TextBox textBoxName;
private TextBox textBoxAdress;
private DataGridView dataGridView;
private DataGridViewTextBoxColumn Column1;
private DataGridViewTextBoxColumn Column2;
private DataGridViewTextBoxColumn Column3;
private DataGridViewTextBoxColumn Column4;
private Button buttonSave;
private Button buttonCancel;
private Label label1;
private Label label2;
private Label label3;
private DataGridViewTextBoxColumn IdColumn;
private DataGridViewTextBoxColumn Title;
private DataGridViewTextBoxColumn Cost;
private DataGridViewTextBoxColumn Count;
}
}

21
SewingDresses/SewingDressesView/ShopForm.resx
View File

@ -117,28 +117,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="IdColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Cost.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="Count.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>

46
SewingDresses/SewingDressesView/ShopsForm.Designer.cs generated
View File

@ -29,11 +29,6 @@
private void InitializeComponent()
{
dataGridView = new DataGridView();
Column1 = new DataGridViewTextBoxColumn();
Column2 = new DataGridViewTextBoxColumn();
Column3 = new DataGridViewTextBoxColumn();
Column4 = new DataGridViewTextBoxColumn();
Column5 = new DataGridViewTextBoxColumn();
buttonAdd = new Button();
buttonUpdate = new Button();
buttonReset = new Button();
@ -44,7 +39,6 @@
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Columns.AddRange(new DataGridViewColumn[] { Column1, Column2, Column3, Column4, Column5 });
dataGridView.Location = new Point(14, 17);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 51;
@ -52,41 +46,6 @@
dataGridView.Size = new Size(646, 415);
dataGridView.TabIndex = 0;
//
// Column1
//
Column1.HeaderText = "Column1";
Column1.MinimumWidth = 6;
Column1.Name = "Column1";
Column1.Width = 125;
//
// Column2
//
Column2.HeaderText = "Column2";
Column2.MinimumWidth = 6;
Column2.Name = "Column2";
Column2.Width = 125;
//
// Column3
//
Column3.HeaderText = "Column3";
Column3.MinimumWidth = 6;
Column3.Name = "Column3";
Column3.Width = 125;
//
// Column4
//
Column4.HeaderText = "Column4";
Column4.MinimumWidth = 6;
Column4.Name = "Column4";
Column4.Width = 125;
//
// Column5
//
Column5.HeaderText = "Column5";
Column5.MinimumWidth = 6;
Column5.Name = "Column5";
Column5.Width = 125;
//
// buttonAdd
//
buttonAdd.Location = new Point(797, 49);
@ -147,11 +106,6 @@
#endregion
private DataGridView dataGridView;
private DataGridViewTextBoxColumn Column1;
private DataGridViewTextBoxColumn Column2;
private DataGridViewTextBoxColumn Column3;
private DataGridViewTextBoxColumn Column4;
private DataGridViewTextBoxColumn Column5;
private Button buttonAdd;
private Button buttonUpdate;
private Button buttonReset;

15
SewingDresses/SewingDressesView/ShopsForm.resx
View File

@ -117,19 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>