diff --git a/demoBicycle/App.axaml b/demoBicycle/App.axaml index 3c668ba..4311da9 100644 --- a/demoBicycle/App.axaml +++ b/demoBicycle/App.axaml @@ -1,7 +1,7 @@  + RequestedThemeVariant="Light"> diff --git a/demoBicycle/Assets/icon.png b/demoBicycle/Assets/icon.png new file mode 100644 index 0000000..4fbf034 Binary files /dev/null and b/demoBicycle/Assets/icon.png differ diff --git a/demoBicycle/Images/1.JPG b/demoBicycle/Images/1.JPG new file mode 100644 index 0000000..8bcc287 Binary files /dev/null and b/demoBicycle/Images/1.JPG differ diff --git a/demoBicycle/Images/10.JPG b/demoBicycle/Images/10.JPG new file mode 100644 index 0000000..6063dab Binary files /dev/null and b/demoBicycle/Images/10.JPG differ diff --git a/demoBicycle/Images/2.JPG b/demoBicycle/Images/2.JPG new file mode 100644 index 0000000..e051499 Binary files /dev/null and b/demoBicycle/Images/2.JPG differ diff --git a/demoBicycle/Images/3.JPG b/demoBicycle/Images/3.JPG new file mode 100644 index 0000000..737f89b Binary files /dev/null and b/demoBicycle/Images/3.JPG differ diff --git a/demoBicycle/Images/4.JPG b/demoBicycle/Images/4.JPG new file mode 100644 index 0000000..464460e Binary files /dev/null and b/demoBicycle/Images/4.JPG differ diff --git a/demoBicycle/Images/5.JPG b/demoBicycle/Images/5.JPG new file mode 100644 index 0000000..b9524e7 Binary files /dev/null and b/demoBicycle/Images/5.JPG differ diff --git a/demoBicycle/Images/6.JPG b/demoBicycle/Images/6.JPG new file mode 100644 index 0000000..d94b735 Binary files /dev/null and b/demoBicycle/Images/6.JPG differ diff --git a/demoBicycle/Images/7.JPG b/demoBicycle/Images/7.JPG new file mode 100644 index 0000000..2ec95e9 Binary files /dev/null and b/demoBicycle/Images/7.JPG differ diff --git a/demoBicycle/Images/8.JPG b/demoBicycle/Images/8.JPG new file mode 100644 index 0000000..bdc94f6 Binary files /dev/null and b/demoBicycle/Images/8.JPG differ diff --git a/demoBicycle/Images/9.JPG b/demoBicycle/Images/9.JPG new file mode 100644 index 0000000..fbdebf9 Binary files /dev/null and b/demoBicycle/Images/9.JPG differ diff --git a/demoBicycle/Images/picture.png b/demoBicycle/Images/picture.png new file mode 100644 index 0000000..1cd0789 Binary files /dev/null and b/demoBicycle/Images/picture.png differ diff --git a/demoBicycle/MainWindow.axaml b/demoBicycle/MainWindow.axaml deleted file mode 100644 index 98e547d..0000000 --- a/demoBicycle/MainWindow.axaml +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/demoBicycle/MainWindow.axaml.cs b/demoBicycle/MainWindow.axaml.cs deleted file mode 100644 index b2fb688..0000000 --- a/demoBicycle/MainWindow.axaml.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Avalonia.Controls; - -namespace demoBicycle; - -public partial class MainWindow : Window -{ - public MainWindow() - { - InitializeComponent(); - } -} \ No newline at end of file diff --git a/demoBicycle/Models/Adress.cs b/demoBicycle/Models/Adress.cs index 1075945..dfb4cb9 100644 --- a/demoBicycle/Models/Adress.cs +++ b/demoBicycle/Models/Adress.cs @@ -16,4 +16,12 @@ public partial class Adress public string HouseNumber { get; set; } = null!; public virtual ICollection Orders { get; set; } = new List(); + + public string AllAdress + { + get + { + return $"г. {CityName}, ул. {StreetName}, {HouseNumber}"; + } + } } diff --git a/demoBicycle/Models/Order.cs b/demoBicycle/Models/Order.cs index 64794a5..1391ee9 100644 --- a/demoBicycle/Models/Order.cs +++ b/demoBicycle/Models/Order.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; namespace demoBicycle.Models; @@ -26,4 +27,18 @@ public partial class Order public virtual OrderType OrderType { get; set; } = null!; public virtual User User { get; set; } = null!; + + [NotMapped] + public DateTimeOffset DateTimeOffsetOrder + { + get => new(OrderDate.ToDateTime(TimeOnly.MinValue)); + set => OrderDate = DateOnly.FromDateTime(value.DateTime); + } + + [NotMapped] + public DateTimeOffset DateTimeOffsetDelivery + { + get => new(OrderDeliviry.ToDateTime(TimeOnly.MinValue)); + set => OrderDeliviry = DateOnly.FromDateTime(value.DateTime); + } } diff --git a/demoBicycle/Models/OrderType.cs b/demoBicycle/Models/OrderType.cs index ad05f41..539c547 100644 --- a/demoBicycle/Models/OrderType.cs +++ b/demoBicycle/Models/OrderType.cs @@ -10,4 +10,8 @@ public partial class OrderType public string OrderTypeName { get; set; } = null!; public virtual ICollection Orders { get; set; } = new List(); + public override string ToString() + { + return OrderTypeName; + } } diff --git a/demoBicycle/Models/User.cs b/demoBicycle/Models/User.cs index 61ccaed..0a3f416 100644 --- a/demoBicycle/Models/User.cs +++ b/demoBicycle/Models/User.cs @@ -18,4 +18,8 @@ public partial class User public virtual ICollection Orders { get; set; } = new List(); public virtual UserType UserType { get; set; } = null!; + public override string ToString() + { + return UserName; + } } diff --git a/demoBicycle/Windows/MainWindow.axaml b/demoBicycle/Windows/MainWindow.axaml new file mode 100644 index 0000000..249dc17 --- /dev/null +++ b/demoBicycle/Windows/MainWindow.axaml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + +