diff --git a/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs b/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs index 8e5f992..9c890ca 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormAppointment.cs @@ -50,47 +50,49 @@ public partial class FormAppointment : Form 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/Program.cs b/ITServiceManager/ITServiceManager/Program.cs index 6e77d80..52efae4 100644 --- a/ITServiceManager/ITServiceManager/Program.cs +++ b/ITServiceManager/ITServiceManager/Program.cs @@ -22,34 +22,33 @@ internal static class Program Application.Run(CreateContainer().Resolve()); } + private static IUnityContainer CreateContainer() + { + var container = new UnityContainer(); - private static IUnityContainer CreateContainer() - { - var container = new UnityContainer(); + container.AddExtension(new LoggingExtension(CreateLoggerFactory())); - container.AddExtension(new LoggingExtension(CreateLoggerFactory())); - - container.RegisterType(); - container.RegisterType(); - container.RegisterType(); - container.RegisterType(); - container.RegisterType(); + container.RegisterType(); + container.RegisterType(); + container.RegisterType(); + container.RegisterType(); + container.RegisterType(); container.RegisterType(); - return container; - } - - private static LoggerFactory CreateLoggerFactory() - { - var loggerFactory = new LoggerFactory(); - loggerFactory.AddSerilog(new LoggerConfiguration() - .ReadFrom.Configuration(new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) - .AddJsonFile("appsettings.json") - .Build()) - .CreateLogger()); - return loggerFactory; - } + return container; } -} \ No newline at end of file + + private static LoggerFactory CreateLoggerFactory() + { + var loggerFactory = new LoggerFactory(); + loggerFactory.AddSerilog(new LoggerConfiguration() + .ReadFrom.Configuration(new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json") + .Build()) + .CreateLogger()); + return loggerFactory; + } + +}