diff --git a/AsyncInn.Test/AsyncInn.Test.csproj b/AsyncInn.Test/AsyncInn.Test.csproj index 09d627f..230d732 100644 --- a/AsyncInn.Test/AsyncInn.Test.csproj +++ b/AsyncInn.Test/AsyncInn.Test.csproj @@ -7,9 +7,16 @@ - - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/AsyncInn.Web/AsyncInn.Web.csproj b/AsyncInn.Web/AsyncInn.Web.csproj index 2ccf178..d9cd945 100644 --- a/AsyncInn.Web/AsyncInn.Web.csproj +++ b/AsyncInn.Web/AsyncInn.Web.csproj @@ -5,6 +5,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/AsyncInn/AsyncInn.csproj b/AsyncInn/AsyncInn.csproj index 3bceb19..cf5fa39 100644 --- a/AsyncInn/AsyncInn.csproj +++ b/AsyncInn/AsyncInn.csproj @@ -1,4 +1,4 @@ - + netcoreapp3.1 @@ -40,14 +40,17 @@ - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/AsyncInn/Models/Department.cs b/AsyncInn/Models/Department.cs new file mode 100644 index 0000000..017ddcc --- /dev/null +++ b/AsyncInn/Models/Department.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace AsyncInn.Models +{ + public class Department + { + public long Id { get;set;} + + public long Hotel_Id { get; set; } + + public Hotel Hotel { get; set; } + + public string Name { get; set; } + + public string PhoneNumber { get; set; } + + public string ExtensionNumber { get; set; } + + public string Responsibilities { get; set; } + + public ICollection Employees { get; set; } + } +} diff --git a/AsyncInn/Models/Employee.cs b/AsyncInn/Models/Employee.cs new file mode 100644 index 0000000..cd0fbbd --- /dev/null +++ b/AsyncInn/Models/Employee.cs @@ -0,0 +1,42 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace AsyncInn.Models +{ + public class Employee + { + public long Id { get; set; } + + public long Department_Id { get; set; } + + public Department Department { get; set; } + + public string FirstName { get; set; } + + public string LastName { get; set; } + + [DataType(DataType.Date)] + public DateTime BirthDate { get; set; } + + public string StreetAddress { get; set; } + + public string City { get; set; } + + public string State { get; set; } + + public string Country { get; set; } + + public string PostalCode { get; set; } + + [Phone] + public string PrimaryContactNumber { get; set; } + + [Phone] + public string MobileNumber { get; set; } + + [Phone] + public string EmergencyContactNumber { get; set; } + + + } +} \ No newline at end of file diff --git a/AsyncInn/Models/HotelRoom.cs b/AsyncInn/Models/HotelRoom.cs index 1b3ec21..5afab38 100644 --- a/AsyncInn/Models/HotelRoom.cs +++ b/AsyncInn/Models/HotelRoom.cs @@ -18,6 +18,8 @@ public class HotelRoom [Required] [Display(Name = "Rate")] + [DataType(DataType.Currency)] + [DisplayFormat(DataFormatString ="{0:C2}")] public decimal Rate { get; set; } //Refrences to other tables