From 3259ac446bd4683d4e586fd6d921f188d8f155b6 Mon Sep 17 00:00:00 2001 From: ikswi Date: Thu, 19 Dec 2024 05:27:36 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Trip.cs | 6 +-- .../Forms/FormTrip.Designer.cs | 50 ++++++++++++++++++- .../Forms/FormTrip.cs | 2 +- .../Forms/FormTrip.resx | 4 +- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs index d2aebdd..43f2d65 100644 --- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs +++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Entities/Trip.cs @@ -14,13 +14,13 @@ public class Trip public int Route_Id { get; private set; } public int Bus_Id { get; private set; } - public static Trip CreateOperation(int id, int route_Id, int bus_Id) + public static Trip CreateOperation(int id, int route_Id, int bus_Id, DateTime departure, DateTime arrival) { return new Trip { Id = id, - Departure = DateTime.Now, - Arrival = DateTime.Now, + Departure = departure, + Arrival = arrival, Route_Id = route_Id, Bus_Id = bus_Id }; diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs index ce38c23..74a7be8 100644 --- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs +++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.Designer.cs @@ -34,6 +34,10 @@ labelRoute = new Label(); buttonSave = new Button(); buttonCancel = new Button(); + label2 = new Label(); + label1 = new Label(); + dateTimePickerEnd = new DateTimePicker(); + dateTimePickerStart = new DateTimePicker(); SuspendLayout(); // // comboBoxRoute @@ -72,7 +76,7 @@ // // buttonSave // - buttonSave.Location = new Point(43, 225); + buttonSave.Location = new Point(41, 260); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(94, 29); buttonSave.TabIndex = 6; @@ -82,7 +86,7 @@ // // buttonCancel // - buttonCancel.Location = new Point(214, 225); + buttonCancel.Location = new Point(212, 260); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(94, 29); buttonCancel.TabIndex = 7; @@ -90,11 +94,49 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(21, 212); + label2.Name = "label2"; + label2.Size = new Size(115, 20); + label2.TabIndex = 15; + label2.Text = "Дата прибытия"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(21, 159); + label1.Name = "label1"; + label1.Size = new Size(110, 20); + label1.TabIndex = 14; + label1.Text = "Дата отправки"; + // + // dateTimePickerEnd + // + dateTimePickerEnd.Location = new Point(168, 204); + dateTimePickerEnd.Margin = new Padding(3, 4, 3, 4); + dateTimePickerEnd.Name = "dateTimePickerEnd"; + dateTimePickerEnd.Size = new Size(177, 27); + dateTimePickerEnd.TabIndex = 13; + // + // dateTimePickerStart + // + dateTimePickerStart.Location = new Point(168, 151); + dateTimePickerStart.Margin = new Padding(3, 4, 3, 4); + dateTimePickerStart.Name = "dateTimePickerStart"; + dateTimePickerStart.Size = new Size(177, 27); + dateTimePickerStart.TabIndex = 12; + // // FormTrip // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(418, 315); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(dateTimePickerEnd); + Controls.Add(dateTimePickerStart); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(labelRoute); @@ -115,5 +157,9 @@ private Label labelRoute; private Button buttonSave; private Button buttonCancel; + private Label label2; + private Label label1; + private DateTimePicker dateTimePickerEnd; + private DateTimePicker dateTimePickerStart; } } \ No newline at end of file diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs index 98429d3..f6c63ea 100644 --- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs +++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.cs @@ -35,7 +35,7 @@ namespace ProjectPassengerTransfers.Forms { throw new Exception("Имеются незаполненные поля"); } - _tripRepository.CreateTrip(Trip.CreateOperation(0, (int)comboBoxRoute.SelectedValue!, (int)comboBoxBus.SelectedValue!)); + _tripRepository.CreateTrip(Trip.CreateOperation(0, (int)comboBoxRoute.SelectedValue!, (int)comboBoxBus.SelectedValue!, dateTimePickerStart.Value.Date, dateTimePickerEnd.Value.Date)); Close(); } catch (Exception ex) diff --git a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx index af32865..8b2ff64 100644 --- a/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx +++ b/ProjectPassengerTransfers/ProjectPassengerTransfers/Forms/FormTrip.resx @@ -1,7 +1,7 @@