From 3b7d750669a7e66b9140c786bfce4233a83b9745 Mon Sep 17 00:00:00 2001 From: DavidMakarov Date: Thu, 4 Apr 2024 00:39:31 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FlowerShop/FlowerShop/FlowerShopView.csproj | 2 +- FlowerShop/FlowerShop/FormMain.Designer.cs | 65 ++- FlowerShop/FlowerShop/FormMain.cs | 38 +- FlowerShop/FlowerShop/FormMain.resx | 2 +- .../FormReportFlowerComponents.Designer.cs | 115 ++-- .../FlowerShop/FormReportFlowerComponents.cs | 4 +- .../FormReportFlowerComponents.resx | 50 +- FlowerShop/FlowerShop/FormReportOrders.cs | 2 +- FlowerShop/FlowerShop/Program.cs | 9 + ...LogicsContracts.IComponentLogic.datasource | 10 + ...essLogicsContracts.IFlowerLogic.datasource | 10 + ...nessLogicsContracts.IOrderLogic.datasource | 10 + ...essLogicsContracts.IReportLogic.datasource | 10 + ...agesContracts.IComponentStorage.datasource | 10 + ...toragesContracts.IFlowerStorage.datasource | 10 + ...StoragesContracts.IOrderStorage.datasource | 10 + FlowerShop/FlowerShop/ReportOrders.rdlc | 543 +++++++++++++++++- .../BusinessLogics/ReportLogic.cs | 48 +- .../FlowerShopBusinessLogic.csproj | 2 +- .../OfficePackage/AbstractSaveToExcel.cs | 23 +- .../OfficePackage/AbstractSaveToPdf.cs | 6 +- .../OfficePackage/AbstractSaveToWord.cs | 8 +- .../OfficePackage/HelperModels/PdfInfo.cs | 1 + .../OfficePackage/HelperModels/WordInfo.cs | 2 +- .../OfficePackage/Implements/SaveToExcel.cs | 2 - .../OfficePackage/Implements/SaveToWord.cs | 3 +- .../FlowerShopContracts.csproj | 2 +- .../ReportFlowerComponentViewModel.cs | 4 +- .../ViewModels/ReportOrdersViewModel.cs | 7 +- .../FlowerShopDataModels.csproj | 2 +- .../FlowerShopDatabase.cs | 5 +- .../FlowerShopDatabaseImplement.csproj | 3 +- .../Implements/OrderStorage.cs | 10 +- ... => 20240324210216_InitCreate.Designer.cs} | 53 +- ...Create.cs => 20240324210216_InitCreate.cs} | 45 +- .../FlowerShopDatabaseModelSnapshot.cs | 49 +- .../FlowerShopFileImplement.csproj | 2 +- .../Implements/OrderStorage.cs | 11 +- .../FlowerShopListImplement.csproj | 2 +- .../Implements/OrderStorage.cs | 2 +- 40 files changed, 917 insertions(+), 275 deletions(-) create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IComponentLogic.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IFlowerLogic.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IOrderLogic.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IReportLogic.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IComponentStorage.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IFlowerStorage.datasource create mode 100644 FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IOrderStorage.datasource rename FlowerShop/FlowerShopDatabaseImplement/Migrations/{20240308215929_InitialCreate.Designer.cs => 20240324210216_InitCreate.Designer.cs} (73%) rename FlowerShop/FlowerShopDatabaseImplement/Migrations/{20240308215929_InitialCreate.cs => 20240324210216_InitCreate.cs} (63%) diff --git a/FlowerShop/FlowerShop/FlowerShopView.csproj b/FlowerShop/FlowerShop/FlowerShopView.csproj index 756e47a..a06ab23 100644 --- a/FlowerShop/FlowerShop/FlowerShopView.csproj +++ b/FlowerShop/FlowerShop/FlowerShopView.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net7.0-windows7.0 enable true enable diff --git a/FlowerShop/FlowerShop/FormMain.Designer.cs b/FlowerShop/FlowerShop/FormMain.Designer.cs index 8563981..1f17a4e 100644 --- a/FlowerShop/FlowerShop/FormMain.Designer.cs +++ b/FlowerShop/FlowerShop/FormMain.Designer.cs @@ -32,16 +32,16 @@ справочникиToolStripMenuItem = new ToolStripMenuItem(); ЦветыToolStripMenuItem = new ToolStripMenuItem(); КомпонентыToolStripMenuItem = new ToolStripMenuItem(); + отчётыToolStripMenuItem = new ToolStripMenuItem(); + списокЦветковToolStripMenuItem = new ToolStripMenuItem(); + компонентыПоЦветамToolStripMenuItem = new ToolStripMenuItem(); + списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonRef = new Button(); - отчётыToolStripMenuItem = new ToolStripMenuItem(); - списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -76,6 +76,34 @@ КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // + // отчётыToolStripMenuItem + // + отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокЦветковToolStripMenuItem, компонентыПоЦветамToolStripMenuItem, списокЗаказовToolStripMenuItem }); + отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; + отчётыToolStripMenuItem.Size = new Size(60, 20); + отчётыToolStripMenuItem.Text = "Отчёты"; + // + // списокЦветковToolStripMenuItem + // + списокЦветковToolStripMenuItem.Name = "списокЦветковToolStripMenuItem"; + списокЦветковToolStripMenuItem.Size = new Size(204, 22); + списокЦветковToolStripMenuItem.Text = "Список цветков"; + списокЦветковToolStripMenuItem.Click += списокЦветковToolStripMenuItem_Click; + // + // компонентыПоЦветамToolStripMenuItem + // + компонентыПоЦветамToolStripMenuItem.Name = "компонентыПоЦветамToolStripMenuItem"; + компонентыПоЦветамToolStripMenuItem.Size = new Size(204, 22); + компонентыПоЦветамToolStripMenuItem.Text = "Компоненты по цветам"; + компонентыПоЦветамToolStripMenuItem.Click += компонентыПоЦветамToolStripMenuItem_Click; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(204, 22); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; + // // dataGridView // dataGridView.BackgroundColor = Color.White; @@ -136,31 +164,6 @@ buttonRef.UseVisualStyleBackColor = true; buttonRef.Click += ButtonRef_Click; // - // отчётыToolStripMenuItem - // - отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; - отчётыToolStripMenuItem.Size = new Size(60, 20); - отчётыToolStripMenuItem.Text = "Отчёты"; - // - // списокКомпонентовToolStripMenuItem - // - списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; - списокКомпонентовToolStripMenuItem.Size = new Size(218, 22); - списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; - // - // компонентыПоИзделиямToolStripMenuItem - // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(218, 22); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(218, 22); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - // // FormMain // AutoScaleDimensions = new SizeF(7F, 15F); @@ -197,8 +200,8 @@ private Button buttonIssuedOrder; private Button buttonRef; private ToolStripMenuItem отчётыToolStripMenuItem; - private ToolStripMenuItem списокКомпонентовToolStripMenuItem; - private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; + private ToolStripMenuItem списокЦветковToolStripMenuItem; + private ToolStripMenuItem компонентыПоЦветамToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem; } } \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FormMain.cs b/FlowerShop/FlowerShop/FormMain.cs index 3b92cbb..4f3779d 100644 --- a/FlowerShop/FlowerShop/FormMain.cs +++ b/FlowerShop/FlowerShop/FormMain.cs @@ -1,4 +1,5 @@ -using FlowerShopContracts.BindingModels; +using FlowerShopBusinessLogic.BusinessLogics; +using FlowerShopContracts.BindingModels; using FlowerShopContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; @@ -8,11 +9,13 @@ namespace FlowerShopView { private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) + private readonly IReportLogic _reportLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + _reportLogic = reportLogic; } private void FormMain_Load(object sender, EventArgs e) { @@ -140,5 +143,36 @@ namespace FlowerShopView { LoadData(); } + + private void списокЦветковToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveComponentsToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + + private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } + + private void компонентыПоЦветамToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportFlowerComponents)); + if (service is FormReportFlowerComponents form) + { + form.ShowDialog(); + } + } } } diff --git a/FlowerShop/FlowerShop/FormMain.resx b/FlowerShop/FlowerShop/FormMain.resx index 5203d24..a0623c8 100644 --- a/FlowerShop/FlowerShop/FormMain.resx +++ b/FlowerShop/FlowerShop/FormMain.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/FlowerShop/FlowerShop/FormReportFlowerComponents.Designer.cs b/FlowerShop/FlowerShop/FormReportFlowerComponents.Designer.cs index 7167816..f56e034 100644 --- a/FlowerShop/FlowerShop/FormReportFlowerComponents.Designer.cs +++ b/FlowerShop/FlowerShop/FormReportFlowerComponents.Designer.cs @@ -28,87 +28,86 @@ /// private void InitializeComponent() { - this.dataGridView = new System.Windows.Forms.DataGridView(); - this.buttonSaveToExcel = new System.Windows.Forms.Button(); - this.ColumnComponent = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnFlower = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); - this.SuspendLayout(); + dataGridView = new DataGridView(); + buttonSaveToExcel = new Button(); + ColumnComponent = new DataGridViewTextBoxColumn(); + ColumnFlower = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); // // dataGridView // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - this.dataGridView.AllowUserToOrderColumns = true; - this.dataGridView.AllowUserToResizeColumns = false; - this.dataGridView.AllowUserToResizeRows = false; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.ColumnComponent, - this.ColumnFlower, - this.ColumnCount}); - this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom; - this.dataGridView.Location = new System.Drawing.Point(0, 41); - this.dataGridView.MultiSelect = false; - this.dataGridView.Name = "dataGridView"; - this.dataGridView.ReadOnly = true; - this.dataGridView.RowHeadersVisible = false; - this.dataGridView.Size = new System.Drawing.Size(528, 442); - this.dataGridView.TabIndex = 0; + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AllowUserToOrderColumns = true; + dataGridView.AllowUserToResizeColumns = false; + dataGridView.AllowUserToResizeRows = false; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnComponent, ColumnFlower, ColumnCount }); + dataGridView.Dock = DockStyle.Bottom; + dataGridView.Location = new Point(0, 47); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.Size = new Size(616, 510); + dataGridView.TabIndex = 0; // // buttonSaveToExcel // - this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 12); - this.buttonSaveToExcel.Name = "buttonSaveToExcel"; - this.buttonSaveToExcel.Size = new System.Drawing.Size(159, 23); - this.buttonSaveToExcel.TabIndex = 1; - this.buttonSaveToExcel.Text = "Сохранить в Excel"; - this.buttonSaveToExcel.UseVisualStyleBackColor = true; - this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click); + buttonSaveToExcel.Location = new Point(14, 14); + buttonSaveToExcel.Margin = new Padding(4, 3, 4, 3); + buttonSaveToExcel.Name = "buttonSaveToExcel"; + buttonSaveToExcel.Size = new Size(186, 27); + buttonSaveToExcel.TabIndex = 1; + buttonSaveToExcel.Text = "Сохранить в Excel"; + buttonSaveToExcel.UseVisualStyleBackColor = true; + buttonSaveToExcel.Click += ButtonSaveToExcel_Click; // // ColumnComponent // - this.ColumnComponent.HeaderText = "Компонент"; - this.ColumnComponent.Name = "ColumnComponent"; - this.ColumnComponent.ReadOnly = true; - this.ColumnComponent.Width = 200; + ColumnComponent.HeaderText = "Цветы"; + ColumnComponent.Name = "ColumnComponent"; + ColumnComponent.ReadOnly = true; + ColumnComponent.Width = 200; // // ColumnFlower // - this.ColumnFlower.HeaderText = "Цветы"; - this.ColumnFlower.Name = "ColumnFlower"; - this.ColumnFlower.ReadOnly = true; - this.ColumnFlower.Width = 200; + ColumnFlower.HeaderText = "Компонент"; + ColumnFlower.Name = "ColumnFlower"; + ColumnFlower.ReadOnly = true; + ColumnFlower.Width = 200; // // ColumnCount // - this.ColumnCount.HeaderText = "Количество"; - this.ColumnCount.Name = "ColumnCount"; - this.ColumnCount.ReadOnly = true; + ColumnCount.HeaderText = "Количество"; + ColumnCount.Name = "ColumnCount"; + ColumnCount.ReadOnly = true; // // FormReportFlowerComponents // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(528, 483); - this.Controls.Add(this.buttonSaveToExcel); - this.Controls.Add(this.dataGridView); - this.Name = "FormReportFlowerComponents"; - this.Text = "Компоненты по цветам"; - this.Load += new System.EventHandler(this.FormReportFlowerComponents_Load); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(616, 557); + Controls.Add(buttonSaveToExcel); + Controls.Add(dataGridView); + Margin = new Padding(4, 3, 4, 3); + Name = "FormReportFlowerComponents"; + Text = "Компоненты по цветам"; + Load += FormReportFlowerComponents_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); } #endregion private System.Windows.Forms.DataGridView dataGridView; private System.Windows.Forms.Button buttonSaveToExcel; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnComponent; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnFlower; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCount; + private DataGridViewTextBoxColumn ColumnComponent; + private DataGridViewTextBoxColumn ColumnFlower; + private DataGridViewTextBoxColumn ColumnCount; } } \ No newline at end of file diff --git a/FlowerShop/FlowerShop/FormReportFlowerComponents.cs b/FlowerShop/FlowerShop/FormReportFlowerComponents.cs index 49e4c87..e0aee65 100644 --- a/FlowerShop/FlowerShop/FormReportFlowerComponents.cs +++ b/FlowerShop/FlowerShop/FormReportFlowerComponents.cs @@ -36,8 +36,8 @@ namespace FlowerShopView dataGridView.Rows.Clear(); foreach (var elem in dict) { - dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" }); - foreach (var listElem in elem.Flowers) + dataGridView.Rows.Add(new object[] { elem.FlowerName, "", "" }); + foreach (var listElem in elem.Components) { dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); } diff --git a/FlowerShop/FlowerShop/FormReportFlowerComponents.resx b/FlowerShop/FlowerShop/FormReportFlowerComponents.resx index 1af7de1..af32865 100644 --- a/FlowerShop/FlowerShop/FormReportFlowerComponents.resx +++ b/FlowerShop/FlowerShop/FormReportFlowerComponents.resx @@ -1,17 +1,17 @@  - diff --git a/FlowerShop/FlowerShop/FormReportOrders.cs b/FlowerShop/FlowerShop/FormReportOrders.cs index ca487f2..e8c640b 100644 --- a/FlowerShop/FlowerShop/FormReportOrders.cs +++ b/FlowerShop/FlowerShop/FormReportOrders.cs @@ -22,7 +22,7 @@ namespace FlowerShopView { Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("..\\..\\..\\ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); Controls.Add(panel); diff --git a/FlowerShop/FlowerShop/Program.cs b/FlowerShop/FlowerShop/Program.cs index 82130e5..29e5a8a 100644 --- a/FlowerShop/FlowerShop/Program.cs +++ b/FlowerShop/FlowerShop/Program.cs @@ -1,4 +1,6 @@ using FlowerShopBusinessLogic.BusinessLogics; +using FlowerShopBusinessLogic.OfficePackage.Implements; +using FlowerShopBusinessLogic.OfficePackage; using FlowerShopContracts.BusinessLogicsContracts; using FlowerShopContracts.StoragesContracts; using FlowerShopDatabaseImplement.Implements; @@ -40,6 +42,11 @@ namespace FlowerShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -48,6 +55,8 @@ namespace FlowerShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IComponentLogic.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IComponentLogic.datasource new file mode 100644 index 0000000..3ba166a --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IComponentLogic.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.BusinessLogicsContracts.IComponentLogic, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IFlowerLogic.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IFlowerLogic.datasource new file mode 100644 index 0000000..d0d3d55 --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IFlowerLogic.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.BusinessLogicsContracts.IFlowerLogic, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IOrderLogic.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IOrderLogic.datasource new file mode 100644 index 0000000..4123f10 --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IOrderLogic.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.BusinessLogicsContracts.IOrderLogic, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IReportLogic.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IReportLogic.datasource new file mode 100644 index 0000000..133dabc --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.BusinessLogicsContracts.IReportLogic.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.BusinessLogicsContracts.IReportLogic, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IComponentStorage.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IComponentStorage.datasource new file mode 100644 index 0000000..352f56b --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IComponentStorage.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.StoragesContracts.IComponentStorage, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IFlowerStorage.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IFlowerStorage.datasource new file mode 100644 index 0000000..028bfb5 --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IFlowerStorage.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.StoragesContracts.IFlowerStorage, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IOrderStorage.datasource b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IOrderStorage.datasource new file mode 100644 index 0000000..d8f9b77 --- /dev/null +++ b/FlowerShop/FlowerShop/Properties/DataSources/FlowerShopContracts.StoragesContracts.IOrderStorage.datasource @@ -0,0 +1,10 @@ + + + + FlowerShopContracts.StoragesContracts.IOrderStorage, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/FlowerShop/FlowerShop/ReportOrders.rdlc b/FlowerShop/FlowerShop/ReportOrders.rdlc index c522885..6f2cac2 100644 --- a/FlowerShop/FlowerShop/ReportOrders.rdlc +++ b/FlowerShop/FlowerShop/ReportOrders.rdlc @@ -1,29 +1,553 @@ 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + FlowerShopContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + FlowerName + System.String + + + Status + System.String + + + Sum + System.Decimal + + + + FlowerShopContracts.ViewModels + ReportOrdersViewModel + FlowerShopContracts.ViewModels.ReportOrdersViewModel, FlowerShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + - + true true - - - - Textbox1 - 0.60537cm - 6.24099cm + ReportParameterPeriod + 1.25764cm + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Заказы + + + + + + + 0.22236cm + 1cm + 21cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.5cm + + + 3.21438cm + + + 8.23317cm + + + 2.5cm + + + 2.5cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Изделие + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!FlowerName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Status.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.74155cm + 0.55245cm + 1.2cm + 18.94755cm + 2 + + + + + + true + true + + + + + Итого: + + + + + + + 4.25764cm + 14.5cm 0.6cm 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4.25764cm + 17cm + 0.6cm + 2.5cm + 4 @@ -38,7 +562,7 @@ 2in