From 152ff268651b7fa1e642e38fbbd4abe40a3a182d Mon Sep 17 00:00:00 2001 From: Aidar Date: Fri, 6 Dec 2024 22:16:50 +0400 Subject: [PATCH] =?UTF-8?q?=20=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=961=20(=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=203)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectAutoenterprise/Entities/Enums/BusColors.cs | 11 ++++++----- .../ProjectAutoenterprise/Entities/Itinerary.cs | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Enums/BusColors.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Enums/BusColors.cs index aed0daa..10a71d3 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Enums/BusColors.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Enums/BusColors.cs @@ -3,9 +3,10 @@ [Flags] public enum BusColors { - White = 0, - Yellow = 1, - Black = 2, - Blue = 4, - Green = 8 + None = 0, + White = 1, + Yellow = 2, + Black = 4, + Blue = 8, + Green = 16 } \ No newline at end of file diff --git a/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Itinerary.cs b/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Itinerary.cs index f39a68b..dcf4aac 100644 --- a/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Itinerary.cs +++ b/ProjectAutoenterprise/ProjectAutoenterprise/Entities/Itinerary.cs @@ -7,20 +7,20 @@ public class Itinerary { public int Id { get; private set; } public int BusId { get; private set; } - public IEnumerable ItineraryRoute { get; private set; } = []; + public IEnumerable ItineraryRoutes { get; private set; } = []; public int DriverId { get; private set; } public int ConductorId { get; private set; } public DateTime ItineraryDate { get; private set; } public string Description { get; private set; } = string.Empty; public static Itinerary CreateOperation(int id, int busId, int driverId, int conductorId, DateTime itineraryDate, string description, - IEnumerable itineraryRoute) + IEnumerable itineraryRoutes) { return new Itinerary { Id = id, BusId = busId, - ItineraryRoute = itineraryRoute, + ItineraryRoutes = itineraryRoutes, DriverId = driverId, ConductorId = conductorId, ItineraryDate = itineraryDate,