diff --git a/oop/NormfallStudie/Plattform/Helper/EntitiesContextInitializer.cs b/oop/NormfallStudie/Plattform/Helper/EntitiesContextInitializer.cs index 97c0f2d..913b1de 100644 --- a/oop/NormfallStudie/Plattform/Helper/EntitiesContextInitializer.cs +++ b/oop/NormfallStudie/Plattform/Helper/EntitiesContextInitializer.cs @@ -7,14 +7,18 @@ namespace Plattform.Helper { protected override void Seed(Context context) { - var cities = GenerateData.CreateCities(); + //var cities = GenerateData.CreateCities(); + var types = GenerateData.CreateRoomTypes(); - foreach (var c in cities) + //foreach (var c in cities) + //{ + // context.Cities.Add(c); + //} + foreach (var t in types) { - context.Cities.Add(c); + context.RoomTypes.Add(t); } context.SaveChanges(); - } } } \ No newline at end of file diff --git a/oop/NormfallStudie/Plattform/Helper/GenerateData.cs b/oop/NormfallStudie/Plattform/Helper/GenerateData.cs index 5cd7b38..86fa81d 100644 --- a/oop/NormfallStudie/Plattform/Helper/GenerateData.cs +++ b/oop/NormfallStudie/Plattform/Helper/GenerateData.cs @@ -7,9 +7,30 @@ namespace Plattform.Helper { public static class GenerateData { - private static ICollection Cities; - public static ICollection CreateCities() + private static List Cities = new List(); + private static List RoomTypes = new List(); + private static List ListRoomTypes = new List(new string[] { + "Single Bed", "Double Bed", "Suite" + }); + private static List ListCities = new List(new string[] + { + "Bern" + }); + public static List CreateRoomTypes() + { + foreach (var item in ListRoomTypes) + { + RoomTypes.Add(new RoomType(item)); + } + return RoomTypes; + } + public static List CreateCities() + { + foreach (var item in ListCities) + { + Cities.Add(new City(item, 3300, "xtz")); + } return Cities; } } diff --git a/oop/NormfallStudie/Plattform/Models/Airline.cs b/oop/NormfallStudie/Plattform/Models/Airline.cs index 1461185..21b481f 100644 --- a/oop/NormfallStudie/Plattform/Models/Airline.cs +++ b/oop/NormfallStudie/Plattform/Models/Airline.cs @@ -19,4 +19,4 @@ namespace Plattform.Models this.Name = airline.Name; } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/Availability.cs b/oop/NormfallStudie/Plattform/Models/Availability.cs index c866505..cec46a4 100644 --- a/oop/NormfallStudie/Plattform/Models/Availability.cs +++ b/oop/NormfallStudie/Plattform/Models/Availability.cs @@ -13,6 +13,10 @@ namespace Plattform.Models public DateTime From { get; set; } [DataMember] public DateTime To { get; set; } + [DataMember] + bool Reserved { get; set; } + [DataMember] + bool Booked { get; set; } public ICollection Rooms { get; set; } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/City.cs b/oop/NormfallStudie/Plattform/Models/City.cs index 7f3c512..ededc14 100644 --- a/oop/NormfallStudie/Plattform/Models/City.cs +++ b/oop/NormfallStudie/Plattform/Models/City.cs @@ -13,5 +13,12 @@ namespace Plattform.Models public int ZipCode { get; set; } [DataMember] public string ShortName { get; set; } + public City() { } + public City(string name, int zipCode, string shortName) + { + this.Name = name; + this.ZipCode = zipCode; + this.ShortName = shortName; + } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/Flight.cs b/oop/NormfallStudie/Plattform/Models/Flight.cs index d189815..ec7876d 100644 --- a/oop/NormfallStudie/Plattform/Models/Flight.cs +++ b/oop/NormfallStudie/Plattform/Models/Flight.cs @@ -31,4 +31,4 @@ namespace Plattform.Models this.ToCityShortName = flight.ToCityShortName; } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/Hotel.cs b/oop/NormfallStudie/Plattform/Models/Hotel.cs index 1405a22..8fa77a2 100644 --- a/oop/NormfallStudie/Plattform/Models/Hotel.cs +++ b/oop/NormfallStudie/Plattform/Models/Hotel.cs @@ -12,4 +12,4 @@ namespace Plattform.Models [DataMember] public City City { get; set; } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/Room.cs b/oop/NormfallStudie/Plattform/Models/Room.cs index 128ad56..f91910f 100644 --- a/oop/NormfallStudie/Plattform/Models/Room.cs +++ b/oop/NormfallStudie/Plattform/Models/Room.cs @@ -15,4 +15,4 @@ namespace Plattform.Models [DataMember] public ICollection Availability { get; set; } } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/RoomAvailability.cs b/oop/NormfallStudie/Plattform/Models/RoomAvailability.cs index 36fc5a9..412350c 100644 --- a/oop/NormfallStudie/Plattform/Models/RoomAvailability.cs +++ b/oop/NormfallStudie/Plattform/Models/RoomAvailability.cs @@ -2,9 +2,14 @@ namespace Plattform.Models { + [DataContract] public class RoomAvailability { + [DataMember] public Room Room; + [DataMember] public Availability Availability; + [DataMember] + public Customer Customer; } -} \ No newline at end of file +} diff --git a/oop/NormfallStudie/Plattform/Models/RoomType.cs b/oop/NormfallStudie/Plattform/Models/RoomType.cs index e98234c..733b683 100644 --- a/oop/NormfallStudie/Plattform/Models/RoomType.cs +++ b/oop/NormfallStudie/Plattform/Models/RoomType.cs @@ -9,5 +9,10 @@ namespace Plattform.Models public int RoomTypeID { get; set; } [DataMember] public string Name { get; set; } + public RoomType() { } + public RoomType(string name) + { + this.Name = name; + } } -} \ No newline at end of file +}