конец

ProjectGarage/FormGarage.Designer.cs

@@ -31,14 +31,14 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormGarage));
             menuStripGarage = new MenuStrip();
             справочникиToolStripMenuItem = new ToolStripMenuItem();
-            операцииToolStripMenuItem = new ToolStripMenuItem();
-            отчетыToolStripMenuItem = new ToolStripMenuItem();
             водителиToolStripMenuItem = new ToolStripMenuItem();
             фурыToolStripMenuItem = new ToolStripMenuItem();
             маршрутыToolStripMenuItem = new ToolStripMenuItem();
             топливоToolStripMenuItem = new ToolStripMenuItem();
+            операцииToolStripMenuItem = new ToolStripMenuItem();
             отправкаТопливаToolStripMenuItem = new ToolStripMenuItem();
             получениеТопливаToolStripMenuItem = new ToolStripMenuItem();
+            отчетыToolStripMenuItem = new ToolStripMenuItem();
             menuStripGarage.SuspendLayout();
             SuspendLayout();
             // 
@@ -59,6 +59,34 @@
             справочникиToolStripMenuItem.Size = new Size(117, 24);
             справочникиToolStripMenuItem.Text = "Справочники";
             // 
+            // водителиToolStripMenuItem
+            // 
+            водителиToolStripMenuItem.Name = "водителиToolStripMenuItem";
+            водителиToolStripMenuItem.Size = new Size(224, 26);
+            водителиToolStripMenuItem.Text = "Водители";
+            водителиToolStripMenuItem.Click += DriversToolStripMenuItem_Click;
+            // 
+            // фурыToolStripMenuItem
+            // 
+            фурыToolStripMenuItem.Name = "фурыToolStripMenuItem";
+            фурыToolStripMenuItem.Size = new Size(224, 26);
+            фурыToolStripMenuItem.Text = "Фуры";
+            фурыToolStripMenuItem.Click += TrucksToolStripMenuItem_Click;
+            // 
+            // маршрутыToolStripMenuItem
+            // 
+            маршрутыToolStripMenuItem.Name = "маршрутыToolStripMenuItem";
+            маршрутыToolStripMenuItem.Size = new Size(224, 26);
+            маршрутыToolStripMenuItem.Text = "Маршруты";
+            маршрутыToolStripMenuItem.Click += RoutesToolStripMenuItem_Click;
+            // 
+            // топливоToolStripMenuItem
+            // 
+            топливоToolStripMenuItem.Name = "топливоToolStripMenuItem";
+            топливоToolStripMenuItem.Size = new Size(224, 26);
+            топливоToolStripMenuItem.Text = "Топливо";
+            топливоToolStripMenuItem.Click += FuelsToolStripMenuItem_Click;
+            // 
             // операцииToolStripMenuItem
             // 
             операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { отправкаТопливаToolStripMenuItem, получениеТопливаToolStripMenuItem });
@@ -66,47 +94,25 @@
             операцииToolStripMenuItem.Size = new Size(95, 24);
             операцииToolStripMenuItem.Text = "Операции";
             // 
-            // отчетыToolStripMenuItem
-            // 
-            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
-            отчетыToolStripMenuItem.Size = new Size(73, 24);
-            отчетыToolStripMenuItem.Text = "Отчеты";
-            // 
-            // водителиToolStripMenuItem
-            // 
-            водителиToolStripMenuItem.Name = "водителиToolStripMenuItem";
-            водителиToolStripMenuItem.Size = new Size(224, 26);
-            водителиToolStripMenuItem.Text = "Водители";
-            // 
-            // фурыToolStripMenuItem
-            // 
-            фурыToolStripMenuItem.Name = "фурыToolStripMenuItem";
-            фурыToolStripMenuItem.Size = new Size(224, 26);
-            фурыToolStripMenuItem.Text = "Фуры";
-            // 
-            // маршрутыToolStripMenuItem
-            // 
-            маршрутыToolStripMenuItem.Name = "маршрутыToolStripMenuItem";
-            маршрутыToolStripMenuItem.Size = new Size(224, 26);
-            маршрутыToolStripMenuItem.Text = "Маршруты";
-            // 
-            // топливоToolStripMenuItem
-            // 
-            топливоToolStripMenuItem.Name = "топливоToolStripMenuItem";
-            топливоToolStripMenuItem.Size = new Size(224, 26);
-            топливоToolStripMenuItem.Text = "Топливо";
-            // 
             // отправкаТопливаToolStripMenuItem
             // 
             отправкаТопливаToolStripMenuItem.Name = "отправкаТопливаToolStripMenuItem";
             отправкаТопливаToolStripMenuItem.Size = new Size(230, 26);
             отправкаТопливаToolStripMenuItem.Text = "Отправка топлива";
+            отправкаТопливаToolStripMenuItem.Click += TransportationToolStripMenuItem_Click;
             // 
             // получениеТопливаToolStripMenuItem
             // 
             получениеТопливаToolStripMenuItem.Name = "получениеТопливаToolStripMenuItem";
             получениеТопливаToolStripMenuItem.Size = new Size(230, 26);
             получениеТопливаToolStripMenuItem.Text = "Получение топлива";
+            получениеТопливаToolStripMenuItem.Click += ReplenishmentToolStripMenuItem_Click;
+            // 
+            // отчетыToolStripMenuItem
+            // 
+            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            отчетыToolStripMenuItem.Size = new Size(73, 24);
+            отчетыToolStripMenuItem.Text = "Отчеты";
             // 
             // FormGarage
             // 

ProjectGarage/FormGarage.cs

@@ -1,10 +1,95 @@
+using ProjectGarage.Forms;
+using System.ComponentModel;
+using Unity;
+
 namespace ProjectGarage
 {
     public partial class FormGarage : Form
     {
-        public FormGarage()
+        private readonly IUnityContainer _container;
+
+        public FormGarage(IUnityContainer container)
         {
             InitializeComponent();
+            _container = container ?? throw new ArgumentNullException(nameof(container));
+        }
+
+        private void DriversToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormDrivers>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void TrucksToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormTrucks>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void RoutesToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormRoutes>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void FuelsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormFuels>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void TransportationToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormTransportations>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ReplenishmentToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormReplenishments>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
     }
 }

ProjectGarage/Forms/FormDrivers.Designer.cs

@@ -108,6 +108,7 @@
             Controls.Add(panelFormDriversButtons);
             Name = "FormDrivers";
             Text = "FormDrivers";
+            Load += FormDrivers_Load;
             Click += FormDrivers_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewDrivers).EndInit();
             panelFormDriversButtons.ResumeLayout(false);

ProjectGarage/Forms/FormFuel.cs

@@ -46,7 +46,6 @@ namespace ProjectGarage.Forms
                     MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
                 }
-
             }
         }
 
@@ -58,7 +57,6 @@ namespace ProjectGarage.Forms
             {
                 checkedListBoxFuel.Items.Add(elem);
             }
-
         }
 
         private void ButtonFuelSave_Click(object sender, EventArgs e)
@@ -99,6 +97,5 @@ namespace ProjectGarage.Forms
             }
             return Fuel.CreateFuel(id, textBoxFuelName.Text, fuelType, Convert.ToInt32(numericUpDownFuelPrice.Value));
         }
-
     }
 }

ProjectGarage/Forms/FormReplenishment.Designer.cs

@@ -0,0 +1,148 @@
+namespace ProjectGarage.Forms
+{
+    partial class FormReplenishment
+    {
+        /// <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()
+        {
+            comboBoxReplenishmentDriver = new ComboBox();
+            labelReplenishmentDriver = new Label();
+            groupBoxReplenishment = new GroupBox();
+            dataGridViewReplenishment = new DataGridView();
+            ColumnFuel = new DataGridViewComboBoxColumn();
+            ColumnAmount = new DataGridViewTextBoxColumn();
+            ButtonReplenishmentSave = new Button();
+            ButtonReplenishmentCancel = new Button();
+            groupBoxReplenishment.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridViewReplenishment).BeginInit();
+            SuspendLayout();
+            // 
+            // comboBoxReplenishmentDriver
+            // 
+            comboBoxReplenishmentDriver.DropDownStyle = ComboBoxStyle.DropDownList;
+            comboBoxReplenishmentDriver.FormattingEnabled = true;
+            comboBoxReplenishmentDriver.Location = new Point(141, 16);
+            comboBoxReplenishmentDriver.Name = "comboBoxReplenishmentDriver";
+            comboBoxReplenishmentDriver.Size = new Size(151, 28);
+            comboBoxReplenishmentDriver.TabIndex = 9;
+            // 
+            // labelReplenishmentDriver
+            // 
+            labelReplenishmentDriver.AutoSize = true;
+            labelReplenishmentDriver.Location = new Point(21, 19);
+            labelReplenishmentDriver.Name = "labelReplenishmentDriver";
+            labelReplenishmentDriver.Size = new Size(74, 20);
+            labelReplenishmentDriver.TabIndex = 8;
+            labelReplenishmentDriver.Text = "Водитель";
+            // 
+            // groupBoxReplenishment
+            // 
+            groupBoxReplenishment.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+            groupBoxReplenishment.Controls.Add(dataGridViewReplenishment);
+            groupBoxReplenishment.Location = new Point(21, 66);
+            groupBoxReplenishment.Name = "groupBoxReplenishment";
+            groupBoxReplenishment.Size = new Size(271, 288);
+            groupBoxReplenishment.TabIndex = 10;
+            groupBoxReplenishment.TabStop = false;
+            groupBoxReplenishment.Text = "Пополнение топлива";
+            // 
+            // dataGridViewReplenishment
+            // 
+            dataGridViewReplenishment.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            dataGridViewReplenishment.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridViewReplenishment.Columns.AddRange(new DataGridViewColumn[] { ColumnFuel, ColumnAmount });
+            dataGridViewReplenishment.Dock = DockStyle.Fill;
+            dataGridViewReplenishment.Location = new Point(3, 23);
+            dataGridViewReplenishment.Name = "dataGridViewReplenishment";
+            dataGridViewReplenishment.RowHeadersVisible = false;
+            dataGridViewReplenishment.RowHeadersWidth = 51;
+            dataGridViewReplenishment.Size = new Size(265, 262);
+            dataGridViewReplenishment.TabIndex = 0;
+            // 
+            // ColumnFuel
+            // 
+            ColumnFuel.HeaderText = "Топливо";
+            ColumnFuel.MinimumWidth = 6;
+            ColumnFuel.Name = "ColumnFuel";
+            // 
+            // ColumnAmount
+            // 
+            ColumnAmount.HeaderText = "Кол-во";
+            ColumnAmount.MinimumWidth = 6;
+            ColumnAmount.Name = "ColumnAmount";
+            // 
+            // ButtonReplenishmentSave
+            // 
+            ButtonReplenishmentSave.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            ButtonReplenishmentSave.Location = new Point(21, 360);
+            ButtonReplenishmentSave.Name = "ButtonReplenishmentSave";
+            ButtonReplenishmentSave.Size = new Size(134, 29);
+            ButtonReplenishmentSave.TabIndex = 11;
+            ButtonReplenishmentSave.Text = "Сохранить";
+            ButtonReplenishmentSave.UseVisualStyleBackColor = true;
+            ButtonReplenishmentSave.Click += ButtonReplenishmentSave_Click;
+            // 
+            // ButtonReplenishmentCancel
+            // 
+            ButtonReplenishmentCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            ButtonReplenishmentCancel.Location = new Point(161, 360);
+            ButtonReplenishmentCancel.Name = "ButtonReplenishmentCancel";
+            ButtonReplenishmentCancel.Size = new Size(131, 29);
+            ButtonReplenishmentCancel.TabIndex = 13;
+            ButtonReplenishmentCancel.Text = "Отмена";
+            ButtonReplenishmentCancel.UseVisualStyleBackColor = true;
+            ButtonReplenishmentCancel.Click += ButtonReplenishmentCancel_Click;
+            // 
+            // FormReplenishment
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(315, 401);
+            Controls.Add(ButtonReplenishmentCancel);
+            Controls.Add(ButtonReplenishmentSave);
+            Controls.Add(groupBoxReplenishment);
+            Controls.Add(comboBoxReplenishmentDriver);
+            Controls.Add(labelReplenishmentDriver);
+            Name = "FormReplenishment";
+            Text = "FormReplenishment";
+            groupBoxReplenishment.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)dataGridViewReplenishment).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private ComboBox comboBoxReplenishmentDriver;
+        private Label labelReplenishmentDriver;
+        private GroupBox groupBoxReplenishment;
+        private DataGridView dataGridViewReplenishment;
+        private Button ButtonReplenishmentSave;
+        private Button ButtonReplenishmentCancel;
+        private DataGridViewComboBoxColumn ColumnFuel;
+        private DataGridViewTextBoxColumn ColumnAmount;
+    }
+}

ProjectGarage/Forms/FormReplenishment.cs

@@ -0,0 +1,72 @@
+using ProjectGarage.Entities;
+using ProjectGarage.Repositories;
+using ProjectGarage.Repositories.Implementations;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectGarage.Forms
+{
+    public partial class FormReplenishment : Form
+    {
+        private readonly IReplenishmentRepository _replenishmentRepository;
+
+
+        public FormReplenishment(IReplenishmentRepository replenishmentRepository,
+            IDriverRepository driverRepository, IFuelRepository fuelRepository)
+        {
+            InitializeComponent();
+            _replenishmentRepository = replenishmentRepository ?? 
+                throw new ArgumentNullException(nameof(replenishmentRepository));
+            comboBoxReplenishmentDriver.DataSource = driverRepository.ReadDrivers();
+            comboBoxReplenishmentDriver.DisplayMember = "First_name";
+            comboBoxReplenishmentDriver.ValueMember = "Id";
+            ColumnFuel.DataSource = fuelRepository.ReadFuels();
+            ColumnFuel.DisplayMember = "Name";
+            ColumnFuel.ValueMember = "Id";
+        }
+
+        private void ButtonReplenishmentSave_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (dataGridViewReplenishment.RowCount < 1 ||
+                comboBoxReplenishmentDriver.SelectedIndex < 0)
+                {
+                    throw new Exception("Имеются незаполненные поля");
+                }
+                _replenishmentRepository.CreateFuelReplenishment(FuelReplenishment.CreateOpeartion(0,
+                        (int)comboBoxReplenishmentDriver.SelectedValue!, CreateListFuelFuelReplenishmentsFromDataGrid()));
+                Close();
+            }
+            catch(Exception ex) 
+            {
+                MessageBox.Show(ex.Message, "Ошибка при сохранении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonReplenishmentCancel_Click(object sender, EventArgs e) => Close();
+
+        private List<FuelFuelReplenishment> CreateListFuelFuelReplenishmentsFromDataGrid()
+        {
+            var list = new List<FuelFuelReplenishment>();
+            foreach (DataGridViewRow row in dataGridViewReplenishment.Rows)
+            {
+                if (row.Cells["ColumnFeed"].Value == null ||
+                row.Cells["ColumnCount"].Value == null)
+                {
+                    continue;
+                }
+                list.Add(FuelFuelReplenishment.CreateElement(0, Convert.ToInt32(row.Cells["ColumnFeed"].Value),
+                    Convert.ToInt32(row.Cells["ColumnCount"].Value)));
+            }
+            return list;
+        }
+    }
+}

ProjectGarage/Forms/FormReplenishment.resx

@@ -0,0 +1,132 @@
+<?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="ColumnAmount.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="ColumnAmount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

ProjectGarage/Forms/FormReplenishments.Designer.cs

@@ -0,0 +1,109 @@
+namespace ProjectGarage.Forms
+{
+    partial class FormReplenishments
+    {
+        /// <summary>
+        /// Обязательная переменная конструктора.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Освободить все используемые ресурсы.
+        /// </summary>
+        /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Код, автоматически созданный конструктором компонентов
+
+        /// <summary>
+        /// Требуемый метод для поддержки конструктора — не изменяйте 
+        /// содержимое этого метода с помощью редактора кода.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            buttonAddReplenishment = new Button();
+            buttonDeleteReplenishment = new Button();
+            panelFormReplenishmentssButtons = new Panel();
+            dataGridViewReplenishments = new DataGridView();
+            panelFormReplenishmentssButtons.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dataGridViewReplenishments).BeginInit();
+            SuspendLayout();
+            // 
+            // buttonAddReplenishment
+            // 
+            buttonAddReplenishment.BackgroundImage = Properties.Resources.плюсик;
+            buttonAddReplenishment.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonAddReplenishment.Location = new Point(35, 23);
+            buttonAddReplenishment.Name = "buttonAddReplenishment";
+            buttonAddReplenishment.Size = new Size(94, 75);
+            buttonAddReplenishment.TabIndex = 0;
+            buttonAddReplenishment.UseVisualStyleBackColor = true;
+            buttonAddReplenishment.Click += ButtonAddReplenishment_Click;
+            // 
+            // buttonDeleteReplenishment
+            // 
+            buttonDeleteReplenishment.BackgroundImage = Properties.Resources.минусик;
+            buttonDeleteReplenishment.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonDeleteReplenishment.Location = new Point(35, 115);
+            buttonDeleteReplenishment.Name = "buttonDeleteReplenishment";
+            buttonDeleteReplenishment.Size = new Size(94, 78);
+            buttonDeleteReplenishment.TabIndex = 1;
+            buttonDeleteReplenishment.UseVisualStyleBackColor = true;
+            buttonDeleteReplenishment.Click += ButtonDeleteReplenishment_Click;
+            // 
+            // panelFormReplenishmentssButtons
+            // 
+            panelFormReplenishmentssButtons.Controls.Add(buttonDeleteReplenishment);
+            panelFormReplenishmentssButtons.Controls.Add(buttonAddReplenishment);
+            panelFormReplenishmentssButtons.Dock = DockStyle.Right;
+            panelFormReplenishmentssButtons.Location = new Point(641, 0);
+            panelFormReplenishmentssButtons.Name = "panelFormReplenishmentssButtons";
+            panelFormReplenishmentssButtons.Size = new Size(161, 406);
+            panelFormReplenishmentssButtons.TabIndex = 6;
+            // 
+            // dataGridViewReplenishments
+            // 
+            dataGridViewReplenishments.AllowUserToAddRows = false;
+            dataGridViewReplenishments.AllowUserToDeleteRows = false;
+            dataGridViewReplenishments.AllowUserToResizeColumns = false;
+            dataGridViewReplenishments.AllowUserToResizeRows = false;
+            dataGridViewReplenishments.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            dataGridViewReplenishments.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridViewReplenishments.Dock = DockStyle.Fill;
+            dataGridViewReplenishments.Location = new Point(0, 0);
+            dataGridViewReplenishments.Name = "dataGridViewReplenishments";
+            dataGridViewReplenishments.ReadOnly = true;
+            dataGridViewReplenishments.RowHeadersVisible = false;
+            dataGridViewReplenishments.RowHeadersWidth = 51;
+            dataGridViewReplenishments.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            dataGridViewReplenishments.Size = new Size(641, 406);
+            dataGridViewReplenishments.TabIndex = 7;
+            // 
+            // FormReplenishments
+            // 
+            ClientSize = new Size(802, 406);
+            Controls.Add(dataGridViewReplenishments);
+            Controls.Add(panelFormReplenishmentssButtons);
+            Name = "FormReplenishments";
+            Text = "Пополнения";
+            Load += FormReplenishments_Load;
+            panelFormReplenishmentssButtons.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)dataGridViewReplenishments).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private Button buttonAddReplenishment;
+        private Button buttonDeleteReplenishment;
+        private Panel panelFormReplenishmentssButtons;
+        private DataGridView dataGridViewReplenishments;
+    }
+}

ProjectGarage/Forms/FormReplenishments.cs

@@ -0,0 +1,96 @@
+using ProjectGarage.Repositories;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity;
+
+namespace ProjectGarage.Forms
+{
+    public partial class FormReplenishments : Form
+    {
+        private readonly IUnityContainer _container;
+        private readonly IReplenishmentRepository _replenishmentRepository;
+
+        public FormReplenishments(IUnityContainer container, IReplenishmentRepository replenishmentRepository)
+        {
+            InitializeComponent();
+            _container = container ??
+            throw new ArgumentNullException(nameof(container));
+            _replenishmentRepository = replenishmentRepository ??
+                throw new ArgumentNullException(nameof(replenishmentRepository));
+        }
+        private void FormReplenishments_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                LoadList();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при загрузке",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        public FormReplenishments(IContainer container)
+        {
+            container.Add(this);
+
+            InitializeComponent();
+        }
+
+        private void ButtonAddReplenishment_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormReplenishment>().ShowDialog();
+                LoadList();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void ButtonDeleteReplenishment_Click(object sender, EventArgs e)
+        {
+            if (!TryGetIdentifierFromSelectedRow(out var findId))
+            {
+                return;
+            }
+            if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes)
+            {
+                return;
+            }
+            try
+            {
+                _replenishmentRepository.DeleteFuelReplenishment(findId);
+                LoadList();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при удалении",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+        private void LoadList() => dataGridViewReplenishments.DataSource = _replenishmentRepository.ReadFuelReplenishment();
+        
+        private bool TryGetIdentifierFromSelectedRow(out int id)
+        {
+            id = 0;
+            if (dataGridViewReplenishments.SelectedRows.Count < 1)
+            {
+                MessageBox.Show("Нет выбранной записи", "Ошибка",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return false;
+            }
+            id =
+            Convert.ToInt32(dataGridViewReplenishments.SelectedRows[0].Cells["Id"].Value);
+            return true;
+        }
+    }
+}

ProjectGarage/Forms/FormReplenishments.resx

@@ -0,0 +1,120 @@
+<?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>

ProjectGarage/Forms/FormRoutes.Designer.cs

@@ -108,6 +108,7 @@
             Controls.Add(panelFormRoutesButtons);
             Name = "FormRoutes";
             Text = "FormRoutes";
+            Load += FormRoutes_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).EndInit();
             panelFormRoutesButtons.ResumeLayout(false);
             ResumeLayout(false);

ProjectGarage/Forms/FormRoutes.cs

@@ -26,6 +26,20 @@ namespace ProjectGarage.Forms
             _routeRepository = routeRepository ?? throw new ArgumentNullException(nameof(routeRepository));
         }
         private void ButtonAddRoute_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormRoute>().ShowDialog();
+                LoadList();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка при добавлении",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+
+        }
+        private void FormRoutes_Load(object sender, EventArgs e)
         {
             try
             {
@@ -38,6 +52,7 @@ namespace ProjectGarage.Forms
             }
         }
 
+
         private void ButtonUpdateRoute_Click(object sender, EventArgs e)
         {
             try

ProjectGarage/Forms/FormTransportations.Designer.cs

@@ -82,6 +82,7 @@
             Controls.Add(panelFormTransportationsButtons);
             Name = "FormTransportations";
             Text = "FormTransportations";
+            Load += FormTransportations_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewTransportations).EndInit();
             panelFormTransportationsButtons.ResumeLayout(false);
             ResumeLayout(false);

ProjectGarage/Forms/FormTransportations.cs

@@ -43,7 +43,7 @@ namespace ProjectGarage.Forms
         {
             try
             {
-                _container.Resolve<FormTransportations>().ShowDialog();
+                _container.Resolve<FormTransportation>().ShowDialog();
                 LoadList();
             }
             catch (Exception ex)

ProjectGarage/Program.cs

@@ -27,8 +27,7 @@ namespace ProjectGarage
             container.RegisterType<IRouteRepository, RouteRepository>();
             container.RegisterType<IDriverRepository, DriverRepository>();
             container.RegisterType<ITransportationRepository, TransportationRepository>();
-            container.RegisterType<IFuelReplishmentRepository, FuelReplishmentRepository>();
-
+            container.RegisterType<IReplenishmentRepository, FuelReplishmentRepository>();
 
             return container;
         }

ProjectGarage/Repositories/IReplenishmentRepository.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace ProjectGarage.Repositories;
 
-public interface IFuelReplishmentRepository
+public interface IReplenishmentRepository
 {
     IEnumerable<FuelReplenishment> ReadFuelReplenishment(DateTime? dateForm = null, DateTime? dateTo = null, int? fuelId = null,
         int? driverId = null, int? routeId = null);

ProjectGarage/Repositories/Implementations/DriverRepository.cs

@@ -17,7 +17,7 @@ public class DriverRepository : IDriverRepository
     {
     }
 
-    public Driver ReadDriverByID(int id) => Driver.CreateDriver(0, string.Empty, string.Empty, string.Empty);
+    public Driver ReadDriverByID(int id) => Driver.CreateDriver(0, string.Empty, string.Empty, string.Empty, 0);
 
     public IEnumerable<Driver> ReadDrivers() => [];
 

ProjectGarage/Repositories/Implementations/ReplenishmentRepository.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace ProjectGarage.Repositories.Implementations;
 
-public class FuelReplishmentRepository : IFuelReplishmentRepository
+public class FuelReplishmentRepository : IReplenishmentRepository
 {
     public void CreateFuelReplenishment(FuelReplenishment fuelReplenishment)
     {