From c00314291de6ea767ea18a6d51fd54011f71ced7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?= <116575516+LAYT73@users.noreply.github.com> Date: Sun, 24 Nov 2024 23:27:20 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9B=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=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/ContractorFuel.cs | 5 + .../Entities/ContractorFuelFuel.cs | 1 + .../ProjectGasStation/Entities/FuelSale.cs | 12 + .../Entities/TempContractorFuelFuel.cs | 16 + .../Entities/TempFuelFuelSale.cs | 17 + .../FormGasStation.Designer.cs | 47 ++- .../ProjectGasStation/FormGasStation.cs | 39 +++ .../Forms/FormContractorFuel.cs | 2 +- ...ntractorFuelDistributionReport.Designer.cs | 107 ++++++ .../FormContractorFuelDistributionReport.cs | 69 ++++ .../FormContractorFuelDistributionReport.resx | 120 +++++++ .../Forms/FormDirectoryReport.Designer.cs | 112 +++++++ .../Forms/FormDirectoryReport.cs | 53 +++ .../Forms/FormDirectoryReport.resx | 120 +++++++ .../Forms/FormFuelReport.Designer.cs | 162 +++++++++ .../ProjectGasStation/Forms/FormFuelReport.cs | 83 +++++ .../Forms/FormFuelReport.resx | 120 +++++++ .../Forms/FormFuelSale.Designer.cs | 1 - .../ProjectGasStation/Forms/FormFuelSale.cs | 3 +- .../ProjectGasStation.csproj | 2 + .../ProjectGasStation/Reports/ChartReport.cs | 49 +++ .../ProjectGasStation/Reports/DocReport.cs | 93 ++++++ .../ProjectGasStation/Reports/ExcelBuilder.cs | 311 ++++++++++++++++++ .../ProjectGasStation/Reports/PdfBuilder.cs | 76 +++++ .../ProjectGasStation/Reports/TableReport.cs | 71 ++++ .../ProjectGasStation/Reports/WordBuilder.cs | 130 ++++++++ .../ContractorFuelRepository.cs | 7 +- .../Implementations/FuelSaleRepository.cs | 7 +- 28 files changed, 1817 insertions(+), 18 deletions(-) create mode 100644 ProjectGasStation/ProjectGasStation/Entities/TempContractorFuelFuel.cs create mode 100644 ProjectGasStation/ProjectGasStation/Entities/TempFuelFuelSale.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.Designer.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.resx create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.Designer.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.resx create mode 100644 ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Reports/DocReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs create mode 100644 ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs create mode 100644 ProjectGasStation/ProjectGasStation/Reports/TableReport.cs create mode 100644 ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs diff --git a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuel.cs b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuel.cs index 50c907f..6d29ad6 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuel.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuel.cs @@ -10,4 +10,9 @@ public class ContractorFuel { return new ContractorFuel { Id = id, ContractorId = contractorId, Date = date, ContractorFuelFuel = contractorFuelFuel}; } + + public static ContractorFuel CreateContractorFuel(TempContractorFuelFuel tempContractorFuelFuel, IEnumerable contractorFuelFuel) + { + return new ContractorFuel { Id = tempContractorFuelFuel.Id, ContractorId = tempContractorFuelFuel.ContractorId, Date = tempContractorFuelFuel.Date, ContractorFuelFuel = contractorFuelFuel }; + } } \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs index 014df03..dc83f5b 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs @@ -5,6 +5,7 @@ public class ContractorFuelFuel public int Id { get; private set; } public int FuelId { get; private set; } public int Quantity { get; private set; } + public int ContractorFuelId { get; private set; } public static ContractorFuelFuel CreateContractorFuelFuel(int id, int fuelId, int quantity) { return new ContractorFuelFuel { Id = id, FuelId = fuelId, Quantity = quantity }; diff --git a/ProjectGasStation/ProjectGasStation/Entities/FuelSale.cs b/ProjectGasStation/ProjectGasStation/Entities/FuelSale.cs index 3fd7734..cd1b0ff 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/FuelSale.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/FuelSale.cs @@ -19,4 +19,16 @@ public class FuelSale FuelFuelSale = fuelFuelSale }; } + + public static FuelSale CreateFuelSale(TempFuelFuelSale tempFuelFuelSale, IEnumerable fuelFuelSale) + { + return new FuelSale + { + Id = tempFuelFuelSale.Id, + SalespersonId = tempFuelFuelSale.SalespersonId, + ShiftId = tempFuelFuelSale.ShiftId, + SaleDate = tempFuelFuelSale.SaleDate, + FuelFuelSale = fuelFuelSale + }; + } } diff --git a/ProjectGasStation/ProjectGasStation/Entities/TempContractorFuelFuel.cs b/ProjectGasStation/ProjectGasStation/Entities/TempContractorFuelFuel.cs new file mode 100644 index 0000000..8e8e158 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Entities/TempContractorFuelFuel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Entities; + +public class TempContractorFuelFuel +{ + public int Id { get; private set; } + public int ContractorId { get; private set; } + public DateTime Date { get; private set; } + public int FuelId { get; private set; } + public int Quantity { get; private set; } +} diff --git a/ProjectGasStation/ProjectGasStation/Entities/TempFuelFuelSale.cs b/ProjectGasStation/ProjectGasStation/Entities/TempFuelFuelSale.cs new file mode 100644 index 0000000..f8e1f72 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Entities/TempFuelFuelSale.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectGasStation.Entities; + +public class TempFuelFuelSale +{ + public int Id { get; private set; } + public int SalespersonId { get; private set; } + public int ShiftId { get; private set; } + public DateTime SaleDate { get; private set; } + public int FuelId { get; private set; } + public int Quantity { get; private set; } +} diff --git a/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs b/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs index cb24209..a1366cc 100644 --- a/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs +++ b/ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs @@ -35,16 +35,19 @@ toolStripMenuItemShifts = new ToolStripMenuItem(); toolStripMenuItemContractors = new ToolStripMenuItem(); toolStripMenuItemFuels = new ToolStripMenuItem(); - операцииToolStripMenuItem = new ToolStripMenuItem(); + toolStripMenuItem2 = new ToolStripMenuItem(); toolStripMenuItemFuelSale = new ToolStripMenuItem(); toolStripMenuItemContractorFuel = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); + toolStripMenuItemDirectoryReport = new ToolStripMenuItem(); + toolStripMenuItemFuelReport = new ToolStripMenuItem(); + toolStripMenuItemFuelDistribution = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // // menuStrip1 // - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); + menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, toolStripMenuItem2, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; menuStrip1.Size = new Size(784, 24); @@ -86,12 +89,12 @@ toolStripMenuItemFuels.Text = "Топливо"; toolStripMenuItemFuels.Click += toolStripMenuItemFuels_Click; // - // операцииToolStripMenuItem + // toolStripMenuItem2 // - операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemFuelSale, toolStripMenuItemContractorFuel }); - операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; - операцииToolStripMenuItem.Size = new Size(75, 20); - операцииToolStripMenuItem.Text = "Операции"; + toolStripMenuItem2.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemFuelSale, toolStripMenuItemContractorFuel }); + toolStripMenuItem2.Name = "toolStripMenuItem2"; + toolStripMenuItem2.Size = new Size(75, 20); + toolStripMenuItem2.Text = "Операции"; // // toolStripMenuItemFuelSale // @@ -109,10 +112,35 @@ // // отчетыToolStripMenuItem // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemDirectoryReport, toolStripMenuItemFuelReport, toolStripMenuItemFuelDistribution }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; отчетыToolStripMenuItem.Size = new Size(60, 20); отчетыToolStripMenuItem.Text = "Отчеты"; // + // toolStripMenuItemDirectoryReport + // + toolStripMenuItemDirectoryReport.Name = "toolStripMenuItemDirectoryReport"; + toolStripMenuItemDirectoryReport.ShortcutKeys = Keys.Control | Keys.W; + toolStripMenuItemDirectoryReport.Size = new Size(300, 22); + toolStripMenuItemDirectoryReport.Text = "Документ со справочниками"; + toolStripMenuItemDirectoryReport.Click += toolStripMenuItemDirectoryReport_Click; + // + // toolStripMenuItemFuelReport + // + toolStripMenuItemFuelReport.Name = "toolStripMenuItemFuelReport"; + toolStripMenuItemFuelReport.ShortcutKeys = Keys.Control | Keys.E; + toolStripMenuItemFuelReport.Size = new Size(300, 22); + toolStripMenuItemFuelReport.Text = "Движение топлива"; + toolStripMenuItemFuelReport.Click += toolStripMenuItemFuelReport_Click; + // + // toolStripMenuItemFuelDistribution + // + toolStripMenuItemFuelDistribution.Name = "toolStripMenuItemFuelDistribution"; + toolStripMenuItemFuelDistribution.ShortcutKeys = Keys.Control | Keys.P; + toolStripMenuItemFuelDistribution.Size = new Size(300, 22); + toolStripMenuItemFuelDistribution.Text = "Распределение поставок топлива"; + toolStripMenuItemFuelDistribution.Click += toolStripMenuItemFuelDistribution_Click; + // // FormGasStation // AutoScaleDimensions = new SizeF(7F, 15F); @@ -138,10 +166,13 @@ private ToolStripMenuItem toolStripMenuItemSalepersons; private ToolStripMenuItem toolStripMenuItemShifts; private ToolStripMenuItem toolStripMenuItemContractors; - private ToolStripMenuItem операцииToolStripMenuItem; + private ToolStripMenuItem toolStripMenuItem2; private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem toolStripMenuItemFuelSale; private ToolStripMenuItem toolStripMenuItemContractorFuel; private ToolStripMenuItem toolStripMenuItemFuels; + private ToolStripMenuItem toolStripMenuItemDirectoryReport; + private ToolStripMenuItem toolStripMenuItemFuelReport; + private ToolStripMenuItem toolStripMenuItemFuelDistribution; } } diff --git a/ProjectGasStation/ProjectGasStation/FormGasStation.cs b/ProjectGasStation/ProjectGasStation/FormGasStation.cs index 8151897..6f69df2 100644 --- a/ProjectGasStation/ProjectGasStation/FormGasStation.cs +++ b/ProjectGasStation/ProjectGasStation/FormGasStation.cs @@ -89,4 +89,43 @@ public partial class FormGasStation : Form MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void toolStripMenuItemDirectoryReport_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void toolStripMenuItemFuelReport_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void toolStripMenuItemFuelDistribution_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.cs b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.cs index d78f4e5..08aed11 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.cs @@ -58,6 +58,6 @@ public partial class FormContractorFuel : Form Convert.ToInt32(row.Cells["ColumnFuel"].Value), Convert.ToInt32(row.Cells["ColumnQuantity"].Value))); } - return list; + return list.GroupBy(x => x.FuelId, x => x.Quantity, (id, counts) => ContractorFuelFuel.CreateContractorFuelFuel(0, id, counts.Sum())).ToList(); } } diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.Designer.cs new file mode 100644 index 0000000..120ef77 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.Designer.cs @@ -0,0 +1,107 @@ +namespace ProjectGasStation.Forms +{ + partial class FormContractorFuelDistributionReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dateTimePicker = new DateTimePicker(); + label1 = new Label(); + labelFileName = new Label(); + buttonFile = new Button(); + buttonBuild = new Button(); + SuspendLayout(); + // + // dateTimePicker + // + dateTimePicker.Location = new Point(70, 44); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(200, 23); + dateTimePicker.TabIndex = 0; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(29, 50); + label1.Name = "label1"; + label1.Size = new Size(35, 15); + label1.TabIndex = 1; + label1.Text = "Дата:"; + // + // labelFileName + // + labelFileName.AutoSize = true; + labelFileName.Location = new Point(111, 16); + labelFileName.Name = "labelFileName"; + labelFileName.Size = new Size(36, 15); + labelFileName.TabIndex = 2; + labelFileName.Text = "Файл"; + // + // buttonFile + // + buttonFile.Location = new Point(29, 12); + buttonFile.Name = "buttonFile"; + buttonFile.Size = new Size(75, 23); + buttonFile.TabIndex = 3; + buttonFile.Text = "Выбрать"; + buttonFile.UseVisualStyleBackColor = true; + buttonFile.Click += buttonFile_Click; + // + // buttonBuild + // + buttonBuild.Location = new Point(29, 85); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(241, 23); + buttonBuild.TabIndex = 4; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += buttonBuild_Click; + // + // FormContractorFuelDistributionReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(291, 137); + Controls.Add(buttonBuild); + Controls.Add(buttonFile); + Controls.Add(labelFileName); + Controls.Add(label1); + Controls.Add(dateTimePicker); + Name = "FormContractorFuelDistributionReport"; + Text = "FormContractorFuelDistributionReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DateTimePicker dateTimePicker; + private Label label1; + private Label labelFileName; + private Button buttonFile; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.cs new file mode 100644 index 0000000..38bc1dd --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.cs @@ -0,0 +1,69 @@ +using ProjectGasStation.Reports; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Unity; + +namespace ProjectGasStation.Forms +{ + public partial class FormContractorFuelDistributionReport : Form + { + private string _fileName = string.Empty; + private readonly IUnityContainer _container; + public FormContractorFuelDistributionReport(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void buttonBuild_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(_fileName)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + if + (_container.Resolve().CreateChart(_fileName, dateTimePicker.Value)) + { + MessageBox.Show("Документ сформирован", + "Формирование документа", + MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании очета", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } + + private void buttonFile_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Pdf Files | *.pdf" + }; + if (sfd.ShowDialog() == DialogResult.OK) + { + _fileName = sfd.FileName; + labelFileName.Text = Path.GetFileName(_fileName); + } + } + } +} diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormContractorFuelDistributionReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs new file mode 100644 index 0000000..73f5494 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.Designer.cs @@ -0,0 +1,112 @@ +namespace ProjectGasStation.Forms +{ + partial class FormDirectoryReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + checkBoxShifts = new CheckBox(); + checkBoxSalespersons = new CheckBox(); + checkBoxFuels = new CheckBox(); + checkBoxContractors = new CheckBox(); + buttonBuild = new Button(); + SuspendLayout(); + // + // checkBoxShifts + // + checkBoxShifts.AutoSize = true; + checkBoxShifts.Location = new Point(12, 12); + checkBoxShifts.Name = "checkBoxShifts"; + checkBoxShifts.Size = new Size(65, 19); + checkBoxShifts.TabIndex = 0; + checkBoxShifts.Text = "Смены"; + checkBoxShifts.UseVisualStyleBackColor = true; + // + // checkBoxSalespersons + // + checkBoxSalespersons.AutoSize = true; + checkBoxSalespersons.Location = new Point(12, 46); + checkBoxSalespersons.Name = "checkBoxSalespersons"; + checkBoxSalespersons.Size = new Size(83, 19); + checkBoxSalespersons.TabIndex = 1; + checkBoxSalespersons.Text = "Продавцы"; + checkBoxSalespersons.UseVisualStyleBackColor = true; + // + // checkBoxFuels + // + checkBoxFuels.AutoSize = true; + checkBoxFuels.Location = new Point(12, 82); + checkBoxFuels.Name = "checkBoxFuels"; + checkBoxFuels.Size = new Size(73, 19); + checkBoxFuels.TabIndex = 2; + checkBoxFuels.Text = "Топливо"; + checkBoxFuels.UseVisualStyleBackColor = true; + // + // checkBoxContractors + // + checkBoxContractors.AutoSize = true; + checkBoxContractors.Location = new Point(12, 118); + checkBoxContractors.Name = "checkBoxContractors"; + checkBoxContractors.Size = new Size(96, 19); + checkBoxContractors.TabIndex = 3; + checkBoxContractors.Text = "Поставщики"; + checkBoxContractors.UseVisualStyleBackColor = true; + // + // buttonBuild + // + buttonBuild.Location = new Point(12, 159); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(139, 23); + buttonBuild.TabIndex = 4; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += buttonBuild_Click; + // + // FormDirectoryReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(167, 197); + Controls.Add(buttonBuild); + Controls.Add(checkBoxContractors); + Controls.Add(checkBoxFuels); + Controls.Add(checkBoxSalespersons); + Controls.Add(checkBoxShifts); + Name = "FormDirectoryReport"; + Text = "FormDirectoryReport"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private CheckBox checkBoxShifts; + private CheckBox checkBoxSalespersons; + private CheckBox checkBoxFuels; + private CheckBox checkBoxContractors; + private Button buttonBuild; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs new file mode 100644 index 0000000..9107344 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.cs @@ -0,0 +1,53 @@ +using ProjectGasStation.Reports; +using System.ComponentModel; +using Unity; + +namespace ProjectGasStation.Forms; + +public partial class FormDirectoryReport : Form +{ + private readonly IUnityContainer _container; + public FormDirectoryReport(IUnityContainer container) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + } + + private void buttonBuild_Click(object sender, EventArgs e) + { + try + { + if (!checkBoxShifts.Checked && !checkBoxSalespersons.Checked && !checkBoxFuels.Checked && !checkBoxContractors.Checked) + { + throw new Exception("Не выбран ни один справочник для выгрузки"); + } + var sfd = new SaveFileDialog() + { + Filter = "Docx Files | *.docx" + }; + if (sfd.ShowDialog() != DialogResult.OK) + { + throw new Exception("Не выбран файла для отчета"); + } + if + (_container.Resolve().CreateDoc(sfd.FileName, checkBoxShifts.Checked, checkBoxSalespersons.Checked, checkBoxFuels.Checked, checkBoxContractors.Checked)) + { + MessageBox.Show("Документ сформирован", + "Формирование документа", + MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } +} diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormDirectoryReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.Designer.cs new file mode 100644 index 0000000..167cfeb --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.Designer.cs @@ -0,0 +1,162 @@ +namespace ProjectGasStation.Forms +{ + partial class FormFuelReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dateTimePickerEnd = new DateTimePicker(); + dateTimePickerStart = new DateTimePicker(); + comboBoxFuel = new ComboBox(); + textBoxFilePath = new TextBox(); + buttonFile = new Button(); + buttonBuild = new Button(); + label1 = new Label(); + label2 = new Label(); + label3 = new Label(); + label4 = new Label(); + SuspendLayout(); + // + // dateTimePickerEnd + // + dateTimePickerEnd.Location = new Point(118, 137); + dateTimePickerEnd.Name = "dateTimePickerEnd"; + dateTimePickerEnd.Size = new Size(200, 23); + dateTimePickerEnd.TabIndex = 0; + // + // dateTimePickerStart + // + dateTimePickerStart.Location = new Point(118, 99); + dateTimePickerStart.Name = "dateTimePickerStart"; + dateTimePickerStart.Size = new Size(200, 23); + dateTimePickerStart.TabIndex = 1; + // + // comboBoxFuel + // + comboBoxFuel.FormattingEnabled = true; + comboBoxFuel.Location = new Point(118, 59); + comboBoxFuel.Name = "comboBoxFuel"; + comboBoxFuel.Size = new Size(198, 23); + comboBoxFuel.TabIndex = 2; + // + // textBoxFilePath + // + textBoxFilePath.Location = new Point(118, 20); + textBoxFilePath.Name = "textBoxFilePath"; + textBoxFilePath.Size = new Size(166, 23); + textBoxFilePath.TabIndex = 3; + // + // buttonFile + // + buttonFile.Location = new Point(290, 20); + buttonFile.Name = "buttonFile"; + buttonFile.Size = new Size(26, 23); + buttonFile.TabIndex = 4; + buttonFile.Text = "..."; + buttonFile.UseVisualStyleBackColor = true; + buttonFile.Click += buttonFile_Click; + // + // buttonBuild + // + buttonBuild.Location = new Point(22, 181); + buttonBuild.Name = "buttonBuild"; + buttonBuild.Size = new Size(296, 23); + buttonBuild.TabIndex = 5; + buttonBuild.Text = "Сформировать"; + buttonBuild.UseVisualStyleBackColor = true; + buttonBuild.Click += buttonBuild_Click; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(22, 23); + label1.Name = "label1"; + label1.Size = new Size(90, 15); + label1.TabIndex = 6; + label1.Text = "Путь до файла:"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(22, 62); + label2.Name = "label2"; + label2.Size = new Size(57, 15); + label2.TabIndex = 7; + label2.Text = "Топливо:"; + // + // label3 + // + label3.AutoSize = true; + label3.Location = new Point(22, 105); + label3.Name = "label3"; + label3.Size = new Size(77, 15); + label3.TabIndex = 8; + label3.Text = "Дата начала:"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(22, 143); + label4.Name = "label4"; + label4.Size = new Size(71, 15); + label4.TabIndex = 9; + label4.Text = "Дата конца:"; + // + // FormFuelReport + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(345, 227); + Controls.Add(label4); + Controls.Add(label3); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(buttonBuild); + Controls.Add(buttonFile); + Controls.Add(textBoxFilePath); + Controls.Add(comboBoxFuel); + Controls.Add(dateTimePickerStart); + Controls.Add(dateTimePickerEnd); + Name = "FormFuelReport"; + Text = "Отчет по топливу"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DateTimePicker dateTimePickerEnd; + private DateTimePicker dateTimePickerStart; + private ComboBox comboBoxFuel; + private TextBox textBoxFilePath; + private Button buttonFile; + private Button buttonBuild; + private Label label1; + private Label label2; + private Label label3; + private Label label4; + } +} \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.cs b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.cs new file mode 100644 index 0000000..cb5e600 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.cs @@ -0,0 +1,83 @@ +using ProjectGasStation.Reports; +using ProjectGasStation.Repositories; +using ProjectGasStation.Repositories.Implementations; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Unity; + +namespace ProjectGasStation.Forms +{ + public partial class FormFuelReport : Form + { + private readonly IUnityContainer _container; + + public FormFuelReport(IUnityContainer container, IFuelRepository fuelRepository) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + + comboBoxFuel.DataSource = fuelRepository.ReadFuels(); + comboBoxFuel.DisplayMember = "Type"; + comboBoxFuel.ValueMember = "Id"; + + } + + private void buttonFile_Click(object sender, EventArgs e) + { + var sfd = new SaveFileDialog() + { + Filter = "Excel Files | *.xlsx" + }; + if (sfd.ShowDialog() != DialogResult.OK) + { + return; + } + textBoxFilePath.Text = sfd.FileName; + } + + private void buttonBuild_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(textBoxFilePath.Text)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + if (comboBoxFuel.SelectedIndex < 0) + { + throw new Exception("Не выбран корм"); + } + if (dateTimePickerEnd.Value <= dateTimePickerStart.Value) + { + throw new Exception("Дата начала должна быть раньше даты окончания"); + } + if (_container.Resolve().CreateTable(textBoxFilePath.Text,(int)comboBoxFuel.SelectedValue!, dateTimePickerStart.Value, dateTimePickerEnd.Value)) + { + MessageBox.Show("Документ сформирован", + "Формирование документа", + MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах", + "Формирование документа", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при создании очета", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + } +} diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.resx b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Forms/FormFuelReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.Designer.cs b/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.Designer.cs index bc2dc6b..ba2ab28 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.Designer.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.Designer.cs @@ -186,7 +186,6 @@ private ComboBox comboBoxSalesperson; private ComboBox comboBoxShift; - private NumericUpDown numericUpDown1; private DateTimePicker dateTimePickerDate; private Button buttonSave; private Button buttonCancel; diff --git a/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.cs b/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.cs index 2965436..e70bdfa 100644 --- a/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.cs +++ b/ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.cs @@ -61,7 +61,6 @@ public partial class FormFuelSale : Form Convert.ToInt32(row.Cells["ColumnFuel"].Value), Convert.ToInt32(row.Cells["ColumnQuantity"].Value))); } - return list; + return list.GroupBy(x => x.FuelId, x => x.Quantity, (id, counts) => FuelFuelSale.CreateFuelFuelSale(0, id, counts.Sum())).ToList(); } - } diff --git a/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj b/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj index 1d4831d..04c5d7a 100644 --- a/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj +++ b/ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj @@ -10,11 +10,13 @@ + + diff --git a/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs b/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs new file mode 100644 index 0000000..9078a80 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/ChartReport.cs @@ -0,0 +1,49 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; +using ProjectGasStation.Repositories.Implementations; + +namespace ProjectGasStation.Reports; + +internal class ChartReport +{ + private readonly IContractorFuelRepository _contractorFuelRepository; + private readonly IFuelRepository _fuelRepository; + private readonly ILogger _logger; + + public ChartReport(IContractorFuelRepository contractorFuelRepository, IFuelRepository fuelRepository, ILogger logger) + { + _contractorFuelRepository = contractorFuelRepository ?? throw new ArgumentNullException(nameof(contractorFuelRepository)); + _fuelRepository = fuelRepository ?? throw new ArgumentNullException(nameof(fuelRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateChart(string filePath, DateTime dateTime) + { + try + { + new PdfBuilder(filePath) + .AddHeader("Поставки топлива") + .AddPieChart("Виды топлива", GetData(dateTime)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + private List<(string Caption, double Value)> GetData(DateTime dateTime) + { + var fuelNames = _fuelRepository.ReadFuels() + .ToDictionary(f => f.Id, f => f.Type); + + return _contractorFuelRepository + .ReadContractorFuels() + .Where(x => x.Date.Date == dateTime.Date) + .SelectMany(x => x.ContractorFuelFuel) + .GroupBy(x => x.FuelId) + .Select(g => (Caption: fuelNames[g.Key].ToString(), Value: (double)g.Sum(x => x.Quantity))) + .ToList(); + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs b/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs new file mode 100644 index 0000000..576c476 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/DocReport.cs @@ -0,0 +1,93 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; + +namespace ProjectGasStation.Reports; + +public class DocReport +{ + private readonly IShiftRepository _shiftRepository; + private readonly ISalespersonRepository _salespersonRepository; + private readonly IFuelRepository _fuelRepository; + private readonly IContractorRepository _contractorRepository; + private readonly ILogger _logger; + + public DocReport(IShiftRepository shiftRepository, ISalespersonRepository salespersonRepository, IFuelRepository fuelRepository, IContractorRepository contractorRepository, ILogger logger) + { + _shiftRepository = shiftRepository ?? throw new ArgumentNullException(nameof(shiftRepository)); + _salespersonRepository = salespersonRepository ?? throw new ArgumentNullException(nameof(salespersonRepository)); + _fuelRepository = fuelRepository ?? throw new ArgumentNullException(nameof(fuelRepository)); + _contractorRepository = contractorRepository ?? throw new ArgumentNullException(nameof(contractorRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateDoc(string filePath, bool includeShifts, bool includeSalespersons, bool includeFuels, bool includeContractors) + { + try + { + var builder = new WordBuilder(filePath).AddHeader("Документ со справочниками"); + if (includeShifts) + { + builder.AddParagraph("Смена").AddTable([2400, 2400, 2400, 2400], GetShifts()); + } + if (includeSalespersons) + { + builder.AddParagraph("Продавцы").AddTable([2400, 2400], GetSalespersons()); + } + if (includeFuels) + { + builder.AddParagraph("Топливо").AddTable([2400, 2400], GetFuels()); + } + if (includeContractors) + { + builder.AddParagraph("Поставщики").AddTable([2400, 2400], GetContractors()); + } + builder.Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetShifts() + { + return [ + ["Время начала", "Время конца", "Дата", "Тип"], + .. _shiftRepository + .ReadShifts() + .Select(x => new string[] { x.StartTime.ToString(), x.EndTime.ToString(), x.Date.ToString(), x.Type.ToString() }), + ]; + } + + private List GetSalespersons() + { + return [ + ["Имя", "Фамилия"], + .. _salespersonRepository + .ReadSalespersons() + .Select(x => new string[] { x.FirstName, x.LastName }), + ]; + } + + private List GetFuels() + { + return [ + ["Цена", "Тип"], + .. _fuelRepository + .ReadFuels() + .Select(x => new string[] { x.Price.ToString(), x.Type.ToString() }), + ]; + } + + private List GetContractors() + { + return [ + ["Название", "Типы поставляемого топлива"], + .. _contractorRepository + .ReadContractors() + .Select(x => new string[] { x.Name, x.Types.ToString() }), + ]; + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs new file mode 100644 index 0000000..d8749d6 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/ExcelBuilder.cs @@ -0,0 +1,311 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; + +namespace ProjectGasStation.Reports; + +internal class ExcelBuilder +{ + private readonly string _filePath; + private readonly SheetData _sheetData; + private readonly MergeCells _mergeCells; + private readonly Columns _columns; + private uint _rowIndex = 0; + + public ExcelBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + _filePath = filePath; + _sheetData = new SheetData(); + _mergeCells = new MergeCells(); + _columns = new Columns(); + _rowIndex = 1; + } + + public ExcelBuilder AddHeader(string header, int startIndex, int count) + { + CreateCell(startIndex, _rowIndex, header, StyleIndex.BoldTextWithoutBorder); + for (int i = startIndex + 1; i < startIndex + count; ++i) + { + CreateCell(i, _rowIndex, "", StyleIndex.SimpleTextWithoutBorder); + } + _mergeCells.Append(new MergeCell() + { + Reference = new StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}") + }); + _rowIndex++; + return this; + } + + public ExcelBuilder AddParagraph(string text, int columnIndex) + { + CreateCell(columnIndex, _rowIndex++, text, StyleIndex.SimpleTextWithoutBorder); + return this; + } + + public ExcelBuilder AddTable(int[] columnsWidths, List data) + { + if (columnsWidths == null || columnsWidths.Length == 0) + { + throw new ArgumentNullException(nameof(columnsWidths)); + } + if (data == null || data.Count == 0) + { + throw new ArgumentNullException(nameof(data)); + } + if (data.Any(x => x.Length != columnsWidths.Length)) + { + throw new InvalidOperationException("widths.Length != data.Length"); + } + + uint counter = 1; + int coef = 2; + _columns.Append(columnsWidths.Select(x => new Column + { + Min = counter, + Max = counter++, + Width = x * coef, + CustomWidth = true + })); + for (var j = 0; j < data.First().Length; ++j) + { + CreateCell(j, _rowIndex, data.First()[j], StyleIndex.BoldTextWithBorder); + } + _rowIndex++; + + for (var i = 1; i < data.Count - 1; ++i) + { + for (var j = 0; j < data[i].Length; ++j) + { + CreateCell(j, _rowIndex, data[i][j], StyleIndex.SimpleTextWithBorder); + } + _rowIndex++; + } + for (var j = 0; j < data.Last().Length; ++j) + { + CreateCell(j, _rowIndex, data.Last()[j], StyleIndex.BoldTextWithBorder); + } + _rowIndex++; + return this; + } + + public void Build() + { + using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath, SpreadsheetDocumentType.Workbook); + var workbookpart = spreadsheetDocument.AddWorkbookPart(); + GenerateStyle(workbookpart); + workbookpart.Workbook = new Workbook(); + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(); + + if (_columns.HasChildren) + { + worksheetPart.Worksheet.Append(_columns); + } + + worksheetPart.Worksheet.Append(_sheetData); + var sheets = spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист 1" + }; + sheets.Append(sheet); + if (_mergeCells.HasChildren) + { + worksheetPart.Worksheet.InsertAfter(_mergeCells, + worksheetPart.Worksheet.Elements().First()); + } + } + + private static void GenerateStyle(WorkbookPart workbookPart) + { + var workbookStylesPart = workbookPart.AddNewPart(); + workbookStylesPart.Stylesheet = new Stylesheet(); + + var fonts = new Fonts() + { + Count = 2, + KnownFonts = BooleanValue.FromBoolean(true) + }; + fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font + { + FontSize = new FontSize() { Val = 11 }, + FontName = new FontName() { Val = "Calibri" }, + FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 }, + FontScheme = new FontScheme() + { + Val = new EnumValue(FontSchemeValues.Minor) + } + }); + fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font + { + FontSize = new FontSize() { Val = 11 }, + FontName = new FontName() { Val = "Calibri" }, + FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 }, + FontScheme = new FontScheme() + { + Val = new EnumValue(FontSchemeValues.Minor) + }, + Bold = new Bold() { Val = true } + }); + workbookStylesPart.Stylesheet.Append(fonts); + + // Default Fill + var fills = new Fills() { Count = 1 }; + fills.Append(new Fill + { + PatternFill = new PatternFill() + { + PatternType = new EnumValue(PatternValues.None) + } + }); + workbookStylesPart.Stylesheet.Append(fills); + + // Default Border + var borders = new Borders() { Count = 2 }; + borders.Append(new Border + { + LeftBorder = new LeftBorder(), + RightBorder = new RightBorder(), + TopBorder = new TopBorder(), + BottomBorder = new BottomBorder(), + DiagonalBorder = new DiagonalBorder() + }); + borders.Append(new Border + { + LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }, + RightBorder = new RightBorder() { Style = BorderStyleValues.Thin }, + TopBorder = new TopBorder() { Style = BorderStyleValues.Thin }, + BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }, + DiagonalBorder = new DiagonalBorder() + }); + workbookStylesPart.Stylesheet.Append(borders); + + // Default cell format and a date cell format + var cellFormats = new CellFormats() { Count = 4 }; + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 0, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Left, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 0, + BorderId = 1, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Right, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 1, + BorderId = 0, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Center, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + cellFormats.Append(new CellFormat + { + NumberFormatId = 0, + FormatId = 0, + FontId = 1, + BorderId = 1, + FillId = 0, + Alignment = new Alignment() + { + Horizontal = HorizontalAlignmentValues.Center, + Vertical = VerticalAlignmentValues.Center, + WrapText = true + } + }); + workbookStylesPart.Stylesheet.Append(cellFormats); + } + + private enum StyleIndex + { + SimpleTextWithoutBorder = 0, + SimpleTextWithBorder = 1, + BoldTextWithoutBorder = 2, + BoldTextWithBorder = 3, + } + + private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex) + { + var columnName = GetExcelColumnName(columnIndex); + var cellReference = columnName + rowIndex; + var row = _sheetData.Elements().FirstOrDefault(r => r.RowIndex! == rowIndex); + if (row == null) + { + row = new Row() { RowIndex = rowIndex }; + _sheetData.Append(row); + } + var newCell = row.Elements().FirstOrDefault(c => c.CellReference != null && + c.CellReference.Value == columnName + rowIndex); + if (newCell == null) + { + Cell? refCell = null; + foreach (Cell cell in row.Elements()) + { + if (cell.CellReference?.Value != null && + cell.CellReference.Value.Length == cellReference.Length) + { + if (string.Compare(cell.CellReference.Value, cellReference, true) > 0) + { + refCell = cell; + break; + } + } + } + newCell = new Cell() { CellReference = cellReference }; + row.InsertBefore(newCell, refCell); + } + newCell.CellValue = new CellValue(text); + newCell.DataType = CellValues.String; + newCell.StyleIndex = (uint)styleIndex; + } + + private static string GetExcelColumnName(int columnNumber) + { + columnNumber += 1; + int dividend = columnNumber; + string columnName = string.Empty; + int modulo; + while (dividend > 0) + { + modulo = (dividend - 1) % 26; + columnName = Convert.ToChar(65 + modulo).ToString() + columnName; + dividend = (dividend - modulo) / 26; + } + return columnName; + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs new file mode 100644 index 0000000..00486eb --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/PdfBuilder.cs @@ -0,0 +1,76 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Shapes.Charts; +using MigraDoc.Rendering; +using System.Text; + +namespace ProjectGasStation.Reports; + +internal class PdfBuilder +{ + private readonly string _filePath; + private readonly Document _document; + + public PdfBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + _filePath = filePath; + _document = new Document(); + DefineStyles(); + } + + public PdfBuilder AddHeader(string header) + { + _document.AddSection().AddParagraph(header, "NormalBold"); + return this; + } + + public PdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data) + { + if (data == null || data.Count == 0) + { + return this; + } + var chart = new Chart(ChartType.Pie2D); + var series = chart.SeriesCollection.AddSeries(); + series.Add(data.Select(x => x.Value).ToArray()); + var xseries = chart.XValues.AddXSeries(); + xseries.Add(data.Select(x => x.Caption).ToArray()); + chart.DataLabel.Type = DataLabelType.Percent; + chart.DataLabel.Position = DataLabelPosition.OutsideEnd; + chart.Width = Unit.FromCentimeter(16); + chart.Height = Unit.FromCentimeter(12); + chart.TopArea.AddParagraph(title); + chart.XAxis.MajorTickMark = TickMarkType.Outside; + chart.YAxis.MajorTickMark = TickMarkType.Outside; + chart.YAxis.HasMajorGridlines = true; + chart.PlotArea.LineFormat.Width = 1; + chart.PlotArea.LineFormat.Visible = true; + chart.TopArea.AddLegend(); + _document.LastSection.Add(chart); + return this; + } + + public void Build() + { + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + renderer.RenderDocument(); + renderer.PdfDocument.Save(_filePath); + } + private void DefineStyles() + { + var headerStyle = _document.Styles.AddStyle("NormalBold", "Normal"); + headerStyle.Font.Bold = true; + headerStyle.Font.Size = 14; + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs b/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs new file mode 100644 index 0000000..ff38f23 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/TableReport.cs @@ -0,0 +1,71 @@ +using Microsoft.Extensions.Logging; +using ProjectGasStation.Repositories; + +namespace ProjectGasStation.Reports; + +internal class TableReport +{ + private readonly IContractorFuelRepository _contractorFuelRepository; + private readonly IFuelSaleRepository _fuelSaleRepository; + private readonly ILogger _logger; + internal static readonly string[] item = ["Дата", "Количество пришло", "Количество ушло"]; + + public TableReport(IContractorFuelRepository contractorFuelRepository, IFuelSaleRepository fuelSaleRepository, ILogger logger) + { + _contractorFuelRepository = contractorFuelRepository ?? throw new ArgumentNullException(nameof(contractorFuelRepository)); + _fuelSaleRepository = fuelSaleRepository ?? throw new ArgumentNullException(nameof(fuelSaleRepository)); + _logger = logger ?? throw new ArgumentNullException(nameof(logger)); + } + + public bool CreateTable(string filePath, int fuelId, DateTime startDate, DateTime endDate) + { + try + { + new ExcelBuilder(filePath) + .AddHeader("Сводка по движению топлива", 0, 3) + .AddParagraph("за период", 0) + .AddTable([10, 15, 15], GetData(fuelId, startDate, endDate)) + .Build(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка при формировании документа"); + return false; + } + } + + private List GetData(int fuelId, DateTime startDate, DateTime endDate) + { + var data = _contractorFuelRepository + .ReadContractorFuels() + .Where(x => x.Date >= startDate && x.Date <= endDate && x.ContractorFuelFuel.Any(y => y.FuelId == fuelId)) + .Select(x => new { x.Date, CountIn = x.ContractorFuelFuel.FirstOrDefault(y => y.FuelId == fuelId)?.Quantity, CountOut = (int?)null}) + .Union( + _fuelSaleRepository + .ReadFuelSales() + .Where(x => x.SaleDate >= startDate && x.SaleDate <= endDate && x.FuelFuelSale.Any(y => y.FuelId == fuelId)) + .Select(x => new { Date = x.SaleDate, CountIn = (int?)null, CountOut = x.FuelFuelSale.FirstOrDefault(y => y.FuelId == fuelId)?.Quantity }) + ) + .OrderBy(x => x.Date); + + var groupedData = data + .GroupBy(x => x.Date) + .Select(g => new + { + Date = g.Key, + TotalIn = g.Sum(x => x.CountIn), + TotalOut = g.Sum(x => x.CountOut) + }) + .OrderBy(x => x.Date); + + return + new List() { item } + .Union( groupedData + .Select(x => new string[] { x.Date.ToString("dd.MM.yyyy"), x.TotalIn.ToString()!, x.TotalOut.ToString()! })) + .Union( + new[] { new string[] { "Всего", groupedData.Sum(x => x.TotalIn).ToString()!, groupedData.Sum(x => x.TotalOut).ToString()! } } + ) + .ToList(); + } +} diff --git a/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs b/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs new file mode 100644 index 0000000..4b79b37 --- /dev/null +++ b/ProjectGasStation/ProjectGasStation/Reports/WordBuilder.cs @@ -0,0 +1,130 @@ +using DocumentFormat.OpenXml.Drawing.Charts; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml.Packaging; + +namespace ProjectGasStation.Reports; + +public class WordBuilder +{ + private readonly string _filePath; + private readonly Document _document; + private readonly Body _body; + + public WordBuilder(string filePath) + { + if (string.IsNullOrWhiteSpace(filePath)) + { + throw new ArgumentNullException(nameof(filePath)); + } + if (File.Exists(filePath)) + { + File.Delete(filePath); + } + _filePath = filePath; + _document = new Document(); + _body = _document.AppendChild(new Body()); + } + + public WordBuilder AddHeader(string header) + { + var paragraph = _body.AppendChild(new Paragraph()); + var run = paragraph.AppendChild(new Run()); + var runProperties = run.AppendChild(new RunProperties()); + runProperties.AppendChild(new Bold()); + run.AppendChild(new Text(header)); + return this; + } + + public WordBuilder AddParagraph(string text) + { + var paragraph = _body.AppendChild(new Paragraph()); + var run = paragraph.AppendChild(new Run()); + run.AppendChild(new Text(text)); + return this; + } + + public WordBuilder AddTable(int[] widths, List data) + { + if (widths == null || widths.Length == 0) + { + throw new ArgumentNullException(nameof(widths)); + } + if (data == null || data.Count == 0) + { + throw new ArgumentNullException(nameof(data)); + } + if (data.Any(x => x.Length != widths.Length)) + { + throw new InvalidOperationException("widths.Length != data.Length"); + } + var table = new Table(); + table.AppendChild(new TableProperties( + new TableBorders( + new TopBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + }, + new BottomBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + }, + new LeftBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + }, + new RightBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideHorizontalBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideVerticalBorder() + { + Val = new + EnumValue(BorderValues.Single), + Size = 12 + } + ) + )); + + var tr = new TableRow(); + for (var j = 0; j < widths.Length; ++j) + { + tr.Append(new TableCell( + new TableCellProperties(new TableCellWidth() + { + Width = + widths[j].ToString() + }), + new Paragraph(new Run(new RunProperties(new Bold()), new + Text(data.First()[j]))))); + } + table.Append(tr); + + table.Append(data.Skip(1).Select(x => + new TableRow(x.Select(y => new TableCell(new Paragraph(new Run(new Text(y)))))))); + _body.Append(table); + return this; + } + + public void Build() + { + using var wordDocument = WordprocessingDocument.Create(_filePath, +WordprocessingDocumentType.Document); + var mainPart = wordDocument.AddMainDocumentPart(); + mainPart.Document = _document; + } +} diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs index 67a173a..cdbb41d 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs @@ -91,11 +91,12 @@ public class ContractorFuelRepository : IContractorFuelRepository try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = "SELECT * FROM ContractorFuel"; - var contractorFuels = connection.Query(querySelect); + var querySelect = @"SELECT cf.*, cff.FuelId, cff.Quantity FROM ContractorFuel cf + INNER JOIN ContractorFuelFuel cff on cff.ContractorFuelId = cf.Id"; + var contractorFuels = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(contractorFuels)); - return contractorFuels; + return contractorFuels.GroupBy(x => x.Id, y => y, (key, value) => ContractorFuel.CreateContractorFuel(value.First(), value.Select(z => ContractorFuelFuel.CreateContractorFuelFuel(0, z.FuelId, z.Quantity)))).ToList(); } catch (Exception ex) { diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs index d4577fd..6cf7720 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs @@ -61,11 +61,12 @@ public class FuelSaleRepository : IFuelSaleRepository try { using var connection = new NpgsqlConnection(_connectionString.ConnectionString); - var querySelect = "SELECT * FROM FuelSale"; - var fuelSales = connection.Query(querySelect); + var querySelect = @"SELECT fs.*, ffs.FuelId, ffs.Quantity FROM FuelSale fs + INNER JOIN FuelFuelSale ffs on ffs.FuelSaleId = fs.Id"; + var fuelSales = connection.Query(querySelect); _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(fuelSales)); - return fuelSales; + return fuelSales.GroupBy(x => x.Id, y => y, (key, value) => FuelSale.CreateFuelSale(value.First(), value.Select(z => FuelFuelSale.CreateFuelFuelSale(0, z.FuelId, z.Quantity)))).ToList(); } catch (Exception ex) { -- 2.25.1 From a5f42d9b6b05c7475912ff5309deebc9b5c70d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?= <116575516+LAYT73@users.noreply.github.com> Date: Sun, 24 Nov 2024 23:32:29 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B3=D0=BE=20=D1=81?= =?UTF-8?q?=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectGasStation/Entities/ContractorFuelFuel.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs index dc83f5b..014df03 100644 --- a/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs +++ b/ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs @@ -5,7 +5,6 @@ public class ContractorFuelFuel public int Id { get; private set; } public int FuelId { get; private set; } public int Quantity { get; private set; } - public int ContractorFuelId { get; private set; } public static ContractorFuelFuel CreateContractorFuelFuel(int id, int fuelId, int quantity) { return new ContractorFuelFuel { Id = id, FuelId = fuelId, Quantity = quantity }; -- 2.25.1 From bb3bb40a8d894a46650781bba4f80626565c6486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=A8=D0=B8=D0=BF?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D0=B2?= <116575516+LAYT73@users.noreply.github.com> Date: Mon, 25 Nov 2024 02:16:25 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Implementations/ContractorFuelRepository.cs | 4 ++-- .../Repositories/Implementations/ContractorRepository.cs | 4 ++-- .../Repositories/Implementations/FuelSaleRepository.cs | 4 ++-- .../Repositories/Implementations/SalespersonRepository.cs | 4 ++-- .../Repositories/Implementations/ShiftRepository.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs index cdbb41d..6bb08a8 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs @@ -10,9 +10,9 @@ namespace ProjectGasStation.Repositories.Implementations; public class ContractorFuelRepository : IContractorFuelRepository { private readonly IConnectionString _connectionString; - private readonly ILogger _logger; + private readonly ILogger _logger; - public ContractorFuelRepository(IConnectionString connectionString, ILogger logger) + public ContractorFuelRepository(IConnectionString connectionString, ILogger logger) { _connectionString = connectionString; _logger = logger; diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorRepository.cs index b0e348d..a65e32f 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorRepository.cs @@ -9,9 +9,9 @@ namespace ProjectGasStation.Repositories.Implementations; public class ContractorRepository : IContractorRepository { private readonly IConnectionString _connectionString; - private readonly ILogger _logger; + private readonly ILogger _logger; - public ContractorRepository(IConnectionString connectionString, ILogger logger) + public ContractorRepository(IConnectionString connectionString, ILogger logger) { _connectionString = connectionString; _logger = logger; diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs index 6cf7720..a6f094b 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs @@ -9,9 +9,9 @@ namespace ProjectGasStation.Repositories.Implementations; public class FuelSaleRepository : IFuelSaleRepository { private readonly IConnectionString _connectionString; - private readonly ILogger _logger; + private readonly ILogger _logger; - public FuelSaleRepository(IConnectionString connectionString, ILogger logger) + public FuelSaleRepository(IConnectionString connectionString, ILogger logger) { _connectionString = connectionString; _logger = logger; diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SalespersonRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SalespersonRepository.cs index 388e7bb..18a5402 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SalespersonRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/SalespersonRepository.cs @@ -9,9 +9,9 @@ namespace ProjectGasStation.Repositories.Implementations; public class SalespersonRepository : ISalespersonRepository { private readonly IConnectionString _connectionString; - private readonly ILogger _logger; + private readonly ILogger _logger; - public SalespersonRepository(IConnectionString connectionString, ILogger logger) + public SalespersonRepository(IConnectionString connectionString, ILogger logger) { _connectionString = connectionString; _logger = logger; diff --git a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ShiftRepository.cs b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ShiftRepository.cs index 151bee1..65f6dc4 100644 --- a/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ShiftRepository.cs +++ b/ProjectGasStation/ProjectGasStation/Repositories/Implementations/ShiftRepository.cs @@ -9,9 +9,9 @@ namespace ProjectGasStation.Repositories.Implementations; public class ShiftRepository : IShiftRepository { private readonly IConnectionString _connectionString; - private readonly ILogger _logger; + private readonly ILogger _logger; - public ShiftRepository(IConnectionString connectionString, ILogger logger) + public ShiftRepository(IConnectionString connectionString, ILogger logger) { _connectionString = connectionString; _logger = logger; -- 2.25.1