merge

ITServiceManager/ITServiceManager/Entities/Service.cs

@@ -11,14 +11,16 @@ public class Service
     public ServiceType ServiceType { get; private set; }
 
     [DisplayName("Описание")]
+    public string ServiceName { get; private set; } = string.Empty;
     public string Description { get; private set; } = string.Empty;
 
-    public static Service CreateEntity(int id, ServiceType type, string description)
+    public static Service CreateEntity(int id, ServiceType type, string name, string description)
     {
         return new Service
         {
             Id = id,
             ServiceType = type,
+            ServiceName = name,
             Description = description
         };
     }

ITServiceManager/ITServiceManager/Forms/FormAppointment.cs

@@ -1,8 +1,8 @@
 using ITServiceManager.Entities;
 using ITServiceManager.Repositories;
 
-namespace ITServiceManager.Forms
+namespace ITServiceManager.Forms;
-{
+
 public partial class FormAppointment : Form
 {
     private readonly IAppointmentRepository _appointmentRepository;
@@ -20,8 +20,8 @@ namespace ITServiceManager.Forms
                     throw new
                     InvalidDataException(nameof(appointment));
                 }
-                    comboBoxEmployee.SelectedItem = appointment.EmployeeId;
+                comboBoxEmployee.SelectedIndex = appointment.EmployeeId;
-                    comboBoxOrder.SelectedItem = appointment.OrderId;
+                comboBoxOrder.SelectedIndex = appointment.OrderId;
                 _appointmentId = value;
             }
             catch (Exception ex)
@@ -51,7 +51,6 @@ namespace ITServiceManager.Forms
             dateTimePickerEnd.ValueChanged += DateTimePickerEnd_ValueChanged;
 
     }
-
     private void DateTimePickerEnd_ValueChanged(object sender, EventArgs e)
     {
         if (dateTimePickerEnd.CustomFormat == "В процессе")
@@ -84,7 +83,9 @@ namespace ITServiceManager.Forms
             MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
+
     private void ButtonCancel_Click(object sender, EventArgs e) => Close();
+
     private Appointment CreateAppointment(int id)
     {
         DateTime? endDate = dateTimePickerEnd.CustomFormat == "В процессе" ? (DateTime?)null : dateTimePickerEnd.Value;
@@ -92,5 +93,6 @@ namespace ITServiceManager.Forms
         return Appointment.CreateOperation(id, (int)comboBoxOrder.SelectedValue!, (int)comboBoxEmployee.SelectedValue!, Convert.ToDateTime(dateTimePickerStart.Value),
         endDate);
     }
+
 }
-}
+

ITServiceManager/ITServiceManager/Forms/FormAppointments.Designer.cs

@@ -80,7 +80,6 @@
             buttonRemove.Size = new Size(86, 101);
             buttonRemove.TabIndex = 3;
             buttonRemove.UseVisualStyleBackColor = true;
-            buttonRemove.Click += buttonRemove_Click;
             // 
             // buttonUpdate
             // 

ITServiceManager/ITServiceManager/Forms/FormCompanies.cs

@@ -1,17 +1,8 @@
 using ITServiceManager.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 ITServiceManager.Forms
+namespace ITServiceManager.Forms;
-{
+
 public partial class FormCompanies : Form
 {
     private readonly IUnityContainer _container;
@@ -107,4 +98,3 @@ namespace ITServiceManager.Forms
 
     }
 }
-}

ITServiceManager/ITServiceManager/Forms/FormEmployees.cs

@@ -1,17 +1,8 @@
 using ITServiceManager.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 ITServiceManager.Forms
+namespace ITServiceManager.Forms;
-{
+
 public partial class FormEmployees : Form
 {
     private readonly IUnityContainer _container;
@@ -116,7 +107,4 @@ namespace ITServiceManager.Forms
             return true;
         }
 
-
-
-    }
 }

ITServiceManager/ITServiceManager/Forms/FormOrder.cs

@@ -1,5 +1,6 @@
 using ITServiceManager.Entities;
 using ITServiceManager.Repositories;
+
 namespace ITServiceManager.Forms;
 
 public partial class FormOrder : Form
@@ -15,7 +16,7 @@ public partial class FormOrder : Form
         comboBoxCompany.ValueMember = "Id";
 
         ColumnService.DataSource = serviceRepository.ReadServices();
-        ColumnService.DisplayMember = "ServiceType";
+        ColumnService.DisplayMember = "ServiceName";
         ColumnService.ValueMember = "Id";
 
     }

ITServiceManager/ITServiceManager/Forms/FormOrders.cs

@@ -1,13 +1,4 @@
 using ITServiceManager.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 ITServiceManager.Forms

ITServiceManager/ITServiceManager/Forms/FormService.Designer.cs

@@ -34,12 +34,13 @@
             label1 = new Label();
             label2 = new Label();
             checkedListBoxType = new CheckedListBox();
+            textBoxName = new TextBox();
+            labelName = new Label();
             SuspendLayout();
             // 
             // buttonCancel
             // 
-            buttonCancel.Location = new Point(358, 367);
+            buttonCancel.Location = new Point(310, 318);
-            buttonCancel.Margin = new Padding(3, 4, 3, 4);
             buttonCancel.Name = "buttonCancel";
             buttonCancel.Size = new Size(128, 37);
             buttonCancel.TabIndex = 7;
@@ -49,8 +50,7 @@
             // 
             // buttonAdd
             // 
-            buttonAdd.Location = new Point(99, 367);
+            buttonAdd.Location = new Point(84, 318);
-            buttonAdd.Margin = new Padding(3, 4, 3, 4);
             buttonAdd.Name = "buttonAdd";
             buttonAdd.Size = new Size(128, 37);
             buttonAdd.TabIndex = 6;
@@ -60,25 +60,26 @@
             // 
             // richTextBoxDescription
             // 
-            richTextBoxDescription.Location = new Point(278, 159);
+            richTextBoxDescription.Location = new Point(240, 207);
+            richTextBoxDescription.Margin = new Padding(3, 2, 3, 2);
             richTextBoxDescription.Name = "richTextBoxDescription";
-            richTextBoxDescription.Size = new Size(265, 175);
+            richTextBoxDescription.Size = new Size(232, 87);
             richTextBoxDescription.TabIndex = 9;
             richTextBoxDescription.Text = "";
             // 
             // label1
             // 
             label1.AutoSize = true;
-            label1.Location = new Point(68, 36);
+            label1.Location = new Point(57, 52);
             label1.Name = "label1";
-            label1.Size = new Size(83, 20);
+            label1.Size = new Size(67, 15);
             label1.TabIndex = 4;
             label1.Text = "Тип услуги";
             // 
             // label2
             // 
             label2.AutoSize = true;
-            label2.Location = new Point(52, 179);
+            label2.Location = new Point(57, 239);
             label2.Name = "label2";
             label2.Size = new Size(127, 20);
             label2.TabIndex = 8;
@@ -87,22 +88,42 @@
             // checkedListBoxType
             // 
             checkedListBoxType.FormattingEnabled = true;
-            checkedListBoxType.Location = new Point(278, 12);
+            checkedListBoxType.Location = new Point(240, 29);
+            checkedListBoxType.Margin = new Padding(3, 2, 3, 2);
             checkedListBoxType.Name = "checkedListBoxType";
-            checkedListBoxType.Size = new Size(265, 114);
+            checkedListBoxType.Size = new Size(232, 76);
             checkedListBoxType.TabIndex = 10;
             // 
+            // textBoxName
+            // 
+            textBoxName.Location = new Point(240, 142);
+            textBoxName.Name = "textBoxName";
+            textBoxName.Size = new Size(232, 23);
+            textBoxName.TabIndex = 11;
+            // 
+            // labelName
+            // 
+            labelName.AutoSize = true;
+            labelName.Location = new Point(57, 142);
+            labelName.Name = "labelName";
+            labelName.Size = new Size(59, 15);
+            labelName.TabIndex = 12;
+            labelName.Text = "Название";
+            // 
             // FormService
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(584, 451);
+            ClientSize = new Size(511, 362);
+            Controls.Add(labelName);
+            Controls.Add(textBoxName);
             Controls.Add(checkedListBoxType);
             Controls.Add(richTextBoxDescription);
             Controls.Add(label2);
             Controls.Add(buttonCancel);
             Controls.Add(buttonAdd);
             Controls.Add(label1);
+            Margin = new Padding(3, 2, 3, 2);
             Name = "FormService";
             StartPosition = FormStartPosition.CenterScreen;
             Text = "Услуга";
@@ -118,5 +139,7 @@
         private Label label1;
         private Label label2;
         private CheckedListBox checkedListBoxType;
+        private TextBox textBoxName;
+        private Label labelName;
     }
 }

ITServiceManager/ITServiceManager/Forms/FormService.cs

@@ -31,7 +31,7 @@ public partial class FormService : Form
                     }
                 }
 
-
+                textBoxName.Text = service.ServiceName;
                 richTextBoxDescription.Text = service.Description;
                 _serviceId = value;
             }
@@ -58,7 +58,7 @@ public partial class FormService : Form
         try
         {
             if (checkedListBoxType.CheckedItems.Count == 0 ||
-            string.IsNullOrWhiteSpace(richTextBoxDescription.Text))
+            string.IsNullOrWhiteSpace(richTextBoxDescription.Text) || string.IsNullOrWhiteSpace(textBoxName.Text))
             {
                 throw new Exception("Имеются незаполненные поля");
             }
@@ -87,6 +87,6 @@ public partial class FormService : Form
             serviceType |= (ServiceType)elem;
         }
 
-        return Service.CreateEntity(id, serviceType, richTextBoxDescription.Text);
+        return Service.CreateEntity(id, serviceType, textBoxName.Text, richTextBoxDescription.Text);
     }
 }

ITServiceManager/ITServiceManager/Program.cs

@@ -6,8 +6,8 @@ using Unity.Microsoft.Logging;
 using Serilog;
 using Unity;
 
-namespace ITServiceManager
+namespace ITServiceManager;
-{
+
 internal static class Program
 {
     /// <summary>
@@ -22,7 +22,6 @@ namespace ITServiceManager
         Application.Run(CreateContainer().Resolve<FormItCompany>());
        
     }
-
     private static IUnityContainer CreateContainer()
     {
         var container = new UnityContainer();
@@ -51,5 +50,5 @@ namespace ITServiceManager
             .CreateLogger());
         return loggerFactory;
     }
-    }
+
 }

ITServiceManager/ITServiceManager/Reports/ChartReport.cs

@@ -1,6 +1,4 @@
-using ITServiceManager.Entities;
+using ITServiceManager.Repositories;
-using ITServiceManager.Repositories;
-using ITServiceManager.Repositories.Implementations;
 using Microsoft.Extensions.Logging;
 
 namespace ITServiceManager.Reports;

ITServiceManager/ITServiceManager/Reports/DocReport.cs

@@ -30,7 +30,7 @@ public class DocReport
             }
             if (includeServices)
             {
-                builder.AddParagraph("Услуги").AddTable([2400, 2400], GetServices());
+                builder.AddParagraph("Услуги").AddTable([2400, 2400, 2400], GetServices());
             }
             if (includeEmployees)
             {
@@ -69,10 +69,10 @@ public class DocReport
     private List<string[]> GetServices()
     {
         return [ 
-            ["Тип услуги", "Описание"],
+            ["Название услуги", "Тип услуги", "Описание"],
         .. _serviceRepository
             .ReadServices()
-            .Select(x => new string[] { x.ServiceType.ToString(), x.Description }),
+            .Select(x => new string[] {x.ServiceName, x.ServiceType.ToString(), x.Description }),
     ];
     }
 }

ITServiceManager/ITServiceManager/Reports/TableReport.cs

@@ -1,7 +1,4 @@
-
+using ITServiceManager.Repositories;
-using ITServiceManager.Entities;
-using ITServiceManager.Repositories;
-using ITServiceManager.Repositories.Implementations;
 using Microsoft.Extensions.Logging;
 
 namespace ITServiceManager.Reports;

ITServiceManager/ITServiceManager/Repositories/Implementations/ServiceRepository.cs

@@ -64,8 +64,8 @@ public class ServiceRepository : IServiceRepository
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
             var queryInsert = @"
-                INSERT INTO Services (ServiceType, Description)
+                INSERT INTO Services (ServiceType, ServiceName, Description)
-                VALUES (@ServiceType, @Description)";
+                VALUES (@ServiceType, @ServiceName, @Description)";
             connection.Execute(queryInsert, service);
         }
         catch (Exception ex)
@@ -85,6 +85,7 @@ public class ServiceRepository : IServiceRepository
                 UPDATE Services
                 SET
                 ServiceType=@ServiceType,
+                ServiceName=@ServiceName,
                 Description=@Description
                 WHERE Id=@Id";
             connection.Execute(queryUpdate, service);