FuelAndLubricants/FuelAndLubricants/FormFuelAndLubricants.Designer.cs

@@ -30,14 +30,14 @@
         {
             menuStrip = new MenuStrip();
             справочникиToolStripMenuItem = new ToolStripMenuItem();
-            CarsToolStripMenuItem = new ToolStripMenuItem();
-            DriversToolStripMenuItem = new ToolStripMenuItem();
-            FuelToolStripMenuItem = new ToolStripMenuItem();
-            RoutesToolStripMenuItem = new ToolStripMenuItem();
             операцииToolStripMenuItem = new ToolStripMenuItem();
-            RefillToolStripMenuItem = new ToolStripMenuItem();
-            TripToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
+            машиныToolStripMenuItem = new ToolStripMenuItem();
+            водителиToolStripMenuItem = new ToolStripMenuItem();
+            топливоToolStripMenuItem = new ToolStripMenuItem();
+            маршрутыToolStripMenuItem = new ToolStripMenuItem();
+            заправкаToolStripMenuItem = new ToolStripMenuItem();
+            поездкаToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             SuspendLayout();
             // 
@@ -52,66 +52,60 @@
             // 
             // справочникиToolStripMenuItem
             // 
-            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { CarsToolStripMenuItem, DriversToolStripMenuItem, FuelToolStripMenuItem, RoutesToolStripMenuItem });
+            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { машиныToolStripMenuItem, водителиToolStripMenuItem, топливоToolStripMenuItem, маршрутыToolStripMenuItem });
             справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
             справочникиToolStripMenuItem.Size = new Size(94, 20);
             справочникиToolStripMenuItem.Text = "Справочники";
             // 
-            // CarsToolStripMenuItem
-            // 
-            CarsToolStripMenuItem.Name = "CarsToolStripMenuItem";
-            CarsToolStripMenuItem.Size = new Size(180, 22);
-            CarsToolStripMenuItem.Text = "Машины";
-            CarsToolStripMenuItem.Click += CarsToolStripMenuItem_Click;
-            // 
-            // DriversToolStripMenuItem
-            // 
-            DriversToolStripMenuItem.Name = "DriversToolStripMenuItem";
-            DriversToolStripMenuItem.Size = new Size(180, 22);
-            DriversToolStripMenuItem.Text = "Водители";
-            DriversToolStripMenuItem.Click += DriversToolStripMenuItem_Click;
-            // 
-            // FuelToolStripMenuItem
-            // 
-            FuelToolStripMenuItem.Name = "FuelToolStripMenuItem";
-            FuelToolStripMenuItem.Size = new Size(180, 22);
-            FuelToolStripMenuItem.Text = "Топливо";
-            FuelToolStripMenuItem.Click += FuelToolStripMenuItem_Click;
-            // 
-            // RoutesToolStripMenuItem
-            // 
-            RoutesToolStripMenuItem.Name = "RoutesToolStripMenuItem";
-            RoutesToolStripMenuItem.Size = new Size(180, 22);
-            RoutesToolStripMenuItem.Text = "Маршруты";
-            RoutesToolStripMenuItem.Click += RoutesToolStripMenuItem_Click;
-            // 
             // операцииToolStripMenuItem
             // 
-            операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { RefillToolStripMenuItem, TripToolStripMenuItem });
+            операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { заправкаToolStripMenuItem, поездкаToolStripMenuItem });
             операцииToolStripMenuItem.Name = "операцииToolStripMenuItem";
             операцииToolStripMenuItem.Size = new Size(75, 20);
             операцииToolStripMenuItem.Text = "Операции";
             // 
-            // RefillToolStripMenuItem
-            // 
-            RefillToolStripMenuItem.Name = "RefillToolStripMenuItem";
-            RefillToolStripMenuItem.Size = new Size(180, 22);
-            RefillToolStripMenuItem.Text = "Заправка";
-            RefillToolStripMenuItem.Click += RefillToolStripMenuItem_Click;
-            // 
-            // TripToolStripMenuItem
-            // 
-            TripToolStripMenuItem.Name = "TripToolStripMenuItem";
-            TripToolStripMenuItem.Size = new Size(180, 22);
-            TripToolStripMenuItem.Text = "Поездка";
-            TripToolStripMenuItem.Click += TripToolStripMenuItem_Click;
-            // 
             // отчетыToolStripMenuItem
             // 
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(60, 20);
             отчетыToolStripMenuItem.Text = "Отчеты";
             // 
+            // машиныToolStripMenuItem
+            // 
+            машиныToolStripMenuItem.Name = "машиныToolStripMenuItem";
+            машиныToolStripMenuItem.Size = new Size(180, 22);
+            машиныToolStripMenuItem.Text = "Машины";
+            // 
+            // водителиToolStripMenuItem
+            // 
+            водителиToolStripMenuItem.Name = "водителиToolStripMenuItem";
+            водителиToolStripMenuItem.Size = new Size(180, 22);
+            водителиToolStripMenuItem.Text = "Водители";
+            // 
+            // топливоToolStripMenuItem
+            // 
+            топливоToolStripMenuItem.Name = "топливоToolStripMenuItem";
+            топливоToolStripMenuItem.Size = new Size(180, 22);
+            топливоToolStripMenuItem.Text = "Топливо";
+            // 
+            // маршрутыToolStripMenuItem
+            // 
+            маршрутыToolStripMenuItem.Name = "маршрутыToolStripMenuItem";
+            маршрутыToolStripMenuItem.Size = new Size(180, 22);
+            маршрутыToolStripMenuItem.Text = "Маршруты";
+            // 
+            // заправкаToolStripMenuItem
+            // 
+            заправкаToolStripMenuItem.Name = "заправкаToolStripMenuItem";
+            заправкаToolStripMenuItem.Size = new Size(180, 22);
+            заправкаToolStripMenuItem.Text = "Заправка";
+            // 
+            // поездкаToolStripMenuItem
+            // 
+            поездкаToolStripMenuItem.Name = "поездкаToolStripMenuItem";
+            поездкаToolStripMenuItem.Size = new Size(180, 22);
+            поездкаToolStripMenuItem.Text = "Поездка";
+            // 
             // FormFuelAndLubricants
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -134,13 +128,13 @@
 
         private MenuStrip menuStrip;
         private ToolStripMenuItem справочникиToolStripMenuItem;
-        private ToolStripMenuItem CarsToolStripMenuItem;
-        private ToolStripMenuItem DriversToolStripMenuItem;
-        private ToolStripMenuItem FuelToolStripMenuItem;
-        private ToolStripMenuItem RoutesToolStripMenuItem;
+        private ToolStripMenuItem машиныToolStripMenuItem;
+        private ToolStripMenuItem водителиToolStripMenuItem;
+        private ToolStripMenuItem топливоToolStripMenuItem;
+        private ToolStripMenuItem маршрутыToolStripMenuItem;
         private ToolStripMenuItem операцииToolStripMenuItem;
-        private ToolStripMenuItem RefillToolStripMenuItem;
-        private ToolStripMenuItem TripToolStripMenuItem;
+        private ToolStripMenuItem заправкаToolStripMenuItem;
+        private ToolStripMenuItem поездкаToolStripMenuItem;
         private ToolStripMenuItem отчетыToolStripMenuItem;
     }
 }

FuelAndLubricants/FuelAndLubricants/FormFuelAndLubricants.cs

@@ -1,102 +1,10 @@
-using FuelAndLubricants.Forms;
-using Unity;
-
 namespace FuelAndLubricants
 {
     public partial class FormFuelAndLubricants : Form
     {
-        private readonly IUnityContainer _container;
-
-        public FormFuelAndLubricants(IUnityContainer container)
+        public FormFuelAndLubricants()
         {
             InitializeComponent();
-            _container = container ?? 
-                throw new ArgumentNullException(nameof(container));
-
-        }
-
-        private void CarsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormCars>().ShowDialog();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-        }
-
-        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 FuelToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormFuels>().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 RefillToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormRefills>().ShowDialog();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-        }
-
-        private void TripToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            try
-            {
-                _container.Resolve<FormTrips>().ShowDialog();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
         }
     }
 }

FuelAndLubricants/FuelAndLubricants/Forms/FormTrips.Designer.cs

@@ -1,97 +0,0 @@
-namespace FuelAndLubricants.Forms
-{
-    partial class FormTrips
-    {
-        /// <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();
-            buttonAdd = new Button();
-            dataGridView = new DataGridView();
-            panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // panel1
-            // 
-            panel1.Controls.Add(buttonAdd);
-            panel1.Dock = DockStyle.Right;
-            panel1.Location = new Point(689, 0);
-            panel1.Name = "panel1";
-            panel1.Size = new Size(98, 291);
-            panel1.TabIndex = 0;
-            // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources.Добавить;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(11, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(75, 75);
-            buttonAdd.TabIndex = 5;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += ButtonAdd_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.AllowUserToAddRows = false;
-            dataGridView.AllowUserToDeleteRows = false;
-            dataGridView.AllowUserToResizeColumns = false;
-            dataGridView.AllowUserToResizeRows = false;
-            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.Location = new Point(0, 0);
-            dataGridView.MultiSelect = false;
-            dataGridView.Name = "dataGridView";
-            dataGridView.ReadOnly = true;
-            dataGridView.RowHeadersVisible = false;
-            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(689, 291);
-            dataGridView.TabIndex = 4;
-            // 
-            // FormTrips
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(787, 291);
-            Controls.Add(dataGridView);
-            Controls.Add(panel1);
-            Name = "FormTrips";
-            Text = "Поездки";
-            Load += FormTrips_Load;
-            panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-        }
-
-        #endregion
-
-        private Panel panel1;
-        private Button buttonAdd;
-        private DataGridView dataGridView;
-    }
-}

FuelAndLubricants/FuelAndLubricants/Forms/FormTrips.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using FuelAndLubricants.Repositories;
-using FuelAndLubricants.Repositories.Implementations;
-using Unity;
-
-namespace FuelAndLubricants.Forms
-{
-    public partial class FormTrips : Form
-    {
-        private readonly IUnityContainer _container;
-
-        private readonly ITripRepository _tripRepository;
-
-        public FormTrips(IUnityContainer container, ITripRepository tripRepository)
-        {
-            InitializeComponent();
-
-            _container = container ??
-            throw new ArgumentNullException(nameof(container));
-
-            _tripRepository = tripRepository ??
-                throw new ArgumentNullException(nameof(tripRepository));
-        }
-
-        private void FormTrips_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<FormTrip>().ShowDialog();
-                LoadList();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Ошибка при добавлении",
-                MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void LoadList() => dataGridView.DataSource = _tripRepository.ReadTrips();
-    }
-}

FuelAndLubricants/FuelAndLubricants/Forms/FormTrips.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>

FuelAndLubricants/FuelAndLubricants/Program.cs

@@ -22,7 +22,7 @@ namespace FuelAndLubricants
         {
             var container = new UnityContainer();
 
-            container.RegisterType<ICarRepository, CarRepository>();
+            container.RegisterType<IRouteRepository, CarRepository>();
             container.RegisterType<IDriverRepository, DriverRepository>();
             container.RegisterType<IFuelRepository, FuelRepository>();
             container.RegisterType<IRefillRepository, RefillRepository>();

FuelAndLubricants/FuelAndLubricants/Repositories/Implementations/CarRepository.cs

@@ -2,7 +2,7 @@
 
 namespace FuelAndLubricants.Repositories.Implementations;
 
-public class CarRepository : ICarRepository
+public class CarRepository : IRouteRepository
 {
     public void CreateCar(Car car)
     {

FuelAndLubricants/FuelAndLubricants/Repositories/Implementations/FuelRepository.cs

@@ -4,7 +4,7 @@ namespace FuelAndLubricants.Repositories.Implementations;
 
 public class FuelRepository : IFuelRepository
 {
-    public void CreateFuel(Fuel_And_Lubricants fuel)
+    public void CreateDriver(Fuel_And_Lubricants fuel)
     {
     }