diff --git a/ITServiceManager/ITServiceManager/Entities/Service.cs b/ITServiceManager/ITServiceManager/Entities/Service.cs index d907ddb..f7a841c 100644 --- a/ITServiceManager/ITServiceManager/Entities/Service.cs +++ b/ITServiceManager/ITServiceManager/Entities/Service.cs @@ -6,14 +6,16 @@ public class Service { public int Id { get; private set; } public ServiceType ServiceType { get; private set; } + 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 66f1548..8e5f992 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs @@ -1,45 +1,45 @@ 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 = "Name"; - comboBoxOrder.ValueMember = "Id"; + comboBoxOrder.DataSource = orderRepository.ReadOrders(); + comboBoxOrder.DisplayMember = "Name"; + comboBoxOrder.ValueMember = "Id"; comboBoxEmployee.DataSource = employeeRepository.ReadEmployees(); comboBoxEmployee.DisplayMember = "Name"; diff --git a/ITServiceManager/ITServiceManager/Forms/FormAppointments.cs b/ITServiceManager/ITServiceManager/Forms/FormAppointments.cs index c0ea03f..495394b 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormAppointments.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormAppointments.cs @@ -1,103 +1,71 @@ using ITServiceManager.Repositories; -using ITServiceManager.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 ITServiceManager.Forms -{ - public partial class FormAppointments : Form - { - private readonly IUnityContainer _container; - private readonly IAppointmentRepository _appointmentRepository; - public FormAppointments(IUnityContainer container, IAppointmentRepository appointmentRepository) - { - InitializeComponent(); - _container = container ?? throw new ArgumentNullException(nameof(container)); - _appointmentRepository = appointmentRepository ?? throw new ArgumentNullException(nameof(appointmentRepository)); - } - private void FormAppointments_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().ShowDialog(); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ButtonUpd_Click(object sender, EventArgs e) - { - if (!TryGetIdentifierFromSelectedRow(out var findId)) - { - return; - } - try - { - var form = _container.Resolve(); - form.Id = findId; - form.ShowDialog(); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при изменении", - MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void LoadList() => dataGridView.DataSource = _appointmentRepository.ReadAppointments(); - private bool TryGetIdentifierFromSelectedRow(out int id) - { - id = 0; - if (dataGridView.SelectedRows.Count < 1) - { - MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return false; - } - id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - return true; - } +namespace ITServiceManager.Forms; - private void buttonRemove_Click(object sender, EventArgs e) +public partial class FormAppointments : Form +{ + private readonly IUnityContainer _container; + private readonly IAppointmentRepository _appointmentRepository; + public FormAppointments(IUnityContainer container, IAppointmentRepository appointmentRepository) + { + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + _appointmentRepository = appointmentRepository ?? throw new ArgumentNullException(nameof(appointmentRepository)); + } + private void FormAppointments_Load(object sender, EventArgs e) + { + try { - if (!TryGetIdentifierFromSelectedRow(out var findId)) - { - return; - } - if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes) - { - return; - } - try - { - _appointmentRepository.DeleteAppointment(findId); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error); - } + LoadList(); } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при загрузке", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonAdd_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + LoadList(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (!TryGetIdentifierFromSelectedRow(out var findId)) + { + return; + } + try + { + var form = _container.Resolve(); + form.Id = findId; + form.ShowDialog(); + LoadList(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при изменении", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void LoadList() => dataGridView.DataSource = _appointmentRepository.ReadAppointments(); + private bool TryGetIdentifierFromSelectedRow(out int id) + { + id = 0; + if (dataGridView.SelectedRows.Count < 1) + { + MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return false; + } + id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + return true; } } diff --git a/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs b/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs index 5c45845..ae01e62 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormCompanies.cs @@ -1,106 +1,96 @@ 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; + + public FormCompanies(IUnityContainer container, ICompanyRepository companyRepository) { - private readonly IUnityContainer _container; - private readonly ICompanyRepository _companyRepository; - - public FormCompanies(IUnityContainer container, ICompanyRepository companyRepository) + InitializeComponent(); + _container = container ?? throw new ArgumentNullException(nameof(container)); + _companyRepository = companyRepository ?? throw new ArgumentNullException(nameof(companyRepository)); + } + private void FormCompanies_Load(object sender, EventArgs e) + { + try { - InitializeComponent(); - _container = container ?? throw new ArgumentNullException(nameof(container)); - _companyRepository = companyRepository ?? throw new ArgumentNullException(nameof(companyRepository)); + LoadList(); } - private void FormCompanies_Load(object sender, EventArgs e) + catch (Exception ex) { - try - { - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при загрузке", - MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ButtonAdd_Click(object sender, EventArgs e) - { - try - { - _container.Resolve().ShowDialog(); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ButtonRemove_Click(object sender, EventArgs e) - { - if (!TryGetIdentifierFromSelectedRow(out var findId)) - { - return; - } - if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes) - { - return; - } - try - { - _companyRepository.DeleteCompany(findId); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void ButtonUpdate_Click(object sender, EventArgs e) - { - if (!TryGetIdentifierFromSelectedRow(out var findId)) - { - return; - } - try - { - var form = _container.Resolve(); - form.Id = findId; - form.ShowDialog(); - LoadList(); - } - catch (Exception ex) - { - MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void LoadList() => dataGridView.DataSource = _companyRepository.ReadCompanies(); - private bool TryGetIdentifierFromSelectedRow(out int id) - { - id = 0; - if (dataGridView.SelectedRows.Count < 1) - { - MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return false; - } - id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - return true; - } - - private void dataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - + MessageBox.Show(ex.Message, "Ошибка при загрузке", + MessageBoxButtons.OK, MessageBoxIcon.Error); } } + private void ButtonAdd_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + LoadList(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при добавлении", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonRemove_Click(object sender, EventArgs e) + { + if (!TryGetIdentifierFromSelectedRow(out var findId)) + { + return; + } + if (MessageBox.Show("Удалить запись?", "Удаление", MessageBoxButtons.YesNo) != DialogResult.Yes) + { + return; + } + try + { + _companyRepository.DeleteCompany(findId); + LoadList(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при удалении", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ButtonUpdate_Click(object sender, EventArgs e) + { + if (!TryGetIdentifierFromSelectedRow(out var findId)) + { + return; + } + try + { + var form = _container.Resolve(); + form.Id = findId; + form.ShowDialog(); + LoadList(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка при изменении", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void LoadList() => dataGridView.DataSource = _companyRepository.ReadCompanies(); + private bool TryGetIdentifierFromSelectedRow(out int id) + { + id = 0; + if (dataGridView.SelectedRows.Count < 1) + { + MessageBox.Show("Нет выбранной записи", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return false; + } + id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + return true; + } + + 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 @@