Merge branch 'Lab02' into Lab03

FuelAccounting/FuelAccounting/Forms/FormCar.Designer.cs

@@ -123,6 +123,7 @@
             Controls.Add(label2);
             Controls.Add(label1);
             Name = "FormCar";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Автомобиль";
             ResumeLayout(false);
             PerformLayout();

FuelAccounting/FuelAccounting/Forms/FormCars.Designer.cs

@@ -106,6 +106,7 @@
             Controls.Add(dataGridViewData);
             Controls.Add(panelButtons);
             Name = "FormCars";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Автомобили";
             Load += FormCars_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();

FuelAccounting/FuelAccounting/Forms/FormDriver.Designer.cs

@@ -121,6 +121,7 @@
             Controls.Add(label1);
             Controls.Add(checkedListBoxDriverLicenceCategory);
             Name = "FormDriver";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "FormDriver";
             ResumeLayout(false);
             PerformLayout();

FuelAccounting/FuelAccounting/Forms/FormDriver.cs

@@ -1,7 +1,6 @@
 using FuelAccounting.Entities;
 using FuelAccounting.Entities.Enums;
 using FuelAccounting.Repositories;
-using FuelAccounting.Repositories.Implementations;
 
 namespace FuelAccounting.Forms
 {

FuelAccounting/FuelAccounting/Forms/FormDrivers.Designer.cs

@@ -106,6 +106,7 @@
             Controls.Add(dataGridViewData);
             Controls.Add(panelButtons);
             Name = "FormDrivers";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Водители";
             Load += FormDrivers_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();

FuelAccounting/FuelAccounting/Forms/FormDrivers.cs

@@ -1,14 +1,4 @@
 using FuelAccounting.Repositories;
-using FuelAccounting.Repositories.Implementations;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
 namespace FuelAccounting.Forms

FuelAccounting/FuelAccounting/Forms/FormEquipage.Designer.cs

@@ -169,6 +169,7 @@
             Controls.Add(comboBoxCar);
             Controls.Add(label1);
             Name = "FormEquipage";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Выезд";
             groupBoxRoutes.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)dataGridViewRoutes).EndInit();

FuelAccounting/FuelAccounting/Forms/FormEquipage.cs

@@ -1,15 +1,5 @@
 using FuelAccounting.Entities;
 using FuelAccounting.Repositories;
-using FuelAccounting.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 FuelAccounting.Forms
 {

FuelAccounting/FuelAccounting/Forms/FormEquipages.Designer.cs

@@ -30,8 +30,8 @@
         {
             dataGridViewData = new DataGridView();
             panelButtons = new Panel();
-            buttonAdd = new Button();
             buttonDelete = new Button();
+            buttonAdd = new Button();
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).BeginInit();
             panelButtons.SuspendLayout();
             SuspendLayout();
@@ -63,17 +63,6 @@
             panelButtons.Size = new Size(160, 450);
             panelButtons.TabIndex = 10;
             // 
-            // buttonAdd
-            // 
-            buttonAdd.BackgroundImage = Properties.Resources.pngimg_com___plus_PNG84;
-            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonAdd.Location = new Point(18, 12);
-            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(130, 130);
-            buttonAdd.TabIndex = 2;
-            buttonAdd.UseVisualStyleBackColor = true;
-            buttonAdd.Click += ButtonAdd_Click;
-            // 
             // buttonDelete
             // 
             buttonDelete.BackgroundImage = Properties.Resources.images;
@@ -85,6 +74,17 @@
             buttonDelete.UseVisualStyleBackColor = true;
             buttonDelete.Click += ButtonDelete_Click;
             // 
+            // buttonAdd
+            // 
+            buttonAdd.BackgroundImage = Properties.Resources.pngimg_com___plus_PNG84;
+            buttonAdd.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonAdd.Location = new Point(18, 12);
+            buttonAdd.Name = "buttonAdd";
+            buttonAdd.Size = new Size(130, 130);
+            buttonAdd.TabIndex = 2;
+            buttonAdd.UseVisualStyleBackColor = true;
+            buttonAdd.Click += ButtonAdd_Click;
+            // 
             // FormEquipages
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -93,6 +93,7 @@
             Controls.Add(dataGridViewData);
             Controls.Add(panelButtons);
             Name = "FormEquipages";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Выезды";
             Load += FormEquipages_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();

FuelAccounting/FuelAccounting/Forms/FormEquipages.cs

@@ -1,14 +1,4 @@
 using FuelAccounting.Repositories;
-using FuelAccounting.Repositories.Implementations;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
 namespace FuelAccounting.Forms

FuelAccounting/FuelAccounting/Forms/FormRefueling.Designer.cs

@@ -74,7 +74,7 @@
             label4.AutoSize = true;
             label4.Location = new Point(12, 126);
             label4.Name = "label4";
-            label4.Size = new Size(75, 15);
+            label4.Size = new Size(76, 15);
             label4.TabIndex = 3;
             label4.Text = "Тип топлива";
             // 
@@ -149,6 +149,7 @@
             Controls.Add(label2);
             Controls.Add(label1);
             Name = "FormRefueling";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "FormRefueling";
             ((System.ComponentModel.ISupportInitialize)numericUpDownKm).EndInit();
             ((System.ComponentModel.ISupportInitialize)numericUpDownLiters).EndInit();

FuelAccounting/FuelAccounting/Forms/FormRefueling.cs

@@ -1,14 +1,5 @@
 using FuelAccounting.Entities;
 using FuelAccounting.Repositories;
-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 FuelAccounting.Forms
 {

FuelAccounting/FuelAccounting/Forms/FormRefuelings.Designer.cs

@@ -80,6 +80,7 @@
             Controls.Add(dataGridViewData);
             Controls.Add(panelButtons);
             Name = "FormRefuelings";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Заправки";
             Load += FormRefuelings_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();

FuelAccounting/FuelAccounting/Forms/FormRefuelings.cs

@@ -1,14 +1,4 @@
 using FuelAccounting.Repositories;
-using FuelAccounting.Repositories.Implementations;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
 namespace FuelAccounting.Forms

FuelAccounting/FuelAccounting/Forms/FormRoute.cs

@@ -1,14 +1,5 @@
 using FuelAccounting.Entities;
 using FuelAccounting.Repositories;
-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 FuelAccounting.Forms
 {

FuelAccounting/FuelAccounting/Forms/FormRoutes.cs

@@ -1,13 +1,4 @@
 using FuelAccounting.Repositories;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using Unity;
 
 namespace FuelAccounting.Forms

FuelAccounting/FuelAccounting/Forms/FormShift.cs

@@ -1,14 +1,5 @@
 using FuelAccounting.Entities;
 using FuelAccounting.Repositories;
-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 FuelAccounting.Forms
 {

FuelAccounting/FuelAccounting/Forms/FormShifts.Designer.cs

@@ -106,6 +106,7 @@
             Controls.Add(dataGridViewData);
             Controls.Add(panelButtons);
             Name = "FormShifts";
+            StartPosition = FormStartPosition.CenterScreen;
             Text = "Смены";
             Load += FormShifts_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit();

FuelAccounting/FuelAccounting/Properties/Resources.Designer.cs

@@ -80,16 +80,6 @@ namespace FuelAccounting.Properties {
             }
         }
         
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap Cancel {
-            get {
-                object obj = ResourceManager.GetObject("Cancel", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
         /// </summary>
@@ -100,37 +90,6 @@ namespace FuelAccounting.Properties {
             }
         }
         
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap png_clipart_plus_plus {
-            get {
-                object obj = ResourceManager.GetObject("png-clipart-plus-plus", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap png_clipart_plus_plus__1_ {
-            get {
-                object obj = ResourceManager.GetObject("png-clipart-plus-plus (1)", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap png_transparent_pencil_illustration_hand_painted_pencil_material_watercolor_painting_text_color_pencil {
-            get {
-                object obj = ResourceManager.GetObject("png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-paint" +
-                        "ing-text-color-pencil", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
         /// </summary>

FuelAccounting/FuelAccounting/Properties/Resources.resx

@@ -118,15 +118,6 @@
     <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="png-clipart-plus-plus" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\png-clipart-plus-plus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\png-transparent-pencil-illustration-hand-painted-pencil-material-watercolor-painting-text-color-pencil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="pngimg.com - plus_PNG84" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\pngimg.com - plus_PNG84.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,9 +127,6 @@
   <data name="4298" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\4298.jpeg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="png-clipart-plus-plus (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\png-clipart-plus-plus (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="images" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\images.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

FuelAccounting/FuelAccounting/Repositories/IConnectionString.cs

@@ -1,10 +1,4 @@
-using System;
+namespace FuelAccounting.Repositories;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FuelAccounting.Repositories;
 
 public interface IConnectionString
 {

FuelAccounting/FuelAccounting/Repositories/Implementations/ConnectionString.cs

@@ -1,10 +1,4 @@
-using System;
+namespace FuelAccounting.Repositories.Implementations;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FuelAccounting.Repositories.Implementations;
 
 internal class ConnectionString : IConnectionString
 {

FuelAccounting/FuelAccounting/Repositories/Implementations/DriverRepository.cs

@@ -1,6 +1,5 @@
 using Dapper;
 using FuelAccounting.Entities;
-using FuelAccounting.Entities.Enums;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Npgsql;