From aca0c566330827dc571956a4104797aa20a4a595 Mon Sep 17 00:00:00 2001 From: Inohara Date: Thu, 4 May 2023 21:52:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IceCreamBusinessLogic.csproj | 4 + .../IceCreamShop/FormMain.Designer.cs | 437 ++---------------- .../ViewModels/ShopViewModel.cs | 1 + .../DatabaseImplementationExtension.cs | 1 + .../IceCreamShopDatabaseImplement.csproj | 4 + .../IceCreamShopFileImplement.csproj | 4 + .../IceCreamShopListImplement.csproj | 2 +- .../IceCreamShopContracts.dll | Bin 37888 -> 37888 bytes .../IceCreamShopDataModels.dll | Bin 6656 -> 6656 bytes .../IceCreamShopListImplement.dll | Bin 30720 -> 30208 bytes 10 files changed, 53 insertions(+), 400 deletions(-) diff --git a/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj b/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj index 24e35c5..de38d9c 100644 --- a/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj +++ b/IceCreamShop/IceCreamBusinessLogic/IceCreamBusinessLogic.csproj @@ -18,4 +18,8 @@ + + + + diff --git a/IceCreamShop/IceCreamShop/FormMain.Designer.cs b/IceCreamShop/IceCreamShop/FormMain.Designer.cs index 5d42ee3..bbe3ee5 100644 --- a/IceCreamShop/IceCreamShop/FormMain.Designer.cs +++ b/IceCreamShop/IceCreamShop/FormMain.Designer.cs @@ -1,33 +1,33 @@ namespace IceCreamShopView { - partial class FormMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormMain + { + /// + /// 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); - } + /// + /// 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 + #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() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.buttonUpdate = new System.Windows.Forms.Button(); this.buttonSetToFinish = new System.Windows.Forms.Button(); this.buttonCreateOrder = new System.Windows.Forms.Button(); @@ -50,6 +50,7 @@ this.MailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.buttonSupplyShop = new System.Windows.Forms.Button(); this.SellIceCreamButton = new System.Windows.Forms.Button(); + this.createBackupToolStripMenuItem = new ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip.SuspendLayout(); this.SuspendLayout(); @@ -101,7 +102,8 @@ this.справочникиToolStripMenuItem, this.отчетыToolStripMenuItem, this.DoWorkToolStripMenuItem, - this.MailToolStripMenuItem}); + this.MailToolStripMenuItem, + this.createBackupToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3); @@ -242,6 +244,13 @@ this.SellIceCreamButton.UseVisualStyleBackColor = true; this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click); // + // createBackupToolStripMenuItem + // + createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem"; + createBackupToolStripMenuItem.Size = new Size(97, 20); + createBackupToolStripMenuItem.Text = "Создать бекап"; + createBackupToolStripMenuItem.Click += createBackupToolStripMenuItem_Click; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); @@ -264,367 +273,10 @@ this.ResumeLayout(false); this.PerformLayout(); - } - this.dataGridView.RowHeadersWidth = 51; - #endregion - this.dataGridView.Size = new System.Drawing.Size(1202, 407); - private Button buttonUpdate; - private Button buttonSetToFinish; - private Button buttonCreateOrder; - private DataGridView dataGridView; - private MenuStrip menuStrip; - private ToolStripMenuItem справочникиToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem мороженоеToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem iceCreamComponentsToolStripMenuItem; - private ToolStripMenuItem iceCreamToolStripMenuItem; - private ToolStripMenuItem ordersToolStripMenuItem; - private ToolStripMenuItem клиентыToolStripMenuItem; - private ToolStripMenuItem ImplementersToolStripMenuItem; - private ToolStripMenuItem DoWorkToolStripMenuItem; - private ToolStripMenuItem магазиныToolStripMenuItem; - private ToolStripMenuItem listShopsToolStripMenuItem; - private ToolStripMenuItem shopWorkloadToolStripMenuItem; - private ToolStripMenuItem ordersByDateToolStripMenuItem; - private ToolStripMenuItem MailToolStripMenuItem; - private Button buttonSupplyShop; - private Button SellIceCreamButton; - this.магазиныToolStripMenuItem}); -} this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24); - this.справочникиToolStripMenuItem.Text = "Справочники"; - // - // компонентыToolStripMenuItem - // - this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.компонентыToolStripMenuItem.Text = "Компоненты"; - this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click); - // - // мороженоеToolStripMenuItem - // - this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem"; - this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.мороженоеToolStripMenuItem.Text = "Мороженое"; - this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click); - // - // клиентыToolStripMenuItem - // - this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.клиентыToolStripMenuItem.Text = "Клиенты"; - this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click); - // - // ImplementersToolStripMenuItem - // - this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem"; - this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.ImplementersToolStripMenuItem.Text = "Исполнители"; - this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click); - // - // магазиныToolStripMenuItem - // - this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.магазиныToolStripMenuItem.Text = "Магазины"; - this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click); - // - // отчетыToolStripMenuItem - // - this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.iceCreamComponentsToolStripMenuItem, - this.iceCreamToolStripMenuItem, - this.ordersToolStripMenuItem, - this.listShopsToolStripMenuItem, - this.shopWorkloadToolStripMenuItem, - this.ordersByDateToolStripMenuItem}); - this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24); - this.отчетыToolStripMenuItem.Text = "Отчеты"; - // - // iceCreamComponentsToolStripMenuItem - // - this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem"; - this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых"; - this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click); - // - // iceCreamToolStripMenuItem - // - this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem"; - this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами"; - this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click); - // - // ordersToolStripMenuItem - // - this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem"; - this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.ordersToolStripMenuItem.Text = "Список заказов"; - this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); - // - // listShopsToolStripMenuItem - // - this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem"; - this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.listShopsToolStripMenuItem.Text = "Список магазинов"; - this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click); - // - // shopWorkloadToolStripMenuItem - // - this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem"; - this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов"; - this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click); - // - // ordersByDateToolStripMenuItem - // - this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem"; - this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.ordersByDateToolStripMenuItem.Text = "Заказы по дате"; - this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click); - // - // DoWorkToolStripMenuItem - // - this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem"; - this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24); - this.DoWorkToolStripMenuItem.Text = "Запуск работ"; - this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click); - // - // buttonSupplyShop - // - this.buttonSupplyShop.Location = new System.Drawing.Point(1231, 292); - this.buttonSupplyShop.Name = "buttonSupplyShop"; - this.buttonSupplyShop.Size = new System.Drawing.Size(194, 44); - this.buttonSupplyShop.TabIndex = 14; - this.buttonSupplyShop.Text = "Пополнение магазина"; - this.buttonSupplyShop.UseVisualStyleBackColor = true; - this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click); - // - // SellIceCreamButton - // - this.SellIceCreamButton.Location = new System.Drawing.Point(1231, 248); - this.SellIceCreamButton.Name = "SellIceCreamButton"; - this.SellIceCreamButton.Size = new System.Drawing.Size(194, 40); - this.SellIceCreamButton.TabIndex = 15; - this.SellIceCreamButton.Text = "Продажа мороженого"; - this.SellIceCreamButton.UseVisualStyleBackColor = true; - this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click); - // - // FormMain - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1433, 467); - this.Controls.Add(this.SellIceCreamButton); - this.Controls.Add(this.buttonSupplyShop); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonSetToFinish); - this.Controls.Add(this.buttonCreateOrder); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.menuStrip); - this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.Name = "FormMain"; - this.Text = "Магазин мороженого"; - this.Load += new System.EventHandler(this.FormMain_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - this.dataGridView.RowHeadersWidth = 51; - this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(1202, 407); - this.dataGridView.TabIndex = 8; - // - // menuStrip - // - this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20); - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.справочникиToolStripMenuItem, - this.отчетыToolStripMenuItem, - this.DoWorkToolStripMenuItem}); - this.menuStrip.Location = new System.Drawing.Point(0, 0); - this.menuStrip.Name = "menuStrip"; - this.menuStrip.Padding = new System.Windows.Forms.Padding(6, 3, 0, 3); - this.menuStrip.Size = new System.Drawing.Size(1433, 30); - this.menuStrip.TabIndex = 7; - this.menuStrip.Text = "Справочники"; - // - // справочникиToolStripMenuItem - // - this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.компонентыToolStripMenuItem, - this.мороженоеToolStripMenuItem, - this.клиентыToolStripMenuItem, - this.ImplementersToolStripMenuItem, - this.магазиныToolStripMenuItem}); - this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24); - this.справочникиToolStripMenuItem.Text = "Справочники"; - // - // компонентыToolStripMenuItem - // - this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.компонентыToolStripMenuItem.Text = "Компоненты"; - this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click); - // - // мороженоеToolStripMenuItem - // - this.мороженоеToolStripMenuItem.Name = "мороженоеToolStripMenuItem"; - this.мороженоеToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.мороженоеToolStripMenuItem.Text = "Мороженое"; - this.мороженоеToolStripMenuItem.Click += new System.EventHandler(this.мороженоеToolStripMenuItem_Click); - // - // клиентыToolStripMenuItem - // - this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.клиентыToolStripMenuItem.Text = "Клиенты"; - this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click); - // - // ImplementersToolStripMenuItem - // - this.ImplementersToolStripMenuItem.Name = "ImplementersToolStripMenuItem"; - this.ImplementersToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.ImplementersToolStripMenuItem.Text = "Исполнители"; - this.ImplementersToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click); - // - // магазиныToolStripMenuItem - // - this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(185, 26); - this.магазиныToolStripMenuItem.Text = "Магазины"; - this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click); - // - // отчетыToolStripMenuItem - // - this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.iceCreamComponentsToolStripMenuItem, - this.iceCreamToolStripMenuItem, - this.ordersToolStripMenuItem, - this.listShopsToolStripMenuItem, - this.shopWorkloadToolStripMenuItem, - this.ordersByDateToolStripMenuItem}); - this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24); - this.отчетыToolStripMenuItem.Text = "Отчеты"; - // - // iceCreamComponentsToolStripMenuItem - // - this.iceCreamComponentsToolStripMenuItem.Name = "iceCreamComponentsToolStripMenuItem"; - this.iceCreamComponentsToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.iceCreamComponentsToolStripMenuItem.Text = "Список мороженых"; - this.iceCreamComponentsToolStripMenuItem.Click += new System.EventHandler(this.IceCreamsToolStripMenuItem_Click); - // - // iceCreamToolStripMenuItem - // - this.iceCreamToolStripMenuItem.Name = "iceCreamToolStripMenuItem"; - this.iceCreamToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.iceCreamToolStripMenuItem.Text = "Мороженые с компонентами"; - this.iceCreamToolStripMenuItem.Click += new System.EventHandler(this.IceCreamComponentsToolStripMenuItem_Click); - // - // ordersToolStripMenuItem - // - this.ordersToolStripMenuItem.Name = "ordersToolStripMenuItem"; - this.ordersToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.ordersToolStripMenuItem.Text = "Список заказов"; - this.ordersToolStripMenuItem.Click += new System.EventHandler(this.OrdersToolStripMenuItem_Click); - // - // listShopsToolStripMenuItem - // - this.listShopsToolStripMenuItem.Name = "listShopsToolStripMenuItem"; - this.listShopsToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.listShopsToolStripMenuItem.Text = "Список магазинов"; - this.listShopsToolStripMenuItem.Click += new System.EventHandler(this.listShopsToolStripMenuItem_Click); - // - // shopWorkloadToolStripMenuItem - // - this.shopWorkloadToolStripMenuItem.Name = "shopWorkloadToolStripMenuItem"; - this.shopWorkloadToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.shopWorkloadToolStripMenuItem.Text = "Загруженность магазинов"; - this.shopWorkloadToolStripMenuItem.Click += new System.EventHandler(this.shopWorkloadToolStripMenuItem_Click); - // - // ordersByDateToolStripMenuItem - // - this.ordersByDateToolStripMenuItem.Name = "ordersByDateToolStripMenuItem"; - this.ordersByDateToolStripMenuItem.Size = new System.Drawing.Size(299, 26); - this.ordersByDateToolStripMenuItem.Text = "Заказы по дате"; - this.ordersByDateToolStripMenuItem.Click += new System.EventHandler(this.ordersByDateToolStripMenuItem_Click); - // - // DoWorkToolStripMenuItem - // - this.DoWorkToolStripMenuItem.Name = "DoWorkToolStripMenuItem"; - this.DoWorkToolStripMenuItem.Size = new System.Drawing.Size(114, 24); - this.DoWorkToolStripMenuItem.Text = "Запуск работ"; - this.DoWorkToolStripMenuItem.Click += new System.EventHandler(this.DoWorkToolStripMenuItem_Click); - // - // buttonSupplyShop - // - this.buttonSupplyShop.Location = new System.Drawing.Point(1231, 292); - this.buttonSupplyShop.Name = "buttonSupplyShop"; - this.buttonSupplyShop.Size = new System.Drawing.Size(194, 44); - this.buttonSupplyShop.TabIndex = 14; - this.buttonSupplyShop.Text = "Пополнение магазина"; - this.buttonSupplyShop.UseVisualStyleBackColor = true; - this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click); - // - // SellIceCreamButton - // - this.SellIceCreamButton.Location = new System.Drawing.Point(1231, 248); - this.SellIceCreamButton.Name = "SellIceCreamButton"; - this.SellIceCreamButton.Size = new System.Drawing.Size(194, 40); - this.SellIceCreamButton.TabIndex = 15; - this.SellIceCreamButton.Text = "Продажа мороженого"; - this.SellIceCreamButton.UseVisualStyleBackColor = true; - this.SellIceCreamButton.Click += new System.EventHandler(this.SellIceCreamButton_Click); - // - // FormMain - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1433, 467); - this.Controls.Add(this.SellIceCreamButton); - this.Controls.Add(this.buttonSupplyShop); - this.Controls.Add(this.buttonUpdate); - this.Controls.Add(this.buttonSetToFinish); - this.Controls.Add(this.buttonCreateOrder); - this.Controls.Add(this.dataGridView); - this.Controls.Add(this.menuStrip); - this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.Name = "FormMain"; - this.Text = "Магазин мороженого"; - this.Load += new System.EventHandler(this.FormMain_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - } #endregion - private Button buttonUpdate; - private Button buttonSetToFinish; - private Button buttonCreateOrder; - private DataGridView dataGridView; - private MenuStrip menuStrip; - private ToolStripMenuItem справочникиToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem мороженоеToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem iceCreamComponentsToolStripMenuItem; - private ToolStripMenuItem iceCreamToolStripMenuItem; - private ToolStripMenuItem ordersToolStripMenuItem; - private ToolStripMenuItem клиентыToolStripMenuItem; - private ToolStripMenuItem ImplementersToolStripMenuItem; - private ToolStripMenuItem DoWorkToolStripMenuItem; - private ToolStripMenuItem MailToolStripMenuItem; - } private Button buttonUpdate; private Button buttonSetToFinish; private Button buttonCreateOrder; @@ -641,25 +293,12 @@ private ToolStripMenuItem ImplementersToolStripMenuItem; private ToolStripMenuItem DoWorkToolStripMenuItem; private ToolStripMenuItem магазиныToolStripMenuItem; - private Button buttonSupplyShop; - private Button SellIceCreamButton; private ToolStripMenuItem listShopsToolStripMenuItem; private ToolStripMenuItem shopWorkloadToolStripMenuItem; private ToolStripMenuItem ordersByDateToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem мороженоеToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem iceCreamComponentsToolStripMenuItem; - private ToolStripMenuItem iceCreamToolStripMenuItem; - private ToolStripMenuItem ordersToolStripMenuItem; - private ToolStripMenuItem клиентыToolStripMenuItem; - private ToolStripMenuItem ImplementersToolStripMenuItem; - private ToolStripMenuItem DoWorkToolStripMenuItem; - private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem MailToolStripMenuItem; private Button buttonSupplyShop; private Button SellIceCreamButton; - private ToolStripMenuItem listShopsToolStripMenuItem; - private ToolStripMenuItem shopWorkloadToolStripMenuItem; - private ToolStripMenuItem ordersByDateToolStripMenuItem; + private ToolStripMenuItem createBackupToolStripMenuItem; } -} +} \ No newline at end of file diff --git a/IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs b/IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs index c5d3c19..eb02313 100644 --- a/IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs +++ b/IceCreamShop/IceCreamShopContracts/ViewModels/ShopViewModel.cs @@ -27,6 +27,7 @@ namespace IceCreamShopContracts.ViewModels [Column("Вместимость магазина", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public int IceCreamMaxCount { get; set; } + [Column(visible: false)] public Dictionary ShopIceCreams { get; set; } = new(); } } diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/DatabaseImplementationExtension.cs b/IceCreamShop/IceCreamShopDatabaseImplement/DatabaseImplementationExtension.cs index 5bb9e42..70c23a2 100644 --- a/IceCreamShop/IceCreamShopDatabaseImplement/DatabaseImplementationExtension.cs +++ b/IceCreamShop/IceCreamShopDatabaseImplement/DatabaseImplementationExtension.cs @@ -16,6 +16,7 @@ namespace IceCreamShopDatabaseImplement DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); } } diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj b/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj index 34c8218..1076613 100644 --- a/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj +++ b/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj index 0689277..7f59eea 100644 --- a/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj +++ b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/IceCreamShop/IceCreamShopListImplement/IceCreamShopListImplement.csproj b/IceCreamShop/IceCreamShopListImplement/IceCreamShopListImplement.csproj index 79e43c9..9e40bc4 100644 --- a/IceCreamShop/IceCreamShopListImplement/IceCreamShopListImplement.csproj +++ b/IceCreamShop/IceCreamShopListImplement/IceCreamShopListImplement.csproj @@ -16,7 +16,7 @@ - + diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopContracts.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopContracts.dll index a447c772b4e8ced66c7bc91826922fde2eb8b1f4..f1e31a951a1ab58cfe37ef8bfa23658e66a98cf9 100644 GIT binary patch delta 4246 zcmXw-U1(fs8OPr4a>FzYQf4JCdH=UO~dYmEcP5G5d!P7?8Soag)=0DjR-61l^^K){Co_| zFaP;JzxO>KGo5MMx|eC)%e?kVZmIX<4{xqL=KT8R#@C#0bsT4Qb-oIajcZBduH17Eakv=;f6J9`Ax}gf|)AC@8kC|x8aWU zxAOy>p;F9U%y1X!5!|=xKl8?sD|VEkW*s?+tRp8e0t=3uL>b3Zidn&|;GBYU);v*o zQnFjc^p)b*LKf6e&%*_~V5v|?3Y4NYohkFcy^OO=UgjiPIFVA!HhZ=)S1_-WSMg(- z7(aGGS&?k>_JqSSVsz!Vm2@vIG5qFHEa16PNWpGjoHRowa)K~G1HhM z_L%lU#v5#rFiw@SMIWh;vkiBwc`-l087jrxwPw#!?$9H+&z>g7y;O>s&52pa$s4?! z3uWvv_Hr_wvxC1Bt2Dk+`UTrhlCm1_kHs5Sda0B!PL(3{IlzEssFZ$}-WlQgMx@D($d#38Jf-v%`YMgDl)h&Bu;yN(GI^QY!i;Dlnn)X2+h*+w(-o#&rm<3-9!?@nm`NF=TtT0~ zfM%$a1-ta-0N1LNK6^l}ID0^Dewp4=%Cy3?!n8{7D`i?^8rB%s83alhHyAgVw&)|J zOxsM`Oji%c`#)wHACPH}X^-iKo&K_vFin->^l|zj(vFpWUm7qTDn;5w+Qr$o&fiPM zl}`fWawn8x7Tl|2kB^p_mgzmEOe?nUS;~EybL9o~mAwCbSEL$J4QZZnoh<^TI1QWz zPQ!lh&*Yn!Eu2Ux=8El4=esnqQu-cwU3PF2m(Tx{D&-^w09K;GJH1^<)vCd?J|g!(kJ9pDa{t z(syZMrSu6oRZ6pkIiMLTuY`7B4sni3QFDj5jWizF(=5{}*;h(4k5i`!l+w4zky4s2 zIaXdV_WhsmBvpzuAP<$&IEOjK!;(F+NA}4+IUon*h#Zk)a!gLiDS78G@Bbmykjgp2 zVUBPZvPbrh@GU^&(*)#z9FZe(OpeJZIVBItL$Y&}qa2l^%y~TVc(OGlzPI+Y(>a@YZ1do& T|Hx+EJhyq|)`!l`v+jQZaGXe{ delta 4255 zcmXw-Z-^Xc9mk*9KbifLOY{F?Fm)!IBb*IqX&RM==ni`U&ogPjT4@_`#@$ekpf6Iv zH_GgEFQI2r@mxVFRCm}r=^3Q4hi?Mf9rjYW7s9pFB2;CUy9jyZpS}@M^!a`KHIPrg z`~7{MXP%ke+%{>ymTSM3`~FLX!~gin50`I!)Ol}t?aNNmb)1vM_L?zIb^Y9_?laCw z=a1dQiJf0{o!o(9>s!V+-R#z<)-UBw?RUcU?;L#PFIAf)l+nDh-(tY^As`;{UYk$2<}MOb#^5FU=N6tjj|!UlV47d%}Kks_t2E$67Y>t4ZGATMx;Hcp}xv%{Vp%tg%W}yfpyaI2kdEb zJmcJRu{`RWsQH{cfrN5OE#tBF1Fuu+fOLjV0=`l@}vPBl1Q#!6YRO>cH_uS)6jyX21ZyX4_}^uAK2HKsMDb^1Ul(+1PH!8l|PDP`Pb++^CO zPn0t4Fzqm1+9jX=lxez4rhTS;rfYWkdUe1wQ;IXh8OBJPRvK4FjK@lmwvo1R9$4q! zRpZJ}0^{-|lwy|MYZE7TdrUogUn$d??QdJkbDDPL4Golh{sUK}22ulQmT|}yky4x{ zP7|kTzxPj-T9|E|L@DN??a!2YG^tYhK6%CNV82;he*R}v8HX5=$4XgXO5CebnnFny zdo;dM`Z_sKN;8WY(nLz>+vLPDekYfdq*_GnF-Vot56GEPnhnem%~&bDDRWSzG#=Sk zN^_ztN3YWa!Z;U{We`$DN@-fCZJIQ;~tk z3tuTsojhBS^G2{uvq(Ms$9lb%ANr^s7emWky4r#tJ*Y) zQu-b_RZ6phIiSgu(r;GnM>}>$RAZ$Kc35C`bKgqoeX_q>@`>HNH8g=z`j8y$mOnL- zX6f7HL@CW8JH$PzR4Ic2Ia5lrfjXiYE2TFR98oDvVS;B#<13}FlLMtRAvucw|DOq| zS}aaz5}F=4Rf@BMGoZJ#Q)z}WqL!415YT+RsBaKh?HOsV44wTZ&;)FDjQu;PI zQA*Pzr^>6we*Oo%$dn?D$YZ56&R&kVSF%s`$pJYaN92f{kP~uBPRSWLBX92I^FO8< zQ#t#%%swtd_Q}CMz6EFknur{c6LLaM$tgJ_XXG(?Om_BjmHl#+X`dH9FE$PwHT6>K zpnMms9F(_U_K@VoLpFC;FVqg4Db)|l;t;kDOaK0bW6z%{d6Ux5PRgo~+=e|kfIE}2 zn>iw;2kS6|ts}CwP42;!BjS(9J2LHl_2PvCt8VY8>@a{EN3GL+^WxdYU3cS{Jf^|J z^7T3Rn0)ny9$&z|um|hMC9fREByW&MCv3ld?#X3mV$~hZ$OX(Nq+t^JncH?x}U%Cc)2ul@%&TXCubgAk8k{^aOfKcDkI}uxRf)- z+_1mjwSUonx4V3EviR)Jjd`~Fi<`BRUwFDaUkttZR~og`kGy^MmSerf6PLGs_I79M z?$({HUvK?p>y52D-M`%Y+G8KO&!}tn56`_d_07$%yca(5@bpL4?5-dF8cOz-{loU3 o5|(dGm+hKRmI%?+1T%mLGNh2Z@ALasU7T diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopDataModels.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopDataModels.dll index 8625536af13d370aa9d2c17ba396259ba10a2776..e20070ece2f40810adbbbe89d3c2bc87dc950b6a 100644 GIT binary patch delta 441 zcmZoLX)u}4!4mpO@BG9b8AhdvE5jMjO=e_NXT77(zz{N7kx6HAB%?Z`#^grEdPb(n zj7-9;9{dapjFTOO%_j#iEn)n!`72W<3**zt@$Aa=L5z9~#teBt(wd*sG~y8j6iiRR+E#3QjDNdHus@YAmjX= zmq@6*3S6MEc&)%Updm0IUOjHyDhO~gN7CXa#RR#qHfysgr&o=Xk{9C6z#021W_k}eEV3~w1-8H5-D7?Q!_$zbthAa5pPDp2BPeCFo49tumA!RVB$q2H*8O&}5lP{TpBAZn?HnR&Lz@_yADuz+^!oW%Vl)g-bhME^^s5W$`k{SxvkkRnAs1 z7nWUYzOd`Uh6{Ty?7Oh(!iLFSLMcX2wNHLQ)dFqgKA(B&z648Gm9FiDCVoSpW+>1E ku@xpNiUA|#yO7poCE+WZ`9yv(Guaq!7L<6;IMIL|03sHDHUIzs diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopListImplement.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopListImplement.dll index b12c4a4944d59c5c4cb633a553769dcd1a0e6dff..01e98b43731fe93454f62bb6776899b3aeeede54 100644 GIT binary patch delta 2352 zcmXw*ZD?Cn7{|}KdD(Ke^<}b+&AKH`N2$7@tV5>A64Ek?I*N{g`sIdfj5?NfD(r*E zy`df0;lOcWh=|N($Sdob$H_(DbzldLCpxn^xL$x1<%ol`#=lSgz$gfX-&;L31 zoYNE%+||LRe(#;(pU#b6QTCOn;rurJgi>`QvJd2MSFe3?TE8D^J(`K$Rq9k&a2^j| z)}!v-3nq~_?|OJeKc?rxFZHN?GyGK#>mNexJe0XrR!WD1b5AW#JO4bYzgV6+baapZ zNA9pXq6Xc=>KQd;SW#n!&nfXQ8CKM*YTT_T*KktpRF|?$?>>J78e zJJd?c*0rT1Q(B&q(sGQHmZYEImpq|@r9_KFi*$=b4^ofmx6D|HWZ6>k74j7_74nnR zQ{+98RZGd&$k%*AH3rU7&oB@WZCJ{{JedWPIp!{siRd;hC9}k$ORN*)JC@R2#ji1& z;JezFE9z=#uQR+(=nmW6Y5sbXd@0j6OoD=#v;NH@YaAJAtk=9iA83?$TDOZLmK%CKEa@wtp_H;*Y;iXX$5 zGQ;LbWqdg!ehTm5s~JB3RT^h9a{3wC4F($cMNAXZ#I!Lnrei5fui+C+*HZijUS-*O zRz4rv*5`fG&SiI+|AIWK1U(qQ2(}rEvvQgQmbS=p9t>avTU+D-G4%>{LfzXU$5UHn zDi2GB{nd?FoJN z3@SiHu!V_TIctnbs1xcQ-H~mw&;pFM$pd1zf=Q^=cJb-$lFU<=-~`5__5*%Iutg)L zPGAqCc5nhXvV#*)doX|t_=q}&E0|=597FX9(|v5k)W_WkYR~VJr2`nj7LAxXfjx}s zXA`glC;DYMk2-)YOx!OI>rsyku-yT9qz7MAE%mwjN`0s9tCU`@KVRQ7@bUEzrhhze z`b2xMaI$~@&}Yk=wQq9zXxP3mo>BX?+8dT<_lBu@dsp^Uv8D72(~kL~@wR#2Gv7h( zg`N7I%*CrpT?~Jz7k587wCP;?^M2|2>F?`*|NQAWZE_P&hoiHv9kQ)~-L_?x8~Nyw xT_+A4nf?0rn;#Zpv&jFi+u^sf51a2Uw`a$~?A*w5-|PRToXuyK2j~9M{{c{m&4~a2 delta 2409 zcmXw*UuYav6o>EKf5}eUBsO3%PrFGWtA7IzBx;_+7t@0k)l#%RvNMB!zu{+QfJNPA<&}WibMb^yE1e3+{J_X(?IL7^o4hnnhElW2ZNXN zn6q`>By#3D9-Pq+=+}cQdQ86&+|a{%BhZP#bW~JI2dxv2uO3MJeZRiCTHf{O4)1n$ zLOrbRb0*Z2YSgf#b{jsY#J^}*QZK7LPDwe2(`vgqm8lpOohrVHud1qg)j3SJhOen3 zYM)c5u9K;o%%XFeOo(p?J*Po*Ne!#L&JykOFe22ll;zg&F{WcFex2EMy6ftM+2{tf z(z11JDaoXkyCk(7BdI0nrTLO0l(&@V2+Stc1_T9)Fk<6}(6Qv4>~(y| z%lHbWf|TA?7b+<>3r+Q^7 z2MdPY9%rg|NUb<7YPMHGP1uDh%K$9EsjOsNY9B6OLh1;{u!~m?E5K1lW((A=&~s){ zJ}QJwOytN}BTP&kQ+Mf(Zjpr+V7NtY5W#Dhm|ATWpV}(P9CZOsVO(m@=T8WmG$QI4 zb}?!jCxD~dI03Z_eYk)RsUvs|6K|7as6Jt;kFA(`uQNsMdVR9A4@20b5mCpmi&6b- z0v6y@zbxlc`>=_L`sHR_>d^tVJ0Q1o;R~v%E~_upcj_ON)T{H)&+ix*eCwHy&X+Il zd;jF2Zzi{QYpXY_SF`%5VEO1H+1`o$(=)lpCMJU$N59?uZ27a_mELzCVO})On(K~v z2e~6}9`>Wn-$8SYnd{8E<_dnE9~t}p(Ap0};f4K|X8Zl0n!7%fROyLV+8_T|Z-3cd zX@AxJx_!C567(H=?ID{zd&_3!jzcRSTWr;A-FT+sQ=l(};7EJ^uj|c