diff --git a/ITServiceManager/ITServiceManager/Entities/Service.cs b/ITServiceManager/ITServiceManager/Entities/Service.cs index bad03b2..bab84a6 100644 --- a/ITServiceManager/ITServiceManager/Entities/Service.cs +++ b/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 }; } diff --git a/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs b/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs index b09929b..2def7b1 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs @@ -1,41 +1,41 @@ using ITServiceManager.Entities; using ITServiceManager.Repositories; -namespace ITServiceManager.Forms +namespace ITServiceManager.Forms; + +public partial class FormAppointment : Form { - public partial class FormAppointment : Form + private readonly IAppointmentRepository _appointmentRepository; + private int? _appointmentId; + public int Id { - private readonly IAppointmentRepository _appointmentRepository; - private int? _appointmentId; - public int Id + set { - set + try { - try + var appointment = + _appointmentRepository.ReadAppointmentById(value); + if (appointment == null) { - var appointment = - _appointmentRepository.ReadAppointmentById(value); - if (appointment == null) - { - throw new - InvalidDataException(nameof(appointment)); - } - comboBoxEmployee.SelectedItem = appointment.EmployeeId; - comboBoxOrder.SelectedItem = appointment.OrderId; - _appointmentId = value; - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; + throw new + InvalidDataException(nameof(appointment)); } + comboBoxEmployee.SelectedIndex = appointment.EmployeeId; + comboBoxOrder.SelectedIndex = appointment.OrderId; + _appointmentId = value; + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при получении данных", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; } } - public FormAppointment(IAppointmentRepository appointmentRepository, IEmployeeRepository employeeRepository, IOrderRepository orderRepository) - { - InitializeComponent(); - _appointmentRepository = appointmentRepository ?? - throw new ArgumentNullException(nameof(appointmentRepository)); + } + public FormAppointment(IAppointmentRepository appointmentRepository, IEmployeeRepository employeeRepository, IOrderRepository orderRepository) + { + InitializeComponent(); + _appointmentRepository = appointmentRepository ?? + throw new ArgumentNullException(nameof(appointmentRepository)); comboBoxOrder.DataSource = orderRepository.ReadOrders(); comboBoxOrder.DisplayMember = "FullName"; @@ -50,47 +50,49 @@ namespace ITServiceManager.Forms dateTimePickerEnd.ValueChanged += DateTimePickerEnd_ValueChanged; - } - - private void DateTimePickerEnd_ValueChanged(object sender, EventArgs e) + } + private void DateTimePickerEnd_ValueChanged(object sender, EventArgs e) + { + if (dateTimePickerEnd.CustomFormat == "В процессе") { - if (dateTimePickerEnd.CustomFormat == "В процессе") - { - dateTimePickerEnd.CustomFormat = "dd.MM.yyyy HH:mm"; - } - } - private void ButtonAdd_Click(object sender, EventArgs e) - { - try - { - if (comboBoxEmployee.SelectedIndex < 0 || comboBoxOrder.SelectedIndex < 0) - { - throw new Exception("Имеются незаполненные поля"); - } - - if (_appointmentId.HasValue) - { - _appointmentRepository.UpdateAppointment(CreateAppointment(_appointmentId.Value)); - } - else - { - _appointmentRepository.CreateAppointment(CreateAppointment(0)); - } - Close(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при сохранении", - 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; - - return Appointment.CreateOperation(id, (int)comboBoxOrder.SelectedValue!, (int)comboBoxEmployee.SelectedValue!, Convert.ToDateTime(dateTimePickerStart.Value), - endDate); + dateTimePickerEnd.CustomFormat = "dd.MM.yyyy HH:mm"; } } + private void ButtonAdd_Click(object sender, EventArgs e) + { + try + { + if (comboBoxEmployee.SelectedIndex < 0 || comboBoxOrder.SelectedIndex < 0) + { + throw new Exception("Имеются незаполненные поля"); + } + + if (_appointmentId.HasValue) + { + _appointmentRepository.UpdateAppointment(CreateAppointment(_appointmentId.Value)); + } + else + { + _appointmentRepository.CreateAppointment(CreateAppointment(0)); + } + Close(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при сохранении", + 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; + + return Appointment.CreateOperation(id, (int)comboBoxOrder.SelectedValue!, (int)comboBoxEmployee.SelectedValue!, Convert.ToDateTime(dateTimePickerStart.Value), + endDate); + } + } + diff --git a/ITServiceManager/ITServiceManager/Forms/FormAppointments.Designer.cs b/ITServiceManager/ITServiceManager/Forms/FormAppointments.Designer.cs index 328ff6a..614cf9b 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormAppointments.Designer.cs +++ b/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 // diff --git a/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs b/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs index 00f390c..167b716 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs @@ -1,21 +1,12 @@ 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 { - public partial class FormCompanies : Form - { - private readonly IUnityContainer _container; - private readonly ICompanyRepository _companyRepository; + private readonly IUnityContainer _container; + private readonly ICompanyRepository _companyRepository; public FormCompanies(IUnityContainer container, ICompanyRepository companyRepository) { @@ -102,9 +93,8 @@ namespace ITServiceManager.Forms return true; } - private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) - { + private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { - } } } diff --git a/ITServiceManager/ITServiceManager/Forms/FormCompany.resx b/ITServiceManager/ITServiceManager/Forms/FormCompany.resx index af32865..8b2ff64 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormCompany.resx +++ b/ITServiceManager/ITServiceManager/Forms/FormCompany.resx @@ -1,7 +1,7 @@