ProjectGasStation/ProjectGasStation/Entities/Contractor.cs

@@ -1,14 +0,0 @@
-using ProjectGasStation.Entities.Enums;
-
-namespace ProjectGasStation.Entities;
-
-public class Contractor
-{
-    public int Id { get; private set; }
-    public string Name { get; private set; } = string.Empty;
-    public ContractorFuelType Types { get; private set; }
-    public static Contractor CreateContractor(int id, string name, ContractorFuelType types)
-    {
-        return new Contractor { Id = id, Name = name, Types = types };
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/ContractorFuel.cs

@@ -1,13 +0,0 @@
-namespace ProjectGasStation.Entities;
-
-public class ContractorFuel
-{
-    public int Id { get; private set; }
-    public int ContractorId { get; private set; }
-    public DateTime Date { get; private set; }
-    public IEnumerable<ContractorFuelFuel> ContractorFuelFuel { get; private set; } = [];
-    public static ContractorFuel CreateContractorFuel(int id, int contractorId, DateTime date, IEnumerable<ContractorFuelFuel> contractorFuelFuel)
-    {
-        return new ContractorFuel { Id = id, ContractorId = contractorId, Date = date, ContractorFuelFuel = contractorFuelFuel};
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/ContractorFuelFuel.cs

@@ -1,12 +0,0 @@
-namespace ProjectGasStation.Entities;
-
-public class ContractorFuelFuel
-{
-    public int Id { get; private set; }
-    public int FuelId { get; private set; }
-    public int Quantity { get; private set; }
-    public static ContractorFuelFuel CreateContractorFuelFuel(int id, int fuelId, int quantity)
-    {
-        return new ContractorFuelFuel { Id = id, FuelId = fuelId, Quantity = quantity };
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/Enums/ContractorFuelType.cs

@@ -1,11 +0,0 @@
-namespace ProjectGasStation.Entities.Enums;
-
-[Flags]
-public enum ContractorFuelType
-{
-    None = 0,
-    GasolineAI92 = 1,
-    GasolineAI95 = 2,
-    Diesel = 4,
-    MotorOIL = 8,
-}

ProjectGasStation/ProjectGasStation/Entities/Enums/FuelType.cs

@@ -1,10 +0,0 @@
-namespace ProjectGasStation.Entities.Enums;
-
-public enum FuelType
-{
-    None,
-    GasolineAI92,
-    GasolineAI95,
-    Diesel,
-    MotorOIL,
-}

ProjectGasStation/ProjectGasStation/Entities/Enums/ShiftType.cs

@@ -1,8 +0,0 @@
-namespace ProjectGasStation.Entities.Enums;
-
-public enum ShiftType
-{
-    None,
-    Day,
-    Night
-}

ProjectGasStation/ProjectGasStation/Entities/Fuel.cs

@@ -1,14 +0,0 @@
-using ProjectGasStation.Entities.Enums;
-
-namespace ProjectGasStation.Entities;
-
-public class Fuel
-{
-    public int Id { get; private set; }
-    public FuelType Type { get; private set; }
-    public double Price { get; private set; }
-    public static Fuel CreateFuel(int id, FuelType type, double price)
-    {
-        return new Fuel { Id = id, Type = type, Price = price };
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/FuelFuelSale.cs

@@ -1,12 +0,0 @@
-namespace ProjectGasStation.Entities;
-
-public class FuelFuelSale
-{
-    public int Id { get; private set; }
-    public int FuelId { get; private set; }
-    public int Quantity { get; private set; }
-    public static FuelFuelSale CreateFuelFuelSale(int id, int fuelId, int quantity)
-    {
-        return new FuelFuelSale { Id = id, FuelId = fuelId, Quantity = quantity};
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/FuelSale.cs

@@ -1,22 +0,0 @@
-namespace ProjectGasStation.Entities;
-
-public class FuelSale
-{
-    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 IEnumerable<FuelFuelSale> FuelFuelSale { get; private set; } = [];
-
-    public static FuelSale CreateFuelSale(int id, int salesPersonId, int shiftId, DateTime saleDate, IEnumerable<FuelFuelSale> fuelFuelSale)
-    {
-        return new FuelSale
-        {
-            Id = id,
-            SalespersonId = salesPersonId,
-            ShiftId = shiftId,
-            SaleDate = saleDate,
-            FuelFuelSale = fuelFuelSale
-        };
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/Salesperson.cs

@@ -1,12 +0,0 @@
-namespace ProjectGasStation.Entities;
-
-public class Salesperson
-{
-    public int Id { get; private set; }
-    public string FirstName { get; private set; } = string.Empty;
-    public string LastName { get; private set; } = string.Empty;
-    public static Salesperson CreateSalesperson(int id, string firstName, string lastName)
-    {
-        return new Salesperson { Id = id, FirstName = firstName, LastName = lastName };
-    }
-}

ProjectGasStation/ProjectGasStation/Entities/Shift.cs

@@ -1,17 +0,0 @@
-using ProjectGasStation.Entities.Enums;
-
-namespace ProjectGasStation.Entities;
-
-public class Shift
-{
-    public int Id { get; private set; }
-    public TimeSpan StartTime {  get; private set; }
-    public TimeSpan EndTime { get; private set; }
-    public DateTime Date {  get; private set; }
-    public ShiftType Type { get; private set; }
-    public string DisplayName => $"{Date:yyyy-MM-dd} ({Type})";
-    public static Shift CreateShift(int id, TimeSpan startTime, TimeSpan endTime, DateTime date, ShiftType type)
-    {
-        return new Shift { Id = id, EndTime = endTime, StartTime = startTime, Date = date, Type = type };
-    }
-}

ProjectGasStation/ProjectGasStation/Form1.Designer.cs

@@ -0,0 +1,39 @@
+namespace ProjectGasStation
+{
+    partial class Form1
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Text = "Form1";
+        }
+
+        #endregion
+    }
+}

ProjectGasStation/ProjectGasStation/Form1.cs

@@ -0,0 +1,10 @@
+namespace ProjectGasStation
+{
+    public partial class Form1 : Form
+    {
+        public Form1()
+        {
+            InitializeComponent();
+        }
+    }
+}

ProjectGasStation/ProjectGasStation/Form1.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
+  <!-- 
     Microsoft ResX Schema 
-
+    
     Version 2.0
-
+    
-    The primary goals of this format is to allow a simple XML format
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
+                
-    There are any number of "resheader" rows that contain simple
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
+    
-    Each data row contains a name, and value. The row also contains a
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture.
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
+    
-    The mimetype is used for serialized objects, and tells the
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
+    
-    Note - application/x-microsoft.net.object.binary.base64 is the format
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

ProjectGasStation/ProjectGasStation/FormGasStation.Designer.cs

@@ -1,147 +0,0 @@
-namespace ProjectGasStation
-{
-    partial class FormGasStation
-    {
-        /// <summary>
-        ///  Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        ///  Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        ///  Required method for Designer support - do not modify
-        ///  the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGasStation));
-            menuStrip1 = new MenuStrip();
-            справочникиToolStripMenuItem = new ToolStripMenuItem();
-            toolStripMenuItemSalepersons = new ToolStripMenuItem();
-            toolStripMenuItemShifts = new ToolStripMenuItem();
-            toolStripMenuItemContractors = new ToolStripMenuItem();
-            toolStripMenuItemFuels = new ToolStripMenuItem();
-            операцииToolStripMenuItem = new ToolStripMenuItem();
-            toolStripMenuItemFuelSale = new ToolStripMenuItem();
-            toolStripMenuItemContractorFuel = new ToolStripMenuItem();
-            отчетыToolStripMenuItem = new ToolStripMenuItem();
-            menuStrip1.SuspendLayout();
-            SuspendLayout();
-            // 
-            // menuStrip1
-            // 
-            menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem });
-            menuStrip1.Location = new Point(0, 0);
-            menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(784, 24);
-            menuStrip1.TabIndex = 0;
-            menuStrip1.Text = "menuStrip1";
-            // 
-            // справочникиToolStripMenuItem
-            // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemSalepersons, toolStripMenuItemShifts, toolStripMenuItemContractors, toolStripMenuItemFuels });
-            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            справочникиToolStripMenuItem.Size = new Size(94, 20);
-            справочникиToolStripMenuItem.Text = "Справочники";
-            // 
-            // toolStripMenuItemSalepersons
-            // 
-            toolStripMenuItemSalepersons.Name = "toolStripMenuItemSalepersons";
-            toolStripMenuItemSalepersons.Size = new Size(144, 22);
-            toolStripMenuItemSalepersons.Text = "Сотрудники";
-            toolStripMenuItemSalepersons.Click += toolStripMenuItemSalepersons_Click;
-            // 
-            // toolStripMenuItemShifts
-            // 
-            toolStripMenuItemShifts.Name = "toolStripMenuItemShifts";
-            toolStripMenuItemShifts.Size = new Size(144, 22);
-            toolStripMenuItemShifts.Text = "Смены";
-            toolStripMenuItemShifts.Click += toolStripMenuItemShifts_Click;
-            // 
-            // toolStripMenuItemContractors
-            // 
-            toolStripMenuItemContractors.Name = "toolStripMenuItemContractors";
-            toolStripMenuItemContractors.Size = new Size(144, 22);
-            toolStripMenuItemContractors.Text = "Поставщики";
-            toolStripMenuItemContractors.Click += toolStripMenuItemContractors_Click;
-            // 
-            // toolStripMenuItemFuels
-            // 
-            toolStripMenuItemFuels.Name = "toolStripMenuItemFuels";
-            toolStripMenuItemFuels.Size = new Size(144, 22);
-            toolStripMenuItemFuels.Text = "Топливо";
-            toolStripMenuItemFuels.Click += toolStripMenuItemFuels_Click;
-            // 
-            // операцииToolStripMenuItem
-            // 
-            операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { toolStripMenuItemFuelSale, toolStripMenuItemContractorFuel });
-            операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
-            операцииToolStripMenuItem.Size = new Size(75, 20);
-            операцииToolStripMenuItem.Text = "Операции";
-            // 
-            // toolStripMenuItemFuelSale
-            // 
-            toolStripMenuItemFuelSale.Name = "toolStripMenuItemFuelSale";
-            toolStripMenuItemFuelSale.Size = new Size(160, 22);
-            toolStripMenuItemFuelSale.Text = "Новая продажа";
-            toolStripMenuItemFuelSale.Click += toolStripMenuItemFuelSale_Click;
-            // 
-            // toolStripMenuItemContractorFuel
-            // 
-            toolStripMenuItemContractorFuel.Name = "toolStripMenuItemContractorFuel";
-            toolStripMenuItemContractorFuel.Size = new Size(160, 22);
-            toolStripMenuItemContractorFuel.Text = "Новая поставка";
-            toolStripMenuItemContractorFuel.Click += toolStripMenuItemContractorFuel_Click;
-            // 
-            // отчетыToolStripMenuItem
-            // 
-            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
-            отчетыToolStripMenuItem.Size = new Size(60, 20);
-            отчетыToolStripMenuItem.Text = "Отчеты";
-            // 
-            // FormGasStation
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            BackgroundImage = (Image)resources.GetObject("$this.BackgroundImage");
-            BackgroundImageLayout = ImageLayout.Stretch;
-            ClientSize = new Size(784, 411);
-            Controls.Add(menuStrip1);
-            MainMenuStrip = menuStrip1;
-            Name = "FormGasStation";
-            StartPosition = FormStartPosition.CenterScreen;
-            Text = "Заправка";
-            menuStrip1.ResumeLayout(false);
-            menuStrip1.PerformLayout();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private MenuStrip menuStrip1;
-        private ToolStripMenuItem справочникиToolStripMenuItem;
-        private ToolStripMenuItem toolStripMenuItemSalepersons;
-        private ToolStripMenuItem toolStripMenuItemShifts;
-        private ToolStripMenuItem toolStripMenuItemContractors;
-        private ToolStripMenuItem операцииToolStripMenuItem;
-        private ToolStripMenuItem отчетыToolStripMenuItem;
-        private ToolStripMenuItem toolStripMenuItemFuelSale;
-        private ToolStripMenuItem toolStripMenuItemContractorFuel;
-        private ToolStripMenuItem toolStripMenuItemFuels;
-    }
-}

ProjectGasStation/ProjectGasStation/FormGasStation.cs

@@ -1,92 +0,0 @@
-using ProjectGasStation.Forms;
-using Unity;
-
-namespace ProjectGasStation;
-
-public partial class FormGasStation : Form
-{
-    private readonly IUnityContainer _container;
-    public FormGasStation(IUnityContainer container)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-    }
-
-    private void toolStripMenuItemSalepersons_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormSalespersons>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void toolStripMenuItemShifts_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormShifts>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void toolStripMenuItemContractors_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormContractors>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void toolStripMenuItemFuels_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormFuels>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void toolStripMenuItemContractorFuel_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormContractorFuels>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void toolStripMenuItemFuelSale_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormFuelSales>().ShowDialog();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractor.Designer.cs

@@ -1,119 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormContractor
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            checkedListBoxFuelTypes = new CheckedListBox();
-            label1 = new Label();
-            textBoxName = new TextBox();
-            label2 = new Label();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // checkedListBoxFuelTypes
-            // 
-            checkedListBoxFuelTypes.FormattingEnabled = true;
-            checkedListBoxFuelTypes.Location = new Point(105, 48);
-            checkedListBoxFuelTypes.Name = "checkedListBoxFuelTypes";
-            checkedListBoxFuelTypes.Size = new Size(199, 94);
-            checkedListBoxFuelTypes.TabIndex = 0;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(34, 12);
-            label1.Name = "label1";
-            label1.Size = new Size(65, 15);
-            label1.TabIndex = 1;
-            label1.Text = "Название: ";
-            // 
-            // textBoxName
-            // 
-            textBoxName.Location = new Point(105, 9);
-            textBoxName.Name = "textBoxName";
-            textBoxName.Size = new Size(199, 23);
-            textBoxName.TabIndex = 2;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(12, 48);
-            label2.Name = "label2";
-            label2.Size = new Size(87, 15);
-            label2.TabIndex = 3;
-            label2.Text = "Типы топлива:";
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(105, 148);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 4;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(229, 148);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // FormContractor
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(344, 191);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(label2);
-            Controls.Add(textBoxName);
-            Controls.Add(label1);
-            Controls.Add(checkedListBoxFuelTypes);
-            Name = "FormContractor";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Поставщик";
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private CheckedListBox checkedListBoxFuelTypes;
-        private Label label1;
-        private TextBox textBoxName;
-        private Label label2;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractor.cs

@@ -1,88 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Entities.Enums;
-using ProjectGasStation.Repositories;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormContractor : Form
-{
-    private readonly IContractorRepository _contractorRepository;
-    private int? _contractorId;
-    public int Id
-    {
-        set
-        {
-            try
-            {
-                var contractor = _contractorRepository.ReadContractorById(value);
-                if (contractor == null)
-                {
-                    throw new InvalidDataException(nameof(contractor));
-                }
-                foreach (ContractorFuelType elem in Enum.GetValues(typeof(ContractorFuelType)))
-                {
-                    if ((elem & contractor.Types) != 0)
-                    {
-                        checkedListBoxFuelTypes.SetItemChecked(checkedListBoxFuelTypes.Items.IndexOf(elem), true);
-                    }
-                }
-                textBoxName.Text = contractor.Name;
-                _contractorId = value;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-    }
-
-    public FormContractor(IContractorRepository contractorRepository)
-    {
-        InitializeComponent();
-        _contractorRepository = contractorRepository ?? throw new ArgumentNullException(nameof(contractorRepository));
-        foreach (ContractorFuelType fuelType in Enum.GetValues(typeof(ContractorFuelType)))
-        {
-            if (fuelType == ContractorFuelType.None) continue;
-            checkedListBoxFuelTypes.Items.Add(fuelType);
-        }
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (string.IsNullOrWhiteSpace(textBoxName.Text) || checkedListBoxFuelTypes.CheckedItems.Count == 0)
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            if (_contractorId.HasValue)
-            {
-                _contractorRepository.UpdateContractor(CreateContractor(_contractorId.Value));
-            }
-            else
-            {
-                _contractorRepository.CreateContractor(CreateContractor(0));
-            }
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-
-    private Contractor CreateContractor(int id)
-    {
-        ContractorFuelType fuelType = ContractorFuelType.None;
-        foreach (var elem in checkedListBoxFuelTypes.CheckedItems)
-        {
-            fuelType |= (ContractorFuelType)elem;
-        }
-        return Contractor.CreateContractor(id, textBoxName.Text, fuelType);
-    }
-
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractor.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.Designer.cs

@@ -1,173 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormContractorFuel
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            label1 = new Label();
-            comboBoxContractor = new ComboBox();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            groupBox = new GroupBox();
-            dataGridView = new DataGridView();
-            ColumnFuel = new DataGridViewComboBoxColumn();
-            ColumnQuantity = new DataGridViewTextBoxColumn();
-            label2 = new Label();
-            dateTimePickerDate = new DateTimePicker();
-            groupBox.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // label1
-            // 
-            label1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            label1.AutoSize = true;
-            label1.Location = new Point(14, 19);
-            label1.Name = "label1";
-            label1.Size = new Size(73, 15);
-            label1.TabIndex = 0;
-            label1.Text = "Поставщик:";
-            // 
-            // comboBoxContractor
-            // 
-            comboBoxContractor.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            comboBoxContractor.FormattingEnabled = true;
-            comboBoxContractor.Location = new Point(93, 16);
-            comboBoxContractor.Name = "comboBoxContractor";
-            comboBoxContractor.Size = new Size(206, 23);
-            comboBoxContractor.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonSave.Location = new Point(12, 381);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 6;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonCancel.Location = new Point(224, 381);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 7;
-            buttonCancel.Text = "Отменить";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // groupBox
-            // 
-            groupBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            groupBox.Controls.Add(dataGridView);
-            groupBox.Location = new Point(12, 87);
-            groupBox.Name = "groupBox";
-            groupBox.Size = new Size(287, 288);
-            groupBox.TabIndex = 8;
-            groupBox.TabStop = false;
-            groupBox.Text = "Топливо";
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToResizeColumns = false;
-            dataGridView.AllowUserToResizeRows = false;
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnFuel, ColumnQuantity });
-            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.Location = new Point(3, 19);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(281, 266);
-            dataGridView.TabIndex = 0;
-            // 
-            // ColumnFuel
-            // 
-            ColumnFuel.HeaderText = "Топливо";
-            ColumnFuel.Name = "ColumnFuel";
-            // 
-            // ColumnQuantity
-            // 
-            ColumnQuantity.HeaderText = "Количество";
-            ColumnQuantity.Name = "ColumnQuantity";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(52, 62);
-            label2.Name = "label2";
-            label2.Size = new Size(35, 15);
-            label2.TabIndex = 9;
-            label2.Text = "Дата:";
-            // 
-            // dateTimePickerDate
-            // 
-            dateTimePickerDate.Location = new Point(93, 56);
-            dateTimePickerDate.Name = "dateTimePickerDate";
-            dateTimePickerDate.Size = new Size(206, 23);
-            dateTimePickerDate.TabIndex = 10;
-            // 
-            // FormContractorFuel
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(311, 416);
-            Controls.Add(dateTimePickerDate);
-            Controls.Add(label2);
-            Controls.Add(groupBox);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(comboBoxContractor);
-            Controls.Add(label1);
-            Name = "FormContractorFuel";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Новая поставка";
-            groupBox.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label label1;
-        private ComboBox comboBoxContractor;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private GroupBox groupBox;
-        private DataGridView dataGridView;
-        private DataGridViewComboBoxColumn ColumnFuel;
-        private DataGridViewTextBoxColumn ColumnQuantity;
-        private Label label2;
-        private DateTimePicker dateTimePickerDate;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.cs

@@ -1,63 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Repositories;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormContractorFuel : Form
-{
-    private readonly IContractorFuelRepository _contractorFuelRepository;
-    public FormContractorFuel(
-        IContractorFuelRepository contractorFuelRepository,
-        IContractorRepository contractorRepository,
-        IFuelRepository fuelRepository)
-    {
-        InitializeComponent();
-        _contractorFuelRepository = contractorFuelRepository ?? throw new ArgumentNullException(nameof(contractorRepository));
-
-        comboBoxContractor.DataSource = contractorRepository.ReadContractors();
-        comboBoxContractor.DisplayMember = "Name";
-        comboBoxContractor.ValueMember = "Id";
-
-        ColumnFuel.DataSource = fuelRepository.ReadFuels();
-        ColumnFuel.DisplayMember = "Type";
-        ColumnFuel.ValueMember = "Id";
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (comboBoxContractor.SelectedIndex < 0 || dataGridView.RowCount < 1)
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            _contractorFuelRepository.CreateContractorFuel(ContractorFuel.CreateContractorFuel(0, 
-                (int)comboBoxContractor.SelectedValue!, dateTimePickerDate.Value, CreateListContractorFuelFuelFromDataGrid()));
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-
-    private List<ContractorFuelFuel> CreateListContractorFuelFuelFromDataGrid()
-    {
-        var list = new List<ContractorFuelFuel>();
-        foreach (DataGridViewRow row in dataGridView.Rows)
-        {
-            if (row.Cells["ColumnFuel"].Value == null ||
-            row.Cells["ColumnQuantity"].Value == null)
-            {
-                continue;
-            }
-            list.Add(ContractorFuelFuel.CreateContractorFuelFuel(0,
-                Convert.ToInt32(row.Cells["ColumnFuel"].Value),
-                Convert.ToInt32(row.Cells["ColumnQuantity"].Value)));
-        }
-        return list;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuel.resx

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ColumnFuel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnFuel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuels.Designer.cs

@@ -1,112 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormContractorFuels
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(14, 83);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormContractorFuels
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormContractorFuels";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Поставки";
-            Load += FormContractors_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuels.cs

@@ -1,81 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormContractorFuels : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly IContractorFuelRepository _contractorFuelRepository;
-    public FormContractorFuels(IUnityContainer container, IContractorFuelRepository contractorFuelRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _contractorFuelRepository = contractorFuelRepository ?? throw new ArgumentNullException(nameof(contractorFuelRepository));
-    }
-
-    private void FormContractors_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormContractorFuel>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _contractorFuelRepository.DeleteContractorFuel(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _contractorFuelRepository.ReadContractorFuels();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractorFuels.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormContractors.Designer.cs

@@ -1,126 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormContractors
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonUpdate = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonUpdate);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(15, 154);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.BackgroundImage = Properties.Resources.edit_icon;
-            buttonUpdate.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUpdate.Location = new Point(15, 83);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(68, 65);
-            buttonUpdate.TabIndex = 1;
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormContractors
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormContractors";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Поставщики";
-            Load += FormContractors_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractors.cs

@@ -1,100 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormContractors : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly IContractorRepository _contractorRepository;
-    public FormContractors(IUnityContainer container, IContractorRepository contractorRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _contractorRepository = contractorRepository ?? throw new ArgumentNullException(nameof(contractorRepository));
-    }
-
-    private void FormContractors_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormContractor>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonUpdate_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        try
-        {
-            var form = _container.Resolve<FormContractor>();
-            form.Id = findId;
-            form.ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _contractorRepository.DeleteContractor(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _contractorRepository.ReadContractors();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormContractors.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormFuel.Designer.cs

@@ -1,124 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormFuel
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            comboBoxType = new ComboBox();
-            numericUpDownCost = new NumericUpDown();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            label1 = new Label();
-            label2 = new Label();
-            ((System.ComponentModel.ISupportInitialize)numericUpDownCost).BeginInit();
-            SuspendLayout();
-            // 
-            // comboBoxType
-            // 
-            comboBoxType.FormattingEnabled = true;
-            comboBoxType.Location = new Point(98, 57);
-            comboBoxType.Name = "comboBoxType";
-            comboBoxType.Size = new Size(139, 23);
-            comboBoxType.TabIndex = 0;
-            // 
-            // numericUpDownCost
-            // 
-            numericUpDownCost.DecimalPlaces = 2;
-            numericUpDownCost.ImeMode = ImeMode.On;
-            numericUpDownCost.Location = new Point(98, 18);
-            numericUpDownCost.Maximum = new decimal(new int[] { 10000, 0, 0, 0 });
-            numericUpDownCost.Name = "numericUpDownCost";
-            numericUpDownCost.Size = new Size(139, 23);
-            numericUpDownCost.TabIndex = 1;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(14, 90);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 2;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(162, 90);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 3;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(14, 60);
-            label1.Name = "label1";
-            label1.Size = new Size(78, 15);
-            label1.TabIndex = 4;
-            label1.Text = "Вид топлива:";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(54, 20);
-            label2.Name = "label2";
-            label2.Size = new Size(38, 15);
-            label2.TabIndex = 5;
-            label2.Text = "Цена:";
-            // 
-            // FormFuel
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(264, 136);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(numericUpDownCost);
-            Controls.Add(comboBoxType);
-            Name = "FormFuel";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Топливо";
-            ((System.ComponentModel.ISupportInitialize)numericUpDownCost).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox comboBoxType;
-        private NumericUpDown numericUpDownCost;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label label1;
-        private Label label2;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuel.cs

@@ -1,71 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Entities.Enums;
-using ProjectGasStation.Repositories;
-using ProjectGasStation.Repositories.Implementations;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormFuel : Form
-{
-    private readonly IFuelRepository _fuelRepository;
-    private int? _fuelId;
-    public int Id
-    {
-        set
-        {
-            try
-            {
-                var fuel = _fuelRepository.ReadFuelById(value);
-                if (fuel == null)
-                {
-                    throw new InvalidDataException(nameof(fuel));
-                }
-
-                numericUpDownCost.Value = (decimal)fuel.Price;
-                comboBoxType.SelectedItem = fuel.Type;
-                _fuelId = fuel.Id;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-    }
-    public FormFuel(IFuelRepository fuelRepository)
-    {
-        InitializeComponent();
-        _fuelRepository = fuelRepository ?? throw new ArgumentNullException(nameof(fuelRepository));
-        comboBoxType.DataSource = Enum.GetValues(typeof(FuelType));
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (numericUpDownCost.Value == 0 || comboBoxType.SelectedIndex < 1)
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            if (_fuelId.HasValue)
-            {
-                _fuelRepository.UpdateFuel(CreateFuel(_fuelId.Value));
-            }
-            else
-            {
-                _fuelRepository.CreateFuel(CreateFuel(0));
-            }
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-
-    private Fuel CreateFuel(int id) => Fuel.CreateFuel(id, (FuelType)comboBoxType.SelectedItem!, (double)numericUpDownCost.Value);
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.Designer.cs

@@ -1,201 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormFuelSale
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            comboBoxSalesperson = new ComboBox();
-            comboBoxShift = new ComboBox();
-            dateTimePickerDate = new DateTimePicker();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            label1 = new Label();
-            label2 = new Label();
-            label3 = new Label();
-            groupBox1 = new GroupBox();
-            dataGridView = new DataGridView();
-            ColumnFuel = new DataGridViewComboBoxColumn();
-            ColumnQuantity = new DataGridViewTextBoxColumn();
-            groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // comboBoxSalesperson
-            // 
-            comboBoxSalesperson.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            comboBoxSalesperson.FormattingEnabled = true;
-            comboBoxSalesperson.Location = new Point(127, 12);
-            comboBoxSalesperson.Name = "comboBoxSalesperson";
-            comboBoxSalesperson.Size = new Size(222, 23);
-            comboBoxSalesperson.TabIndex = 0;
-            // 
-            // comboBoxShift
-            // 
-            comboBoxShift.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            comboBoxShift.FormattingEnabled = true;
-            comboBoxShift.Location = new Point(127, 41);
-            comboBoxShift.Name = "comboBoxShift";
-            comboBoxShift.Size = new Size(222, 23);
-            comboBoxShift.TabIndex = 1;
-            // 
-            // dateTimePickerDate
-            // 
-            dateTimePickerDate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            dateTimePickerDate.Location = new Point(127, 70);
-            dateTimePickerDate.Name = "dateTimePickerDate";
-            dateTimePickerDate.Size = new Size(222, 23);
-            dateTimePickerDate.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonSave.Location = new Point(12, 302);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 5;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonCancel.Location = new Point(274, 302);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 6;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // label1
-            // 
-            label1.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            label1.AutoSize = true;
-            label1.Location = new Point(57, 15);
-            label1.Name = "label1";
-            label1.Size = new Size(64, 15);
-            label1.TabIndex = 7;
-            label1.Text = "Продавец:";
-            // 
-            // label2
-            // 
-            label2.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            label2.AutoSize = true;
-            label2.Location = new Point(75, 44);
-            label2.Name = "label2";
-            label2.Size = new Size(46, 15);
-            label2.TabIndex = 8;
-            label2.Text = "Смена:";
-            // 
-            // label3
-            // 
-            label3.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            label3.AutoSize = true;
-            label3.Location = new Point(34, 74);
-            label3.Name = "label3";
-            label3.Size = new Size(87, 15);
-            label3.TabIndex = 9;
-            label3.Text = "Дата продажи:";
-            // 
-            // groupBox1
-            // 
-            groupBox1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            groupBox1.Controls.Add(dataGridView);
-            groupBox1.Location = new Point(12, 99);
-            groupBox1.Name = "groupBox1";
-            groupBox1.Size = new Size(337, 197);
-            groupBox1.TabIndex = 10;
-            groupBox1.TabStop = false;
-            groupBox1.Text = "Топливо";
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToResizeColumns = false;
-            dataGridView.AllowUserToResizeRows = false;
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnFuel, ColumnQuantity });
-            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.Location = new Point(3, 19);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(331, 175);
-            dataGridView.TabIndex = 0;
-            // 
-            // ColumnFuel
-            // 
-            ColumnFuel.HeaderText = "Топливо";
-            ColumnFuel.Name = "ColumnFuel";
-            // 
-            // ColumnQuantity
-            // 
-            ColumnQuantity.HeaderText = "Количество";
-            ColumnQuantity.Name = "ColumnQuantity";
-            // 
-            // FormFuelSale
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(371, 341);
-            Controls.Add(groupBox1);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(dateTimePickerDate);
-            Controls.Add(comboBoxShift);
-            Controls.Add(comboBoxSalesperson);
-            Name = "FormFuelSale";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Новая продажа";
-            groupBox1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private ComboBox comboBoxSalesperson;
-        private ComboBox comboBoxShift;
-        private NumericUpDown numericUpDown1;
-        private DateTimePicker dateTimePickerDate;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private GroupBox groupBox1;
-        private DataGridView dataGridView;
-        private DataGridViewComboBoxColumn ColumnFuel;
-        private DataGridViewTextBoxColumn ColumnQuantity;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.cs

@@ -1,67 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Repositories;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormFuelSale : Form
-{
-    private readonly IFuelSaleRepository _fuelSaleRepository;
-    public FormFuelSale(IFuelSaleRepository fuelSaleRepository,
-        ISalespersonRepository salespersonRepository,
-        IShiftRepository shiftRepository,
-        IFuelRepository fuelRepository)
-    {
-        InitializeComponent();
-        _fuelSaleRepository = fuelSaleRepository ?? throw new ArgumentNullException(nameof(fuelSaleRepository));
-
-        comboBoxSalesperson.DataSource = salespersonRepository.ReadSalespersons();
-        comboBoxSalesperson.DisplayMember = "FirstName";
-        comboBoxSalesperson.ValueMember = "Id";
-
-        comboBoxShift.DataSource = shiftRepository.ReadShifts();
-        comboBoxShift.DisplayMember = "DisplayName";
-        comboBoxShift.ValueMember = "Id";
-
-        ColumnFuel.DataSource = fuelRepository.ReadFuels();
-        ColumnFuel.DisplayMember = "Type";
-        ColumnFuel.ValueMember = "Id";
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (comboBoxSalesperson.SelectedIndex < 0 || comboBoxShift.SelectedIndex < 0 || dataGridView.RowCount < 1)
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            _fuelSaleRepository.CreateFuelSale(FuelSale.CreateFuelSale(0,
-                (int)comboBoxSalesperson.SelectedValue!, (int)comboBoxShift.SelectedValue!, dateTimePickerDate.Value, CreateListFuelFuelSaleFromDataGrid()));
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-    private List<FuelFuelSale> CreateListFuelFuelSaleFromDataGrid()
-    {
-        var list = new List<FuelFuelSale>();
-        foreach (DataGridViewRow row in dataGridView.Rows)
-        {
-            if (row.Cells["ColumnFuel"].Value == null ||
-            row.Cells["ColumnQuantity"].Value == null)
-            {
-                continue;
-            }
-            list.Add(FuelFuelSale.CreateFuelFuelSale(0,
-                Convert.ToInt32(row.Cells["ColumnFuel"].Value),
-                Convert.ToInt32(row.Cells["ColumnQuantity"].Value)));
-        }
-        return list;
-    }
-
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuelSale.resx

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="ColumnFuel.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ColumnQuantity.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormFuelSales.Designer.cs

@@ -1,112 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormFuelSales
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(15, 83);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormFuelSales
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormFuelSales";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Продажи";
-            Load += FormFuels_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuelSales.cs

@@ -1,80 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormFuelSales : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly IFuelSaleRepository _fuelSaleRepository;
-    public FormFuelSales(IUnityContainer container, IFuelSaleRepository fuelSaleRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _fuelSaleRepository = fuelSaleRepository ?? throw new ArgumentNullException(nameof(fuelSaleRepository));
-    }
-
-    private void FormFuels_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormFuelSale>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _fuelSaleRepository.DeleteFuelSale(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _fuelSaleRepository.ReadFuelSales();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuelSales.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormFuels.Designer.cs

@@ -1,126 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormFuels
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonUpdate = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonUpdate);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(15, 154);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.BackgroundImage = Properties.Resources.edit_icon;
-            buttonUpdate.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUpdate.Location = new Point(15, 83);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(68, 65);
-            buttonUpdate.TabIndex = 1;
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormFuels
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormFuels";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Топливо";
-            Load += FormFuels_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuels.cs

@@ -1,100 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormFuels : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly IFuelRepository _fuelRepository;
-    public FormFuels(IUnityContainer container, IFuelRepository fuelRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _fuelRepository = fuelRepository ?? throw new ArgumentNullException(nameof(fuelRepository));
-    }
-
-    private void FormFuels_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormFuel>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonUpdate_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        try
-        {
-            var form = _container.Resolve<FormFuel>();
-            form.Id = findId;
-            form.ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _fuelRepository.DeleteFuel(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _fuelRepository.ReadFuels();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormFuels.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormSalesperson.Designer.cs

@@ -1,118 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormSalesperson
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            label1 = new Label();
-            label2 = new Label();
-            textBoxLastName = new TextBox();
-            textBoxFirstName = new TextBox();
-            buttonSave = new Button();
-            buttonCancel = new Button();
-            SuspendLayout();
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(70, 20);
-            label1.Name = "label1";
-            label1.Size = new Size(34, 15);
-            label1.TabIndex = 0;
-            label1.Text = "Имя:";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(40, 62);
-            label2.Name = "label2";
-            label2.Size = new Size(64, 15);
-            label2.TabIndex = 1;
-            label2.Text = "Фамилия: ";
-            // 
-            // textBoxLastName
-            // 
-            textBoxLastName.Location = new Point(110, 59);
-            textBoxLastName.Name = "textBoxLastName";
-            textBoxLastName.Size = new Size(176, 23);
-            textBoxLastName.TabIndex = 2;
-            // 
-            // textBoxFirstName
-            // 
-            textBoxFirstName.Location = new Point(110, 17);
-            textBoxFirstName.Name = "textBoxFirstName";
-            textBoxFirstName.Size = new Size(176, 23);
-            textBoxFirstName.TabIndex = 3;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(42, 116);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 4;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(211, 116);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 5;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // FormSalesperson
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(369, 151);
-            Controls.Add(buttonCancel);
-            Controls.Add(buttonSave);
-            Controls.Add(textBoxFirstName);
-            Controls.Add(textBoxLastName);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Name = "FormSalesperson";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Продавец";
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private Label label1;
-        private Label label2;
-        private TextBox textBoxLastName;
-        private TextBox textBoxFirstName;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormSalesperson.cs

@@ -1,69 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Repositories;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormSalesperson : Form
-{
-    public readonly ISalespersonRepository _salespersonRepository;
-    private int? _salespersonId;
-    public int Id
-    {
-        set
-        {
-            try
-            {
-                var salesperson = _salespersonRepository.ReadSalespersonById(value);
-                if (salesperson == null)
-                {
-                    throw new InvalidDataException(nameof(salesperson));
-                }
-
-                textBoxFirstName.Text = salesperson.FirstName;
-                textBoxLastName.Text = salesperson.LastName;
-                _salespersonId = salesperson.Id;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-    }
-
-    public FormSalesperson(ISalespersonRepository salespersonRepository)
-    {
-        InitializeComponent();
-        _salespersonRepository = salespersonRepository ?? throw new ArgumentNullException(nameof(salespersonRepository));
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (string.IsNullOrWhiteSpace(textBoxFirstName.Text) || string.IsNullOrWhiteSpace(textBoxLastName.Text))
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            if (_salespersonId.HasValue)
-            {
-                _salespersonRepository.UpdateSalesperson(CreateSalesperson(_salespersonId.Value));
-            }
-            else
-            {
-                _salespersonRepository.CreateSalesperson(CreateSalesperson(0));
-            }
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-
-    private Salesperson CreateSalesperson(int id) => Salesperson.CreateSalesperson(id, textBoxFirstName.Text, textBoxLastName.Text);
-}

ProjectGasStation/ProjectGasStation/Forms/FormSalesperson.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormSalespersons.Designer.cs

@@ -1,126 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormSalespersons
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonUpdate = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonUpdate);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(15, 154);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.BackgroundImage = Properties.Resources.edit_icon;
-            buttonUpdate.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUpdate.Location = new Point(15, 83);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(68, 65);
-            buttonUpdate.TabIndex = 1;
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormSalespersons
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormSalespersons";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Продавцы";
-            Load += FormSalespersons_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormSalespersons.cs

@@ -1,100 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormSalespersons : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly ISalespersonRepository _salespersonRepository;
-    public FormSalespersons(IUnityContainer container, ISalespersonRepository salespersonRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _salespersonRepository = salespersonRepository ?? throw new ArgumentNullException(nameof(salespersonRepository));
-    }
-
-    private void FormSalespersons_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormSalesperson>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonUpdate_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        try
-        {
-            var form = _container.Resolve<FormSalesperson>();
-            form.Id = findId;
-            form.ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _salespersonRepository.DeleteSalesperson(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _salespersonRepository.ReadSalespersons();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormSalespersons.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormShift.Designer.cs

@@ -1,168 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormShift
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            dateTimePickerStart = new DateTimePicker();
-            dateTimePickerEnd = new DateTimePicker();
-            comboBoxType = new ComboBox();
-            dateTimePickerDate = new DateTimePicker();
-            label1 = new Label();
-            label2 = new Label();
-            label3 = new Label();
-            label4 = new Label();
-            buttonCancel = new Button();
-            buttonSave = new Button();
-            SuspendLayout();
-            // 
-            // dateTimePickerStart
-            // 
-            dateTimePickerStart.Format = DateTimePickerFormat.Time;
-            dateTimePickerStart.Location = new Point(105, 18);
-            dateTimePickerStart.Name = "dateTimePickerStart";
-            dateTimePickerStart.ShowUpDown = true;
-            dateTimePickerStart.Size = new Size(200, 23);
-            dateTimePickerStart.TabIndex = 0;
-            // 
-            // dateTimePickerEnd
-            // 
-            dateTimePickerEnd.Format = DateTimePickerFormat.Time;
-            dateTimePickerEnd.Location = new Point(105, 47);
-            dateTimePickerEnd.Name = "dateTimePickerEnd";
-            dateTimePickerEnd.ShowUpDown = true;
-            dateTimePickerEnd.Size = new Size(200, 23);
-            dateTimePickerEnd.TabIndex = 1;
-            // 
-            // comboBoxType
-            // 
-            comboBoxType.FormattingEnabled = true;
-            comboBoxType.Location = new Point(105, 105);
-            comboBoxType.Name = "comboBoxType";
-            comboBoxType.Size = new Size(200, 23);
-            comboBoxType.TabIndex = 2;
-            // 
-            // dateTimePickerDate
-            // 
-            dateTimePickerDate.Format = DateTimePickerFormat.Short;
-            dateTimePickerDate.Location = new Point(105, 76);
-            dateTimePickerDate.Name = "dateTimePickerDate";
-            dateTimePickerDate.Size = new Size(200, 23);
-            dateTimePickerDate.TabIndex = 3;
-            // 
-            // label1
-            // 
-            label1.AutoSize = true;
-            label1.Location = new Point(12, 24);
-            label1.Name = "label1";
-            label1.Size = new Size(87, 15);
-            label1.TabIndex = 4;
-            label1.Text = "Время начала:";
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(18, 53);
-            label2.Name = "label2";
-            label2.Size = new Size(81, 15);
-            label2.TabIndex = 5;
-            label2.Text = "Время конца:";
-            // 
-            // label3
-            // 
-            label3.AutoSize = true;
-            label3.Location = new Point(64, 82);
-            label3.Name = "label3";
-            label3.Size = new Size(35, 15);
-            label3.TabIndex = 6;
-            label3.Text = "Дата:";
-            // 
-            // label4
-            // 
-            label4.AutoSize = true;
-            label4.Location = new Point(29, 108);
-            label4.Name = "label4";
-            label4.Size = new Size(70, 15);
-            label4.TabIndex = 7;
-            label4.Text = "Тип смены:";
-            // 
-            // buttonCancel
-            // 
-            buttonCancel.Location = new Point(230, 144);
-            buttonCancel.Name = "buttonCancel";
-            buttonCancel.Size = new Size(75, 23);
-            buttonCancel.TabIndex = 8;
-            buttonCancel.Text = "Отмена";
-            buttonCancel.UseVisualStyleBackColor = true;
-            buttonCancel.Click += buttonCancel_Click;
-            // 
-            // buttonSave
-            // 
-            buttonSave.Location = new Point(105, 144);
-            buttonSave.Name = "buttonSave";
-            buttonSave.Size = new Size(75, 23);
-            buttonSave.TabIndex = 9;
-            buttonSave.Text = "Сохранить";
-            buttonSave.UseVisualStyleBackColor = true;
-            buttonSave.Click += buttonSave_Click;
-            // 
-            // FormShift
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(324, 191);
-            Controls.Add(buttonSave);
-            Controls.Add(buttonCancel);
-            Controls.Add(label4);
-            Controls.Add(label3);
-            Controls.Add(label2);
-            Controls.Add(label1);
-            Controls.Add(dateTimePickerDate);
-            Controls.Add(comboBoxType);
-            Controls.Add(dateTimePickerEnd);
-            Controls.Add(dateTimePickerStart);
-            Name = "FormShift";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Смена";
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private DateTimePicker dateTimePickerStart;
-        private DateTimePicker dateTimePickerEnd;
-        private ComboBox comboBoxType;
-        private DateTimePicker dateTimePickerDate;
-        private Label label1;
-        private Label label2;
-        private Label label3;
-        private Label label4;
-        private Button buttonCancel;
-        private Button buttonSave;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormShift.cs

@@ -1,81 +0,0 @@
-using ProjectGasStation.Entities;
-using ProjectGasStation.Entities.Enums;
-using ProjectGasStation.Repositories;
-using ProjectGasStation.Repositories.Implementations;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormShift : Form
-{
-    public readonly IShiftRepository _shiftRepository;
-    private int? _shiftId;
-    public int Id
-    {
-        set
-        {
-            try
-            {
-                var shift = _shiftRepository.ReadShiftById(value);
-                if (shift == null)
-                {
-                    throw new InvalidDataException(nameof(shift));
-                }
-
-                dateTimePickerStart.Value = shift.Date.Date + shift.StartTime;
-                dateTimePickerEnd.Value = shift.Date.Date + shift.EndTime;
-                dateTimePickerDate.Value = shift.Date.Date;
-                comboBoxType.SelectedItem = shift.Type;
-                _shiftId = shift.Id;
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-        }
-    }
-    public FormShift(IShiftRepository shiftRepository)
-    {
-        InitializeComponent();
-        _shiftRepository = shiftRepository ?? throw new ArgumentNullException(nameof(shiftRepository));
-        comboBoxType.DataSource = Enum.GetValues(typeof(ShiftType));
-    }
-
-    private void buttonSave_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            if (comboBoxType.SelectedIndex < 1)
-            {
-                throw new Exception("Имеются незаполненные поля");
-            }
-            if (_shiftId.HasValue)
-            {
-                _shiftRepository.UpdateShift(CreateShift(_shiftId.Value));
-            }
-            else
-            {
-                _shiftRepository.CreateShift(CreateShift(0));
-            }
-            Close();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при сохранении",
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonCancel_Click(object sender, EventArgs e) => Close();
-
-    private Shift CreateShift(int id)
-    {
-        var startTime = dateTimePickerStart.Value.TimeOfDay;
-        var endTime = dateTimePickerEnd.Value.TimeOfDay;
-
-        var startTimeRounded = new TimeSpan(startTime.Hours, startTime.Minutes, startTime.Seconds);
-        var endTimeRounded = new TimeSpan(endTime.Hours, endTime.Minutes, endTime.Seconds);
-
-        return Shift.CreateShift(id, startTimeRounded, endTimeRounded, dateTimePickerDate.Value.Date, (ShiftType)comboBoxType.SelectedItem!);
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormShift.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Forms/FormShifts.Designer.cs

@@ -1,126 +0,0 @@
-namespace ProjectGasStation.Forms
-{
-    partial class FormShifts
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            panel1 = new Panel();
-            buttonDelete = new Button();
-            buttonUpdate = new Button();
-            buttonAdd = new Button();
-            dataGridViewData = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonDelete);
-            panel1.Controls.Add(buttonUpdate);
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(789, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(95, 361);
-            panel1.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            buttonDelete.BackgroundImage = Properties.Resources._1828843;
-            buttonDelete.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDelete.Location = new Point(15, 154);
-            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(68, 65);
-            buttonDelete.TabIndex = 2;
-            buttonDelete.UseVisualStyleBackColor = true;
-            buttonDelete.Click += buttonDelete_Click;
-            // 
-            // buttonUpdate
-            // 
-            buttonUpdate.BackgroundImage = Properties.Resources.edit_icon;
-            buttonUpdate.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUpdate.Location = new Point(15, 83);
-            buttonUpdate.Name = "buttonUpdate";
-            buttonUpdate.Size = new Size(68, 65);
-            buttonUpdate.TabIndex = 1;
-            buttonUpdate.UseVisualStyleBackColor = true;
-            buttonUpdate.Click += buttonUpdate_Click;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources._5610959;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(14, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(68, 65);
-            buttonAdd.TabIndex = 0;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += buttonAdd_Click;
-            // 
-            // dataGridViewData
-            // 
-            dataGridViewData.AllowUserToAddRows = false;
-            dataGridViewData.AllowUserToDeleteRows = false;
-            dataGridViewData.AllowUserToResizeColumns = false;
-            dataGridViewData.AllowUserToResizeRows = false;
-            dataGridViewData.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridViewData.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewData.Dock = DockStyle.Fill;
-            dataGridViewData.Location = new Point(0, 0);
-            dataGridViewData.MultiSelect = false;
-            dataGridViewData.Name = "dataGridViewData";
-            dataGridViewData.ReadOnly = true;
-            dataGridViewData.RowHeadersVisible = false;
-            dataGridViewData.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridViewData.Size = new Size(789, 361);
-            dataGridViewData.TabIndex = 1;
-            // 
-            // FormShifts
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(884, 361);
-            Controls.Add(dataGridViewData);
-            Controls.Add(panel1);
-            Name = "FormShifts";
-            StartPosition = FormStartPosition.CenterParent;
-            Text = "Смены";
-            Load += FormShifts_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-        private Button buttonAdd;
-        private DataGridView dataGridViewData;
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormShifts.cs

@@ -1,100 +0,0 @@
-using ProjectGasStation.Repositories;
-using Unity;
-
-namespace ProjectGasStation.Forms;
-
-public partial class FormShifts : Form
-{
-    private readonly IUnityContainer _container;
-    private readonly IShiftRepository _shiftRepository;
-    public FormShifts(IUnityContainer container, IShiftRepository shiftRepository)
-    {
-        InitializeComponent();
-        _container = container ?? throw new ArgumentNullException(nameof(container));
-        _shiftRepository = shiftRepository ?? throw new ArgumentNullException(nameof(shiftRepository));
-    }
-
-    private void FormShifts_Load(object sender, EventArgs e)
-    {
-        try
-        {
-            LoadList();
-        } 
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonAdd_Click(object sender, EventArgs e)
-    {
-        try
-        {
-            _container.Resolve<FormShift>().ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonUpdate_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        try
-        {
-            var form = _container.Resolve<FormShift>();
-            form.Id = findId;
-            form.ShowDialog();
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void buttonDelete_Click(object sender, EventArgs e)
-    {
-        if (!TryGetIdentifierFromSelectedRow(out var findId))
-        {
-            return;
-        }
-
-        if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
-        {
-            return;
-        }
-
-        try
-        {
-            _shiftRepository.DeleteShift(findId);
-            LoadList();
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
-    }
-
-    private void LoadList() => dataGridViewData.DataSource = _shiftRepository.ReadShifts();
-
-    private bool TryGetIdentifierFromSelectedRow(out int id)
-    {
-        id = 0;
-        if(dataGridViewData.SelectedRows.Count < 1)
-        {
-            MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            return false;
-        }
-
-        id = Convert.ToInt32(dataGridViewData.SelectedRows[0].Cells["Id"].Value);
-        return true;
-
-    }
-}

ProjectGasStation/ProjectGasStation/Forms/FormShifts.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

ProjectGasStation/ProjectGasStation/Program.cs

@@ -1,11 +1,3 @@
-using Unity;
-using ProjectGasStation.Repositories;
-using ProjectGasStation.Repositories.Implementations;
-using Unity.Microsoft.Logging;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using Serilog;
-
 namespace ProjectGasStation
 {
     internal static class Program
@@ -19,36 +11,7 @@ namespace ProjectGasStation
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(CreateContainer().Resolve<FormGasStation>());
+            Application.Run(new Form1());
         }
-
-        private static IUnityContainer CreateContainer()
-        {
-            var container = new UnityContainer();
-            container.AddExtension(new LoggingExtension(CreateLoggerFactory()));
-
-            container.RegisterType<IContractorFuelRepository, ContractorFuelRepository>();
-            container.RegisterType<IContractorRepository, ContractorRepository>();
-            container.RegisterType<IFuelRepository, FuelRepository>();
-            container.RegisterType<IFuelSaleRepository, FuelSaleRepository>();
-            container.RegisterType<ISalespersonRepository, SalespersonRepository>();
-            container.RegisterType<IShiftRepository, ShiftRepository>();
-
-            container.RegisterType<IConnectionString, ConnectionString>();
-
-            return container;
-        }
-        private static LoggerFactory CreateLoggerFactory()
-        {
-            var loggerFactory = new LoggerFactory();
-            loggerFactory.AddSerilog(new LoggerConfiguration()
-                .ReadFrom.Configuration(new ConfigurationBuilder()
-                .SetBasePath(Directory.GetCurrentDirectory())
-                .AddJsonFile("appsettings.json")
-                .Build())
-                .CreateLogger());
-            return loggerFactory;
-        }
-
     }
 }

ProjectGasStation/ProjectGasStation/ProjectGasStation.csproj

@@ -8,56 +8,4 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.1.35" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Npgsql" Version="8.0.5" />
-    <PackageReference Include="Serilog" Version="4.1.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
-    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-    <PackageReference Include="Unity" Version="5.11.10" />
-    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Forms\FormContractorFuels.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Forms\FormContractors.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Forms\FormFuelSales.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Forms\FormFuels.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Forms\FormShifts.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

ProjectGasStation/ProjectGasStation/Properties/Resources.Designer.cs

@@ -1,103 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан программой.
-//     Исполняемая версия:4.0.30319.42000
-//
-//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
-//     повторной генерации кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ProjectGasStation.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
-    /// </summary>
-    // Этот класс создан автоматически классом StronglyTypedResourceBuilder
-    // с помощью такого средства, как ResGen или Visual Studio.
-    // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen
-    // с параметром /str или перестройте свой проект VS.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ProjectGasStation.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
-        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _1828843 {
-            get {
-                object obj = ResourceManager.GetObject("1828843", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap _5610959 {
-            get {
-                object obj = ResourceManager.GetObject("5610959", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap edit_icon {
-            get {
-                object obj = ResourceManager.GetObject("edit-icon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap magical_mystical_landscape_wallpaper_purple_tones {
-            get {
-                object obj = ResourceManager.GetObject("magical-mystical-landscape-wallpaper-purple-tones", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Properties/Resources.resx

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="magical-mystical-landscape-wallpaper-purple-tones" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\magical-mystical-landscape-wallpaper-purple-tones.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="5610959" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\5610959.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="1828843" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1828843.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="edit-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\edit-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>

ProjectGasStation/ProjectGasStation/Repositories/IConnectionString.cs

@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IConnectionString
-{
-    public string ConnectionString { get; }
-}

ProjectGasStation/ProjectGasStation/Repositories/IContractorFuelRepository.cs

@@ -1,11 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IContractorFuelRepository
-{
-    IEnumerable<ContractorFuel> ReadContractorFuels(DateTime? dateFrom = null, DateTime? dateTo = null, int? contractorId = null,
-        int? fuelId = null);
-    void CreateContractorFuel(ContractorFuel contractorFuel);
-    void DeleteContractorFuel(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/IContractorRepository.cs

@@ -1,12 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IContractorRepository
-{
-    IEnumerable<Contractor> ReadContractors();
-    Contractor ReadContractorById(int id);
-    void CreateContractor(Contractor contractor);
-    void UpdateContractor(Contractor contractor);
-    void DeleteContractor(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/IFuelRepository.cs

@@ -1,12 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IFuelRepository
-{
-    IEnumerable<Fuel> ReadFuels();
-    Fuel ReadFuelById(int id);
-    void CreateFuel(Fuel fuel);
-    void UpdateFuel(Fuel fuel);
-    void DeleteFuel(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/IFuelSaleRepository.cs

@@ -1,11 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IFuelSaleRepository
-{
-    IEnumerable<FuelSale> ReadFuelSales(DateTime? dateFrom = null, DateTime? dateTo = null, int? gasStationId = null, 
-        int? fuelId = null, int? salespersonId = null, int? shiftId = null);
-    void CreateFuelSale(FuelSale fuel);
-    void DeleteFuelSale(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/ISalespersonRepository.cs

@@ -1,12 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface ISalespersonRepository
-{
-    IEnumerable<Salesperson> ReadSalespersons();
-    Salesperson ReadSalespersonById(int id);
-    void CreateSalesperson(Salesperson salesperson);
-    void UpdateSalesperson(Salesperson salesperson);
-    void DeleteSalesperson(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/IShiftRepository.cs

@@ -1,12 +0,0 @@
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories;
-
-public interface IShiftRepository
-{
-    IEnumerable<Shift> ReadShifts(DateTime? dateFrom = null, DateTime? dateTo = null);
-    Shift ReadShiftById(int id);
-    void CreateShift(Shift shift);
-    void UpdateShift(Shift shift);
-    void DeleteShift(int id);
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/ConnectionString.cs

@@ -1,6 +0,0 @@
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class ConnectionString : IConnectionString
-{
-    string IConnectionString.ConnectionString => "Host=localhost;Port=5432;Username=postgres;Password=030405;Database=OTP";
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorFuelRepository.cs

@@ -1,106 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-using System.Transactions;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class ContractorFuelRepository : IContractorFuelRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public ContractorFuelRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateContractorFuel(ContractorFuel contractorFuel)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}",
-        JsonConvert.SerializeObject(contractorFuel));
-        try
-        {
-            using var connection = new
-            NpgsqlConnection(_connectionString.ConnectionString);
-            connection.Open();
-            using var transaction = connection.BeginTransaction();
-            var queryInsert = @"
-                INSERT INTO ContractorFuel (ContractorId, Date)
-                VALUES (@ContractorId, @Date);
-                SELECT MAX(Id) FROM ContractorFuel";
-            var contractorFuelId =
-            connection.QueryFirst<int>(queryInsert, contractorFuel, transaction);
-            var querySubInsert = @"
-                INSERT INTO ContractorFuelFuel (ContractorFuelId, FuelId, Quantity)
-                VALUES (@ContractorFuelId, @FuelId, @Quantity)";
-            foreach (var elem in contractorFuel.ContractorFuelFuel)
-            {
-                connection.Execute(querySubInsert, new
-                {
-                    contractorFuelId,
-                    elem.FuelId,
-                    elem.Quantity
-                }, transaction);
-            }
-            transaction.Commit();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public void DeleteContractorFuel(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            connection.Open();
-            using var transaction = connection.BeginTransaction();
-            var queryDeleteSub = @"
-            DELETE FROM ContractorFuelFuel
-            WHERE ContractorFuelId = @id";
-            connection.Execute(queryDeleteSub, new { id }, transaction);
-
-            var queryDelete = @"
-            DELETE FROM ContractorFuel
-            WHERE Id = @id";
-            connection.Execute(queryDelete, new { id }, transaction);
-
-            transaction.Commit();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<ContractorFuel> ReadContractorFuels(DateTime? dateFrom = null, DateTime? dateTo = null, int? contractorId = null,
-        int? fuelId = null)
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM ContractorFuel";
-            var contractorFuels = connection.Query<ContractorFuel>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(contractorFuels));
-            return contractorFuels;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/ContractorRepository.cs

@@ -1,122 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class ContractorRepository : IContractorRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public ContractorRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateContractor(Contractor contractor)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(contractor));
-
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryInsert = @"
-                INSERT INTO Contractor (Name, Types)
-                VALUES (@Name, @Types)";
-            connection.Execute(queryInsert, contractor);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public void DeleteContractor(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryDelete = @"
-                DELETE FROM Contractor
-                WHERE Id=@id";
-            connection.Execute(queryDelete, new { id });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-
-    public Contractor ReadContractorById(int id)
-    {
-        _logger.LogInformation("Получение объекта по идентификатору");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"
-                SELECT * FROM Contractor
-                WHERE Id=@id";
-            var contractor = connection.QueryFirst<Contractor>(querySelect, new { id });
-            _logger.LogDebug("Найденный объект: {json}",
-                JsonConvert.SerializeObject(contractor));
-            return contractor;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при поиске объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<Contractor> ReadContractors()
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM Contractor";
-            var contractors = connection.Query<Contractor>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(contractors));
-            return contractors;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-
-    public void UpdateContractor(Contractor contractor)
-    {
-        _logger.LogInformation("Редактирование объекта");
-        _logger.LogDebug("Объект: {json}",
-            JsonConvert.SerializeObject(contractor));
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryUpdate = @"
-                UPDATE Contractor
-                SET
-                Name=@Name,
-                Types=@Types
-                WHERE Id=@Id";
-            connection.Execute(queryUpdate, contractor);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при редактировании объекта");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelRepository.cs

@@ -1,122 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class FuelRepository : IFuelRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public FuelRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateFuel(Fuel fuel)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(fuel));
-
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryInsert = @"
-            INSERT INTO Fuel (Type, Price)
-            VALUES (@Type, @Price)";
-            connection.Execute(queryInsert, fuel);
-        } 
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public void DeleteFuel(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryDelete = @"
-                DELETE FROM Fuel
-                WHERE Id=@id";
-            connection.Execute(queryDelete, new { id });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-
-    public Fuel ReadFuelById(int id)
-    {
-        _logger.LogInformation("Получение объекта по идентификатору");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"
-                SELECT * FROM Fuel
-                WHERE Id=@id";
-            var fuel = connection.QueryFirst<Fuel>(querySelect, new { id });
-            _logger.LogDebug("Найденный объект: {json}",
-                JsonConvert.SerializeObject(fuel));
-            return fuel;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при поиске объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<Fuel> ReadFuels()
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM Fuel";
-            var fuels = connection.Query<Fuel>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(fuels));
-            return fuels;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-
-    public void UpdateFuel(Fuel fuel)
-    {
-        _logger.LogInformation("Редактирование объекта");
-        _logger.LogDebug("Объект: {json}",
-            JsonConvert.SerializeObject(fuel));
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryUpdate = @"
-                UPDATE Fuel
-                SET
-                Type=@Type,
-                Price=@Price
-                WHERE Id=@Id";
-            connection.Execute(queryUpdate, fuel);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при редактировании объекта");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/FuelSaleRepository.cs

@@ -1,105 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class FuelSaleRepository : IFuelSaleRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public FuelSaleRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateFuelSale(FuelSale fuel)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}",
-        JsonConvert.SerializeObject(fuel));
-        try
-        {
-            using var connection = new
-            NpgsqlConnection(_connectionString.ConnectionString);
-            connection.Open();
-            using var transaction = connection.BeginTransaction();
-            var queryInsert = @"
-                INSERT INTO FuelSale (SalespersonId, ShiftId, SaleDate)
-                VALUES (@SalespersonId, @ShiftId, @SaleDate);
-                SELECT MAX(Id) FROM FuelSale";
-            var fuelSaleId =
-            connection.QueryFirst<int>(queryInsert, fuel, transaction);
-            var querySubInsert = @"
-                INSERT INTO FuelFuelSale (FuelSaleId, FuelId, Quantity)
-                VALUES (@FuelSaleId, @FuelId, @Quantity)";
-            foreach (var elem in fuel.FuelFuelSale)
-            {
-                connection.Execute(querySubInsert, new
-                {
-                    fuelSaleId,
-                    elem.FuelId,
-                    elem.Quantity
-                }, transaction);
-            }
-            transaction.Commit();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<FuelSale> ReadFuelSales(DateTime? dateFrom = null, DateTime? dateTo = null, int? gasStationId = null, int? fuelId = null, int? salespersonId = null, int? shiftId = null)
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM FuelSale";
-            var fuelSales = connection.Query<FuelSale>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(fuelSales));
-            return fuelSales;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-
-    public void DeleteFuelSale(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            connection.Open();
-            using var transaction = connection.BeginTransaction();
-
-            var queryDeleteSub = @"
-            DELETE FROM FuelFuelSale
-            WHERE FuelSaleId = @id";
-            connection.Execute(queryDeleteSub, new { id }, transaction);
-
-            var queryDelete = @"
-            DELETE FROM FuelSale
-            WHERE Id = @id";
-            connection.Execute(queryDelete, new { id }, transaction);
-
-            transaction.Commit();
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/SalespersonRepository.cs

@@ -1,122 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class SalespersonRepository : ISalespersonRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public SalespersonRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateSalesperson(Salesperson salesperson)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(salesperson));
-
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryInsert = @"
-                INSERT INTO Salesperson (FirstName, LastName)
-                VALUES (@FirstName, @LastName)";
-            connection.Execute(queryInsert, salesperson);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public void DeleteSalesperson(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryDelete = @"
-                DELETE FROM Salesperson
-                WHERE Id=@id";
-            connection.Execute(queryDelete, new { id });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-
-    public Salesperson ReadSalespersonById(int id)
-    {
-        _logger.LogInformation("Получение объекта по идентификатору");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"
-                SELECT * FROM Salesperson
-                WHERE Id=@id";
-            var salesperson = connection.QueryFirst<Salesperson>(querySelect, new { id });
-            _logger.LogDebug("Найденный объект: {json}",
-                JsonConvert.SerializeObject(salesperson));
-            return salesperson;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при поиске объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<Salesperson> ReadSalespersons()
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM Salesperson";
-            var salespersons = connection.Query<Salesperson>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(salespersons));
-            return salespersons;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-
-    public void UpdateSalesperson(Salesperson salesperson)
-    {
-        _logger.LogInformation("Редактирование объекта");
-        _logger.LogDebug("Объект: {json}",
-            JsonConvert.SerializeObject(salesperson));
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryUpdate = @"
-                UPDATE Salesperson
-                SET
-                FirstName=@FirstName,
-                LastName=@LastName
-                WHERE Id=@Id";
-            connection.Execute(queryUpdate, salesperson);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при редактировании объекта");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/Repositories/Implementations/ShiftRepository.cs

@@ -1,124 +0,0 @@
-using Dapper;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Npgsql;
-using ProjectGasStation.Entities;
-
-namespace ProjectGasStation.Repositories.Implementations;
-
-public class ShiftRepository : IShiftRepository
-{
-    private readonly IConnectionString _connectionString;
-    private readonly ILogger<FuelRepository> _logger;
-
-    public ShiftRepository(IConnectionString connectionString, ILogger<FuelRepository> logger)
-    {
-        _connectionString = connectionString;
-        _logger = logger;
-    }
-
-    public void CreateShift(Shift shift)
-    {
-        _logger.LogInformation("Добавление объекта");
-        _logger.LogDebug("Объект: {json}", JsonConvert.SerializeObject(shift));
-
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryInsert = @"
-                INSERT INTO Shift (StartTime, EndTime, Date, Type)
-                VALUES (@StartTime, @EndTime, @Date, @Type)";
-            connection.Execute(queryInsert, shift);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при добавлении объекта");
-            throw;
-        }
-    }
-
-    public void DeleteShift(int id)
-    {
-        _logger.LogInformation("Удаление объекта");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryDelete = @"
-                DELETE FROM Shift
-                WHERE Id=@id";
-            connection.Execute(queryDelete, new { id });
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при удалении объекта");
-            throw;
-        }
-    }
-
-    public Shift ReadShiftById(int id)
-    {
-        _logger.LogInformation("Получение объекта по идентификатору");
-        _logger.LogDebug("Объект: {id}", id);
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"
-                SELECT * FROM Shift
-                WHERE Id=@id";
-            var shift = connection.QueryFirst<Shift>(querySelect, new { id });
-            _logger.LogDebug("Найденный объект: {json}",
-                JsonConvert.SerializeObject(shift));
-            return shift;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при поиске объекта");
-            throw;
-        }
-    }
-
-    public IEnumerable<Shift> ReadShifts(DateTime? dateFrom = null, DateTime? dateTo = null)
-    {
-        _logger.LogInformation("Получение всех объектов");
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = "SELECT * FROM Shift";
-            var shifts = connection.Query<Shift>(querySelect);
-            _logger.LogDebug("Полученные объекты: {json}",
-            JsonConvert.SerializeObject(shifts));
-            return shifts;
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
-            throw;
-        }
-    }
-
-    public void UpdateShift(Shift shift)
-    {
-        _logger.LogInformation("Редактирование объекта");
-        _logger.LogDebug("Объект: {json}",
-            JsonConvert.SerializeObject(shift));
-        try
-        {
-            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var queryUpdate = @"
-                UPDATE Shift
-                SET
-                StartTime=@StartTime,
-                EndTime=@EndTime,
-                Date=@Date,
-                Type=@Type
-                WHERE Id=@Id";
-            connection.Execute(queryUpdate, shift);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "Ошибка при редактировании объекта");
-            throw;
-        }
-    }
-}

ProjectGasStation/ProjectGasStation/appsettings.json

@@ -1,15 +0,0 @@
-{
-  "Serilog": {
-    "Using": [ "Serilog.Sinks.File" ],
-    "MinimumLevel": "Debug",
-    "WriteTo": [
-      {
-        "Name": "File",
-        "Args": {
-          "path": "Logs/gas_log.txt",
-          "rollingInterval": "Day"
-        }
-      }
-    ]
-  }
-}