From afbe5ce0d88cb1e1d157f1d2f23ea6f5fb8e1deb Mon Sep 17 00:00:00 2001 From: "ityurner02@mail.ru" Date: Mon, 20 Mar 2023 19:32: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 --- .../FormReportWorkComponents.Designer.cs | 22 +++++++++---------- .../OfficePackage/AbstractSaveToExcel.cs | 2 +- .../OfficePackage/AbstractSaveToPdf.cs | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PlumbingRepair/PlumbingRepair/FormReportWorkComponents.Designer.cs b/PlumbingRepair/PlumbingRepair/FormReportWorkComponents.Designer.cs index d5e8988..57df7e0 100644 --- a/PlumbingRepair/PlumbingRepair/FormReportWorkComponents.Designer.cs +++ b/PlumbingRepair/PlumbingRepair/FormReportWorkComponents.Designer.cs @@ -30,8 +30,8 @@ { this.ButtonSave = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); - this.component = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.work = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.component = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.count = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -50,8 +50,8 @@ // this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.component, this.work, + this.component, this.count}); this.dataGridView.Location = new System.Drawing.Point(12, 41); this.dataGridView.Name = "dataGridView"; @@ -59,23 +59,23 @@ this.dataGridView.Size = new System.Drawing.Size(776, 397); this.dataGridView.TabIndex = 1; // - // component - // - this.component.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.component.HeaderText = "Компонент"; - this.component.Name = "component"; - // - // sushi + // work // + this.work.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.work.HeaderText = "Изделие"; this.work.Name = "work"; // + // component + // + this.component.HeaderText = "Компонент"; + this.component.Name = "component"; + // // count // this.count.HeaderText = "Количество"; this.count.Name = "count"; // - // FormComponentsOnSushi + // FormReportWorkComponents // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -94,8 +94,8 @@ private Button ButtonSave; private DataGridView dataGridView; - private DataGridViewTextBoxColumn component; private DataGridViewTextBoxColumn work; + private DataGridViewTextBoxColumn component; private DataGridViewTextBoxColumn count; } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 775d555..ae82d9d 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -56,7 +56,7 @@ namespace PlumbingRepairBusinessLogic.OfficePackage { ColumnName = "A", RowIndex = rowIndex, - Text = "Total", + Text = "Итого", StyleInfo = ExcelStyleInfoType.Text }); InsertCellInWorksheet(new ExcelCellParameters diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index 162be00..76c8250 100644 --- a/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -16,14 +16,14 @@ namespace PlumbingRepairBusinessLogic.OfficePackage }); CreateParagraph(new PdfParagraph { - Text = $"с{info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", + Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); CreateTable(new List { "2cm", "3cm", "6cm", "2cm", "3cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Id", "Date", "Work", "Status", "Cost" }, + Texts = new List { "Номер", "Дата создания", "Изделие", "Статус", "Стоимость" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });