diff --git a/SushiBar/SushiBarView/FormReportOrders.Designer.cs b/SushiBar/SushiBarView/FormReportOrders.Designer.cs index 0a33b89..2709df0 100644 --- a/SushiBar/SushiBarView/FormReportOrders.Designer.cs +++ b/SushiBar/SushiBarView/FormReportOrders.Designer.cs @@ -33,33 +33,37 @@ panel = new Panel(); ButtonToPdf = new Button(); ButtonMake = new Button(); - reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer(); + labelFrom = new Label(); + labelTo = new Label(); panel.SuspendLayout(); SuspendLayout(); // // dateTimePickerFrom // - dateTimePickerFrom.Location = new Point(58, 11); + dateTimePickerFrom.Location = new Point(49, 15); dateTimePickerFrom.Name = "dateTimePickerFrom"; dateTimePickerFrom.Size = new Size(200, 23); dateTimePickerFrom.TabIndex = 0; // // dateTimePickerTo // - dateTimePickerTo.Location = new Point(321, 11); + dateTimePickerTo.Location = new Point(320, 15); dateTimePickerTo.Name = "dateTimePickerTo"; dateTimePickerTo.Size = new Size(200, 23); dateTimePickerTo.TabIndex = 1; // // panel // + panel.Controls.Add(labelTo); + panel.Controls.Add(labelFrom); panel.Controls.Add(ButtonToPdf); panel.Controls.Add(ButtonMake); panel.Controls.Add(dateTimePickerTo); panel.Controls.Add(dateTimePickerFrom); - panel.Location = new Point(3, 3); + panel.Dock = DockStyle.Top; + panel.Location = new Point(0, 0); panel.Name = "panel"; - panel.Size = new Size(1191, 52); + panel.Size = new Size(1197, 52); panel.TabIndex = 2; // // ButtonToPdf @@ -74,7 +78,7 @@ // // ButtonMake // - ButtonMake.Location = new Point(583, 10); + ButtonMake.Location = new Point(571, 15); ButtonMake.Name = "ButtonMake"; ButtonMake.Size = new Size(149, 23); ButtonMake.TabIndex = 2; @@ -82,13 +86,23 @@ ButtonMake.UseVisualStyleBackColor = true; ButtonMake.Click += ButtonMake_Click; // - // reportViewer1 + // labelFrom // - reportViewer1.Location = new Point(0, 0); - reportViewer1.Name = "ReportViewer"; - reportViewer1.ServerReport.BearerToken = null; - reportViewer1.Size = new Size(396, 246); - reportViewer1.TabIndex = 0; + labelFrom.AutoSize = true; + labelFrom.Location = new Point(27, 19); + labelFrom.Name = "labelFrom"; + labelFrom.Size = new Size(15, 15); + labelFrom.TabIndex = 3; + labelFrom.Text = "С"; + // + // labelTo + // + labelTo.AutoSize = true; + labelTo.Location = new Point(269, 19); + labelTo.Name = "labelTo"; + labelTo.Size = new Size(21, 15); + labelTo.TabIndex = 3; + labelTo.Text = "по"; // // FormReportOrders // @@ -99,6 +113,7 @@ Name = "FormReportOrders"; Text = "Заказы"; panel.ResumeLayout(false); + panel.PerformLayout(); ResumeLayout(false); } @@ -109,6 +124,7 @@ private Panel panel; private Button ButtonToPdf; private Button ButtonMake; - private Microsoft.Reporting.WinForms.ReportViewer reportViewer1; + private Label labelTo; + private Label labelFrom; } } \ No newline at end of file diff --git a/SushiBar/SushiBarView/FormReportOrders.resx b/SushiBar/SushiBarView/FormReportOrders.resx index fbd1d64..af32865 100644 --- a/SushiBar/SushiBarView/FormReportOrders.resx +++ b/SushiBar/SushiBarView/FormReportOrders.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file