diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs index 2ea5e3b..e4bc8c8 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs @@ -47,18 +47,19 @@ panelTop.Controls.Add(labelFrom); panelTop.Controls.Add(dateTimePickerTo); panelTop.Controls.Add(dateTimePickerFrom); - panelTop.Location = new Point(14, 16); - panelTop.Margin = new Padding(3, 4, 3, 4); + panelTop.Location = new Point(18, 20); + panelTop.Margin = new Padding(4, 5, 4, 5); panelTop.Name = "panelTop"; - panelTop.Size = new Size(887, 57); + panelTop.Size = new Size(1109, 71); panelTop.TabIndex = 0; + panelTop.Paint += panelTop_Paint; // // ToPdfButton // - ToPdfButton.Location = new Point(712, 23); - ToPdfButton.Margin = new Padding(3, 4, 3, 4); + ToPdfButton.Location = new Point(890, 29); + ToPdfButton.Margin = new Padding(4, 5, 4, 5); ToPdfButton.Name = "ToPdfButton"; - ToPdfButton.Size = new Size(171, 31); + ToPdfButton.Size = new Size(214, 39); ToPdfButton.TabIndex = 5; ToPdfButton.Text = "В Pdf"; ToPdfButton.UseVisualStyleBackColor = true; @@ -66,10 +67,10 @@ // // MakeButton // - MakeButton.Location = new Point(537, 23); - MakeButton.Margin = new Padding(3, 4, 3, 4); + MakeButton.Location = new Point(671, 29); + MakeButton.Margin = new Padding(4, 5, 4, 5); MakeButton.Name = "MakeButton"; - MakeButton.Size = new Size(168, 31); + MakeButton.Size = new Size(210, 39); MakeButton.TabIndex = 4; MakeButton.Text = "Сформировать"; MakeButton.UseVisualStyleBackColor = true; @@ -78,52 +79,57 @@ // labelUntill // labelUntill.AutoSize = true; - labelUntill.Location = new Point(269, 31); + labelUntill.Location = new Point(336, 39); + labelUntill.Margin = new Padding(4, 0, 4, 0); labelUntill.Name = "labelUntill"; - labelUntill.Size = new Size(29, 20); + labelUntill.Size = new Size(36, 25); labelUntill.TabIndex = 3; labelUntill.Text = "По"; // // labelFrom // labelFrom.AutoSize = true; - labelFrom.Location = new Point(9, 31); + labelFrom.Location = new Point(11, 39); + labelFrom.Margin = new Padding(4, 0, 4, 0); labelFrom.Name = "labelFrom"; - labelFrom.Size = new Size(18, 20); + labelFrom.Size = new Size(23, 25); labelFrom.TabIndex = 2; labelFrom.Text = "С"; // // dateTimePickerTo // - dateTimePickerTo.Location = new Point(302, 23); - dateTimePickerTo.Margin = new Padding(3, 4, 3, 4); + dateTimePickerTo.Location = new Point(378, 29); + dateTimePickerTo.Margin = new Padding(4, 5, 4, 5); dateTimePickerTo.Name = "dateTimePickerTo"; - dateTimePickerTo.Size = new Size(228, 27); + dateTimePickerTo.Size = new Size(284, 31); dateTimePickerTo.TabIndex = 1; // // dateTimePickerFrom // - dateTimePickerFrom.Location = new Point(33, 23); - dateTimePickerFrom.Margin = new Padding(3, 4, 3, 4); + dateTimePickerFrom.Location = new Point(41, 29); + dateTimePickerFrom.Margin = new Padding(4, 5, 4, 5); dateTimePickerFrom.Name = "dateTimePickerFrom"; - dateTimePickerFrom.Size = new Size(228, 27); + dateTimePickerFrom.Size = new Size(284, 31); dateTimePickerFrom.TabIndex = 0; + dateTimePickerFrom.ValueChanged += dateTimePickerFrom_ValueChanged; // // panelReport // - panelReport.Location = new Point(14, 80); + panelReport.Location = new Point(18, 100); + panelReport.Margin = new Padding(4); panelReport.Name = "panelReport"; - panelReport.Size = new Size(888, 508); + panelReport.Size = new Size(1110, 635); panelReport.TabIndex = 1; + panelReport.Paint += panelReport_Paint; // // FormReportOrders // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(10F, 25F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(914, 600); + ClientSize = new Size(1142, 750); Controls.Add(panelReport); Controls.Add(panelTop); - Margin = new Padding(3, 4, 3, 4); + Margin = new Padding(4, 5, 4, 5); Name = "FormReportOrders"; Text = "Заказы"; panelTop.ResumeLayout(false); diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs index 4dfaa6e..f47f0bf 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs @@ -29,7 +29,6 @@ namespace BlacksmithWorkshop Dock = DockStyle.Fill }; reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); - panelReport.Controls.Add(reportViewer); } @@ -97,5 +96,20 @@ namespace BlacksmithWorkshop } } } + + private void panelReport_Paint(object sender, PaintEventArgs e) + { + + } + + private void panelTop_Paint(object sender, PaintEventArgs e) + { + + } + + private void dateTimePickerFrom_ValueChanged(object sender, EventArgs e) + { + + } } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx index 1af7de1..28e1061 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx @@ -1,17 +1,17 @@  - @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 25 + \ No newline at end of file