diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs index 4f7113e..64825f7 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs @@ -23,12 +23,13 @@ namespace BlacksmithWorkshop private readonly IReportLogic _reportLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + _reportLogic= reportLogic; } private void FormMain_Load(object sender, EventArgs e) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs index c6350b8..c5ec630 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs @@ -32,7 +32,7 @@ namespace BlacksmithWorkshop reportViewer = new ReportViewer { - Dock = DockStyle.Fill + Dock = DockStyle.Bottom }; reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc b/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc index eff9a1e..45d2c73 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc +++ b/BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc @@ -2,7 +2,7 @@ 0 - + System.Data.DataSet /* Local Connection */ @@ -33,6 +33,10 @@ Sum System.Decimal + + Status + System.String + BlacksmithWorkshopContracts.ViewModels @@ -122,11 +126,14 @@ 3.21438cm - 8.23317cm + 6.23317cm 2.5cm + + 5.23317cm + @@ -260,6 +267,38 @@ + + + + true + true + + + + + Статус + + + + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -387,6 +426,36 @@ + + + + true + true + + + + + =Fields!Status.Value + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -413,7 +482,7 @@ 2.48391cm 0.55245cm 1.2cm - 16.44755cm + 19.68072cm 2