From 8ec32cd38ee15d125eae776fd467aa740260a038 Mon Sep 17 00:00:00 2001 From: RavilGismatullin Date: Wed, 11 Dec 2024 10:49:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D1=83=D0=B4=20=D0=BB=D0=B0=D0=BA=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=BA=D1=81=D1=82=20=D1=82=D0=B0=D0=B9=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAirline/Entities/Flight.cs | 2 +- ProjectAirline/Entities/Passanger.cs | 2 +- ProjectAirline/Entities/Plane.cs | 2 +- ProjectAirline/Entities/PreparatoryWork.cs | 4 +- ...ryWorkPlane.cs => PreparatoryWorkPlane.cs} | 2 +- ProjectAirline/Entities/Ticket.cs | 2 +- ProjectAirline/FormAirline.resx | 59 ++++++++++--------- ProjectAirline/Forms/FormFlight.cs | 2 +- ProjectAirline/Forms/FormPassanger.cs | 2 +- ProjectAirline/Forms/FormPlane.cs | 2 +- ProjectAirline/Forms/FormPreparatoryWork.cs | 35 +++++------ .../Forms/FormPreparatoryWorks.Designer.cs | 1 - ProjectAirline/Forms/FormPreparatoryWorks.cs | 16 ++--- ProjectAirline/Forms/FormTicket.cs | 2 +- .../Repositories/IFlightRepository.cs | 4 -- .../IPreparatoryWorkRepository.cs | 2 - .../Implementations/FlightRepository.cs | 2 +- .../Implementations/PassangerRepository.cs | 2 +- .../Implementations/PlaneRepository.cs | 2 +- .../PreparatoryWorkRepository.cs | 5 +- .../Implementations/TicketRepository.cs | 2 +- 21 files changed, 71 insertions(+), 81 deletions(-) rename ProjectAirline/Entities/{PraparatoryWorkPlane.cs => PreparatoryWorkPlane.cs} (84%) diff --git a/ProjectAirline/Entities/Flight.cs b/ProjectAirline/Entities/Flight.cs index 4382a44..477ca15 100644 --- a/ProjectAirline/Entities/Flight.cs +++ b/ProjectAirline/Entities/Flight.cs @@ -18,7 +18,7 @@ public class Flight public int TicketPrice { get; private set; } - public static Flight CreateFlight(int id, DateTime dateTimeDeparture, DateTime dateTimeArrival, string arrivalLocation, int ticketPrice) + public static Flight CreateOperation(int id, DateTime dateTimeDeparture, DateTime dateTimeArrival, string arrivalLocation, int ticketPrice) { return new Flight { diff --git a/ProjectAirline/Entities/Passanger.cs b/ProjectAirline/Entities/Passanger.cs index 5751a63..82f9623 100644 --- a/ProjectAirline/Entities/Passanger.cs +++ b/ProjectAirline/Entities/Passanger.cs @@ -14,7 +14,7 @@ public class Passanger public string LastName { get; private set; } = string.Empty; - public static Passanger CreatePassanger(int id, string fname, string lname) + public static Passanger CreateEntity(int id, string fname, string lname) { return new Passanger { diff --git a/ProjectAirline/Entities/Plane.cs b/ProjectAirline/Entities/Plane.cs index 854f992..69dbe69 100644 --- a/ProjectAirline/Entities/Plane.cs +++ b/ProjectAirline/Entities/Plane.cs @@ -14,7 +14,7 @@ public class Plane public int Capacity { get; private set; } - public static Plane CreatePlane(int id, string name, int capacity) + public static Plane CreateEntity(int id, string name, int capacity) { return new Plane { diff --git a/ProjectAirline/Entities/PreparatoryWork.cs b/ProjectAirline/Entities/PreparatoryWork.cs index 513dda6..8305481 100644 --- a/ProjectAirline/Entities/PreparatoryWork.cs +++ b/ProjectAirline/Entities/PreparatoryWork.cs @@ -15,9 +15,9 @@ public class PreparatoryWork public DateTime StartDate { get; private set; } public DateTime EndDate { get; private set; } public PreparatoryWorkStatus Status { get; private set; } - public IEnumerable PreparatoryWorkPlanes { get; private set; } = Enumerable.Empty(); + public IEnumerable PreparatoryWorkPlanes { get; private set; } = []; - public static PreparatoryWork CreatePreparatoryWork(int id, int flightId, DateTime startDate, DateTime endDate, PreparatoryWorkStatus status, IEnumerable preparatoryWorkPlanes) + public static PreparatoryWork CreateOperation(int id, int flightId, DateTime startDate, DateTime endDate, PreparatoryWorkStatus status, IEnumerable preparatoryWorkPlanes) { return new PreparatoryWork { diff --git a/ProjectAirline/Entities/PraparatoryWorkPlane.cs b/ProjectAirline/Entities/PreparatoryWorkPlane.cs similarity index 84% rename from ProjectAirline/Entities/PraparatoryWorkPlane.cs rename to ProjectAirline/Entities/PreparatoryWorkPlane.cs index bb2ab66..5756853 100644 --- a/ProjectAirline/Entities/PraparatoryWorkPlane.cs +++ b/ProjectAirline/Entities/PreparatoryWorkPlane.cs @@ -13,7 +13,7 @@ public class PreparatoryWorkPlane public int PlaneId { get; private set; } public int Count { get; private set; } - public static PreparatoryWorkPlane CreateElement(int id, int preparatoryWorkId, int planeId, int count) + public static PreparatoryWorkPlane CreateOperation(int id, int preparatoryWorkId, int planeId, int count) { return new PreparatoryWorkPlane { diff --git a/ProjectAirline/Entities/Ticket.cs b/ProjectAirline/Entities/Ticket.cs index 519d91f..a901c15 100644 --- a/ProjectAirline/Entities/Ticket.cs +++ b/ProjectAirline/Entities/Ticket.cs @@ -15,7 +15,7 @@ public class Ticket public TicketStatus Status { get; private set; } - public static Ticket CreateTicket(int id, TicketStatus status) + public static Ticket CreateEntity(int id, TicketStatus status) { return new Ticket { diff --git a/ProjectAirline/FormAirline.resx b/ProjectAirline/FormAirline.resx index 6c82d08..606b604 100644 --- a/ProjectAirline/FormAirline.resx +++ b/ProjectAirline/FormAirline.resx @@ -1,17 +1,17 @@  - @@ -117,7 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - + + + + Resources\scale_1200.jpg;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/ProjectAirline/Forms/FormFlight.cs b/ProjectAirline/Forms/FormFlight.cs index faa2539..99c7923 100644 --- a/ProjectAirline/Forms/FormFlight.cs +++ b/ProjectAirline/Forms/FormFlight.cs @@ -75,5 +75,5 @@ public partial class FormFlight : Form private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private Flight CreateFlight(int id) => Flight.CreateFlight(id, DateTime.Now, DateTime.Now.AddHours(2), textBoxArrivalLocation.Text, Convert.ToInt32(numericUpDownTicketPrice.Value)); + private Flight CreateFlight(int id) => Flight.CreateOperation(id, DateTime.Now, DateTime.Now.AddHours(2), textBoxArrivalLocation.Text, Convert.ToInt32(numericUpDownTicketPrice.Value)); } diff --git a/ProjectAirline/Forms/FormPassanger.cs b/ProjectAirline/Forms/FormPassanger.cs index 365d80a..7ba7447 100644 --- a/ProjectAirline/Forms/FormPassanger.cs +++ b/ProjectAirline/Forms/FormPassanger.cs @@ -74,5 +74,5 @@ public partial class FormPassanger : Form private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private Passanger CreatePassanger(int id) => Passanger.CreatePassanger(id, textBoxFirstName.Text, textBoxFirstName.Text); + private Passanger CreatePassanger(int id) => Passanger.CreateEntity(id, textBoxFirstName.Text, textBoxFirstName.Text); } diff --git a/ProjectAirline/Forms/FormPlane.cs b/ProjectAirline/Forms/FormPlane.cs index f8bc98e..325af8b 100644 --- a/ProjectAirline/Forms/FormPlane.cs +++ b/ProjectAirline/Forms/FormPlane.cs @@ -74,5 +74,5 @@ public partial class FormPlane : Form private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private Plane CreatePlane(int id) => Plane.CreatePlane(id, textBoxName.Text, Convert.ToInt32(numericUpDownCapacity.Value)); + private Plane CreatePlane(int id) => Plane.CreateEntity(id, textBoxName.Text, Convert.ToInt32(numericUpDownCapacity.Value)); } diff --git a/ProjectAirline/Forms/FormPreparatoryWork.cs b/ProjectAirline/Forms/FormPreparatoryWork.cs index 1801133..ee2beae 100644 --- a/ProjectAirline/Forms/FormPreparatoryWork.cs +++ b/ProjectAirline/Forms/FormPreparatoryWork.cs @@ -64,15 +64,10 @@ public partial class FormPreparatoryWork : Form { throw new Exception("Имеются незаполненные поля"); } - - if (_preparatoryWorkId.HasValue) - { - _preparatoryWorkRepository.UpdatePreparatoryWork(CreatePreparatoryWork(_preparatoryWorkId.Value)); - } - else - { - _preparatoryWorkRepository.CreatePreparatoryWork(CreatePreparatoryWork(0)); - } + //else + //{ + // _preparatoryWorkRepository.CreatePreparatoryWork(); + //} Close(); } @@ -84,15 +79,15 @@ public partial class FormPreparatoryWork : Form private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private PreparatoryWork CreatePreparatoryWork(int id) - { - return PreparatoryWork.CreatePreparatoryWork( - id, - (int)comboBoxFlightId.SelectedItem, - DateTime.Now, - DateTime.Now.AddHours(1), - (PreparatoryWorkStatus)comboBoxStatus.SelectedItem - - ); - } + //private PreparatoryWork CreatePreparatoryWork(int id) + //{ + // return PreparatoryWork.CreateOperation( + // id, + // (int)comboBoxFlightId.SelectedItem, + // DateTime.Now, + // DateTime.Now.AddHours(1), + // (PreparatoryWorkStatus)comboBoxStatus.SelectedItem + + // ); + //} } diff --git a/ProjectAirline/Forms/FormPreparatoryWorks.Designer.cs b/ProjectAirline/Forms/FormPreparatoryWorks.Designer.cs index b4acada..2685e24 100644 --- a/ProjectAirline/Forms/FormPreparatoryWorks.Designer.cs +++ b/ProjectAirline/Forms/FormPreparatoryWorks.Designer.cs @@ -109,7 +109,6 @@ Name = "FormPreparatoryWorks"; StartPosition = FormStartPosition.CenterParent; Text = "Подготовительные работы"; - Load += FormPreparatoryWorks_Load; panel.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridViewData).EndInit(); ResumeLayout(false); diff --git a/ProjectAirline/Forms/FormPreparatoryWorks.cs b/ProjectAirline/Forms/FormPreparatoryWorks.cs index 4689182..7428baa 100644 --- a/ProjectAirline/Forms/FormPreparatoryWorks.cs +++ b/ProjectAirline/Forms/FormPreparatoryWorks.cs @@ -116,7 +116,7 @@ public partial class FormPreparatoryWorks : Form _preparatoryWorkRepository = preparatoryWorkRepository ?? throw new ArgumentNullException(nameof(preparatoryWorkRepository)); _planeRepository = planeRepository ?? throw new ArgumentNullException(nameof(planeRepository)); - // Настройка DataGridView + dataGridViewData.AutoGenerateColumns = false; dataGridViewData.Columns.Add(new DataGridViewComboBoxColumn { @@ -146,12 +146,12 @@ public partial class FormPreparatoryWorks : Form var preparatoryWorkPlanes = CreateListPreparatoryWorkPlanesFromDataGrid(); - var preparatoryWork = PreparatoryWork.CreatePreparatoryWork( - 0, // ID будет присвоен при сохранении - -1, // FlightId (если нужно, добавьте поле для ввода) - DateTime.Now, // StartDate (если нужно, добавьте поле для ввода) - DateTime.Now, // EndDate (если нужно, добавьте поле для ввода) - PreparatoryWorkStatus.None, // Status (если нужно, добавьте поле для ввода) + var preparatoryWork = PreparatoryWork.CreateOperation( + 0, + -1, + DateTime.Now, + DateTime.Now, + PreparatoryWorkStatus.None, preparatoryWorkPlanes ); @@ -179,7 +179,7 @@ public partial class FormPreparatoryWorks : Form var planeId = Convert.ToInt32(row.Cells["ColumnPlane"].Value); var count = Convert.ToInt32(row.Cells["ColumnCount"].Value); - list.Add(PreparatoryWorkPlane.CreateElement(0, -1, planeId, count)); + list.Add(PreparatoryWorkPlane.CreateOperation(0, -1, planeId, count)); } return list; } diff --git a/ProjectAirline/Forms/FormTicket.cs b/ProjectAirline/Forms/FormTicket.cs index 1ff11ce..279236d 100644 --- a/ProjectAirline/Forms/FormTicket.cs +++ b/ProjectAirline/Forms/FormTicket.cs @@ -93,7 +93,7 @@ public partial class FormTicket : Form private Ticket CreateTicket(int id) { var status = GetTicketStatusFromCheckedListBox(); - return Ticket.CreateTicket(id, status); + return Ticket.CreateEntity(id, status); } private TicketStatus GetTicketStatusFromCheckedListBox() diff --git a/ProjectAirline/Repositories/IFlightRepository.cs b/ProjectAirline/Repositories/IFlightRepository.cs index 71edc84..0c7d3e7 100644 --- a/ProjectAirline/Repositories/IFlightRepository.cs +++ b/ProjectAirline/Repositories/IFlightRepository.cs @@ -17,10 +17,6 @@ public interface IFlightRepository //IEnumerable ReadFlights(); - - - //void CreateFlight(Flight flight); - void UpdateFlight(Flight flight); void DeleteFlight(int id); diff --git a/ProjectAirline/Repositories/IPreparatoryWorkRepository.cs b/ProjectAirline/Repositories/IPreparatoryWorkRepository.cs index 581a811..e6bcb72 100644 --- a/ProjectAirline/Repositories/IPreparatoryWorkRepository.cs +++ b/ProjectAirline/Repositories/IPreparatoryWorkRepository.cs @@ -14,8 +14,6 @@ public interface IPreparatoryWorkRepository void CreatePreparatoryWork(PreparatoryWork preparatoryWork); - void UpdatePreparatoryWork(PreparatoryWork preparatoryWork); - void DeletePreparatoryWork(int id); PreparatoryWork ReadPreparatoryWorkById(int id); diff --git a/ProjectAirline/Repositories/Implementations/FlightRepository.cs b/ProjectAirline/Repositories/Implementations/FlightRepository.cs index c82dcab..649f2e3 100644 --- a/ProjectAirline/Repositories/Implementations/FlightRepository.cs +++ b/ProjectAirline/Repositories/Implementations/FlightRepository.cs @@ -25,7 +25,7 @@ public class FlightRepository : IFlightRepository public Flight ReadFlightById(int id) { - return Flight.CreateFlight(0, DateTime.Now, DateTime.Now, string.Empty, 0); + return Flight.CreateOperation(0, DateTime.Now, DateTime.Now, string.Empty, 0); } //public IEnumerable ReadFlights() diff --git a/ProjectAirline/Repositories/Implementations/PassangerRepository.cs b/ProjectAirline/Repositories/Implementations/PassangerRepository.cs index cb810da..8b89e60 100644 --- a/ProjectAirline/Repositories/Implementations/PassangerRepository.cs +++ b/ProjectAirline/Repositories/Implementations/PassangerRepository.cs @@ -19,7 +19,7 @@ public class PassangerRepository : IPassangerRepository public Passanger ReadPassangerById(int id) { - return Passanger.CreatePassanger(0, string.Empty, string.Empty); + return Passanger.CreateEntity(0, string.Empty, string.Empty); } public IEnumerable ReadPassangers() diff --git a/ProjectAirline/Repositories/Implementations/PlaneRepository.cs b/ProjectAirline/Repositories/Implementations/PlaneRepository.cs index 6dcac8f..137a948 100644 --- a/ProjectAirline/Repositories/Implementations/PlaneRepository.cs +++ b/ProjectAirline/Repositories/Implementations/PlaneRepository.cs @@ -18,7 +18,7 @@ public class PlaneRepository : IPlaneRepository public Plane ReadPlaneById(int id) { - return Plane.CreatePlane(0, string.Empty, 0); + return Plane.CreateEntity(0, string.Empty, 0); } public IEnumerable ReadPlanes() diff --git a/ProjectAirline/Repositories/Implementations/PreparatoryWorkRepository.cs b/ProjectAirline/Repositories/Implementations/PreparatoryWorkRepository.cs index 99db6ca..929c5db 100644 --- a/ProjectAirline/Repositories/Implementations/PreparatoryWorkRepository.cs +++ b/ProjectAirline/Repositories/Implementations/PreparatoryWorkRepository.cs @@ -20,12 +20,9 @@ public class PreparatoryWorkRepository : IPreparatoryWorkRepository public void UpdatePreparatoryWork(PreparatoryWork preparatoryWork) { } - - - public PreparatoryWork ReadPreparatoryWorkById(int id) { - return PreparatoryWork.CreatePreparatoryWork(0, 0, DateTime.Now, DateTime.Now, 0); + return PreparatoryWork.CreateOperation(0, 0, DateTime.Now, DateTime.Now, 0, []); } public IEnumerable ReadPreparatoryWork(DateTime? dateFrom = null, int? planeId = null, int? flightId = null, DateTime? dateTo = null, int? preparatoryWorkId = null, PreparatoryWork? preparatoryWorkStatus = null) diff --git a/ProjectAirline/Repositories/Implementations/TicketRepository.cs b/ProjectAirline/Repositories/Implementations/TicketRepository.cs index 3f5eff7..90c5857 100644 --- a/ProjectAirline/Repositories/Implementations/TicketRepository.cs +++ b/ProjectAirline/Repositories/Implementations/TicketRepository.cs @@ -19,7 +19,7 @@ public class TicketRepository : ITicketRepository public Ticket ReadTicketById(int id) { - return Ticket.CreateTicket(0, 0); + return Ticket.CreateEntity(0, 0); } public IEnumerable ReadTickets()