From 07835de7ef9adbc154c4056757da1770c8fedbb1 Mon Sep 17 00:00:00 2001 From: sheymuh Date: Wed, 20 Nov 2024 12:31:41 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D0=B5=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D1=87=D0=B8?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Bus.cs | 6 +++--- .../Entities/Enums/BusType.cs | 10 ---------- .../Forms/FormBus.Designer.cs | 19 +++++++++---------- .../Forms/FormBus.cs | 7 +++---- 4 files changed, 15 insertions(+), 27 deletions(-) delete mode 100644 ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Enums/BusType.cs diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Bus.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Bus.cs index b0166a1..ed89d0c 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Bus.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Bus.cs @@ -8,15 +8,15 @@ public class Bus public string LicensePlate { get; private set; } = string.Empty; - public BusType Type { get; private set; } + public string Model { get; private set; } = string.Empty; - public static Bus CreateEntity(int id, string licensePlate, BusType type) + public static Bus CreateEntity(int id, string licensePlate, string model) { return new Bus { Id = id, LicensePlate = licensePlate, - Type = type + Model = model }; } } diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Enums/BusType.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Enums/BusType.cs deleted file mode 100644 index 847aaec..0000000 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Entities/Enums/BusType.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectPassengerTransportation.Entities.Enums; - -public enum BusType -{ - None = 0, - - Bus = 1, - - Minibus = 2 -} diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.Designer.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.Designer.cs index d1e31f3..943e85e 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.Designer.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.Designer.cs @@ -33,7 +33,7 @@ labelBusTypeName = new Label(); buttonSave = new Button(); buttonCancel = new Button(); - comboBoxBusType = new ComboBox(); + textBoxModel = new TextBox(); SuspendLayout(); // // labelLicensePlate @@ -84,21 +84,20 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; // - // comboBoxBusType + // textBoxModel // - comboBoxBusType.DropDownStyle = ComboBoxStyle.DropDownList; - comboBoxBusType.FormattingEnabled = true; - comboBoxBusType.Location = new Point(231, 96); - comboBoxBusType.Name = "comboBoxBusType"; - comboBoxBusType.Size = new Size(240, 38); - comboBoxBusType.TabIndex = 8; + textBoxModel.Location = new Point(231, 96); + textBoxModel.MaxLength = 10; + textBoxModel.Name = "textBoxModel"; + textBoxModel.Size = new Size(240, 35); + textBoxModel.TabIndex = 8; // // FormBus // AutoScaleDimensions = new SizeF(12F, 30F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(506, 226); - Controls.Add(comboBoxBusType); + Controls.Add(textBoxModel); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(labelBusTypeName); @@ -118,6 +117,6 @@ private Label labelBusTypeName; private Button buttonSave; private Button buttonCancel; - private ComboBox comboBoxBusType; + private TextBox textBoxModel; } } \ No newline at end of file diff --git a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.cs b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.cs index de4146e..2034708 100644 --- a/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.cs +++ b/ProjectPassengerTransportation/ProjectPassengerTransportation/Forms/FormBus.cs @@ -23,7 +23,7 @@ namespace ProjectPassengerTransportation.Forms } textBoxLicensePlate.Text = bus.LicensePlate; - comboBoxBusType.SelectedItem = bus.Type; + comboBoxBusType.SelectedItem = bus.Model; _busId = value; } catch (Exception ex) @@ -38,14 +38,13 @@ namespace ProjectPassengerTransportation.Forms { InitializeComponent(); _busRepository = busRepository ?? throw new ArgumentNullException(nameof(busRepository)); - comboBoxBusType.DataSource = Enum.GetValues(typeof(BusType)); } private void ButtonSave_Click(object sender, EventArgs e) { try { - if (string.IsNullOrWhiteSpace(textBoxLicensePlate.Text) || comboBoxBusType.SelectedIndex < 1) + if (string.IsNullOrWhiteSpace(textBoxLicensePlate.Text) || string.IsNullOrWhiteSpace(textBoxModel.Text)) { throw new Exception("Имеются незаполненные поля"); } @@ -69,6 +68,6 @@ namespace ProjectPassengerTransportation.Forms private void ButtonCancel_Click(object sender, EventArgs e) => Close(); - private Bus CreateBus(int id) => Bus.CreateEntity(id, textBoxLicensePlate.Text, (BusType)comboBoxBusType.SelectedItem!); + private Bus CreateBus(int id) => Bus.CreateEntity(id, textBoxLicensePlate.Text, textBoxModel.Text); } }