diff --git a/InternetShop/InternetShopForms/Orders/FormOrderEdit.Designer.cs b/InternetShop/InternetShopForms/Orders/FormOrderEdit.Designer.cs new file mode 100644 index 0000000..4d7e418 --- /dev/null +++ b/InternetShop/InternetShopForms/Orders/FormOrderEdit.Designer.cs @@ -0,0 +1,39 @@ +namespace InternetShopForms.Orders +{ + partial class FormOrderEdit + { + /// + /// 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() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "FormOrderEdit"; + } + + #endregion + } +} \ No newline at end of file diff --git a/InternetShop/InternetShopForms/Orders/FormOrderEdit.cs b/InternetShop/InternetShopForms/Orders/FormOrderEdit.cs new file mode 100644 index 0000000..7982a35 --- /dev/null +++ b/InternetShop/InternetShopForms/Orders/FormOrderEdit.cs @@ -0,0 +1,20 @@ +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 InternetShopForms.Orders +{ + public partial class FormOrderEdit : Form + { + public FormOrderEdit() + { + InitializeComponent(); + } + } +} diff --git a/InternetShop/InternetShopForms/Orders/FormOrderEdit.resx b/InternetShop/InternetShopForms/Orders/FormOrderEdit.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/InternetShop/InternetShopForms/Orders/FormOrderEdit.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/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs index a9e8234..bd011f9 100644 --- a/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs +++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs @@ -28,18 +28,90 @@ /// private void InitializeComponent() { + tableComponent = new WinFormsLibrary1.TableComponent(); + menuStrip = new MenuStrip(); + productsToolStripMenuItem = new ToolStripMenuItem(); + reportsToolStripMenuItem = new ToolStripMenuItem(); + reportOrderImagesExcelToolStripMenuItem = new ToolStripMenuItem(); + reportOrdersWordToolStripMenuItem = new ToolStripMenuItem(); + reportProductsPDFToolStripMenuItem = new ToolStripMenuItem(); + menuStrip.SuspendLayout(); SuspendLayout(); // + // tableComponent + // + tableComponent.Dock = DockStyle.Fill; + tableComponent.Location = new Point(0, 28); + tableComponent.Margin = new Padding(3, 4, 3, 4); + tableComponent.Name = "tableComponent"; + tableComponent.Size = new Size(887, 361); + tableComponent.TabIndex = 1; + // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { productsToolStripMenuItem, reportsToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(887, 28); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip1"; + // + // productsToolStripMenuItem + // + productsToolStripMenuItem.Name = "productsToolStripMenuItem"; + productsToolStripMenuItem.Size = new Size(134, 24); + productsToolStripMenuItem.Text = "Список товаров"; + productsToolStripMenuItem.Click += productsToolStripMenuItem_Click; + // + // reportsToolStripMenuItem + // + reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { reportOrderImagesExcelToolStripMenuItem, reportOrdersWordToolStripMenuItem, reportProductsPDFToolStripMenuItem }); + reportsToolStripMenuItem.Name = "reportsToolStripMenuItem"; + reportsToolStripMenuItem.Size = new Size(73, 24); + reportsToolStripMenuItem.Text = "Отчеты"; + // + // reportOrderImagesExcelToolStripMenuItem + // + reportOrderImagesExcelToolStripMenuItem.Name = "reportOrderImagesExcelToolStripMenuItem"; + reportOrderImagesExcelToolStripMenuItem.Size = new Size(296, 26); + reportOrderImagesExcelToolStripMenuItem.Text = "Изображения заказов (Excel)"; + // + // reportOrdersWordToolStripMenuItem + // + reportOrdersWordToolStripMenuItem.Name = "reportOrdersWordToolStripMenuItem"; + reportOrdersWordToolStripMenuItem.Size = new Size(296, 26); + reportOrdersWordToolStripMenuItem.Text = "Отчет по заказам (Word)"; + // + // reportProductsPDFToolStripMenuItem + // + reportProductsPDFToolStripMenuItem.Name = "reportProductsPDFToolStripMenuItem"; + reportProductsPDFToolStripMenuItem.Size = new Size(296, 26); + reportProductsPDFToolStripMenuItem.Text = "Отчет по товарам (PDF)"; + // // FormOrdersList // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(887, 389); + Controls.Add(tableComponent); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormOrdersList"; Text = "Заказы"; + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion + private WinFormsLibrary1.TableComponent tableComponent; + private MenuStrip menuStrip; + private ToolStripMenuItem productsToolStripMenuItem; + private ToolStripMenuItem reportsToolStripMenuItem; + private ToolStripMenuItem reportOrderImagesExcelToolStripMenuItem; + private ToolStripMenuItem reportOrdersWordToolStripMenuItem; + private ToolStripMenuItem reportProductsPDFToolStripMenuItem; } } diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs index a931355..5193f9f 100644 --- a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs +++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs @@ -6,5 +6,10 @@ namespace InternetShopForms { InitializeComponent(); } + + private void productsToolStripMenuItem_Click(object sender, EventArgs e) + { + // todo + } } } diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.resx b/InternetShop/InternetShopForms/Orders/FormOrdersList.resx index 8b2ff64..31084d5 100644 --- a/InternetShop/InternetShopForms/Orders/FormOrdersList.resx +++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/InternetShop/InternetShopForms/Products/FormProductsList.Designer.cs b/InternetShop/InternetShopForms/Products/FormProductsList.Designer.cs new file mode 100644 index 0000000..a8a2564 --- /dev/null +++ b/InternetShop/InternetShopForms/Products/FormProductsList.Designer.cs @@ -0,0 +1,39 @@ +namespace InternetShopForms.Products +{ + partial class FormProductsList + { + /// + /// 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() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "FormProductsList"; + } + + #endregion + } +} \ No newline at end of file diff --git a/InternetShop/InternetShopForms/Products/FormProductsList.cs b/InternetShop/InternetShopForms/Products/FormProductsList.cs new file mode 100644 index 0000000..c201045 --- /dev/null +++ b/InternetShop/InternetShopForms/Products/FormProductsList.cs @@ -0,0 +1,20 @@ +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 InternetShopForms.Products +{ + public partial class FormProductsList : Form + { + public FormProductsList() + { + InitializeComponent(); + } + } +} diff --git a/InternetShop/InternetShopForms/Products/FormProductsList.resx b/InternetShop/InternetShopForms/Products/FormProductsList.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/InternetShop/InternetShopForms/Products/FormProductsList.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/InternetShop/InternetShopForms/Program.cs b/InternetShop/InternetShopForms/Program.cs index cb12ebf..c2ee388 100644 --- a/InternetShop/InternetShopForms/Program.cs +++ b/InternetShop/InternetShopForms/Program.cs @@ -1,6 +1,8 @@ using InternetShopContracts.LogicsContracts; using InternetShopContracts.StorageContracts; using InternetShopDatabase.Storages; +using InternetShopForms.Orders; +using InternetShopForms.Products; using InternetShopLogics.Logics; using Microsoft.Extensions.DependencyInjection; @@ -33,6 +35,8 @@ namespace InternetShopForms services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file