добавление

travel/Models/Hotel.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using travel.ViewModels;
 
 namespace travel.Models;
@@ -59,5 +60,12 @@ public partial class Hotel
             return "Нет страны";
         }
     }
-    public string CountTour => Tours.Count.ToString();
+    public int CountTour
+    {
+        get
+        {
+            int tours = MainWindowViewModel.myConnection.Tours.Include(x => x.Hotels).Where(x => x.Hotels.Where(x => x.Name == Name).Count() != 0).Count();
+            return tours;
+        }
+    }
 }

travel/ViewModels/HotelCardViewModel.cs

@@ -0,0 +1,173 @@
+using ReactiveUI;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tmds.DBus.Protocol;
+using travel.Models;
+using travel.Views;
+
+namespace travel.ViewModels
+{
+    public class HotelCardViewModel : ReactiveObject
+    {
+        Hotel hotelEdit = new Hotel();
+        bool state = false;
+        string title = "";
+        string description = "";
+        string star1 = "☆";
+        string star2 = "☆";
+        string star3 = "☆";
+        string star4 = "☆";
+        string star5 = "☆";
+        List<String> countries = MainWindowViewModel.myConnection.Countries.Select(x => x.Name).ToList();
+        string select = "Russia";
+        string message = "";
+        int starCount = 0;
+
+        public List<String> ListCountry { get => countries; }
+        public string SelectCountry { get => select; set { this.RaiseAndSetIfChanged(ref select, value); } }
+        public string TitleHotel { get => title; set { this.RaiseAndSetIfChanged(ref title, value); } }
+        public string Message { get => message; set { this.RaiseAndSetIfChanged(ref message, value); } }
+        public string DescriptionHotel { get => description; set { this.RaiseAndSetIfChanged(ref description, value); } }
+        public string Star1 { get => star1; set { this.RaiseAndSetIfChanged(ref star1, value); } }
+        public string Star2 { get => star2; set { this.RaiseAndSetIfChanged(ref star2, value); } }
+        public string Star3 { get => star3; set { this.RaiseAndSetIfChanged(ref star3, value); } }
+        public string Star4 { get => star4; set { this.RaiseAndSetIfChanged(ref star4, value); } }
+        public string Star5 { get => star5; set { this.RaiseAndSetIfChanged(ref star5, value); } }
+
+
+        public HotelCardViewModel(int IDhotel)
+        {
+            state = true;
+            hotelEdit = MainWindowViewModel.myConnection.Hotels.FirstOrDefault(x => x.Id == IDhotel);
+            TitleHotel = hotelEdit.Name;
+            DescriptionHotel = hotelEdit.Description;
+            Country c = MainWindowViewModel.myConnection.Countries.FirstOrDefault(x => x.Code == hotelEdit.CountryCode);
+            SelectCountry = c.Name;
+            switch(hotelEdit.CountOfStars)
+            {
+                case 1:
+                    SelectStar1();
+                    break;
+                case 2:
+                    SelectStar2();
+                    break;
+                case 3:
+                    SelectStar3();
+                    break;
+                case 4:
+                    SelectStar4();
+                    break;
+                case 5:
+                    SelectStar5();
+                    break;
+                default:
+                    SelectStar0();
+                    break;
+            }
+        }
+        public HotelCardViewModel()
+        {
+            
+        }
+        public async Task SelectStar1()
+        {
+            Star1 = "★";
+            Star2 = "☆";
+            Star3 = "☆";
+            Star4 = "☆";
+            Star5 = "☆";
+            starCount = 1;
+        }
+        public async Task SelectStar2()
+        {
+            Star1 = "★";
+            Star2 = "★";
+            Star3 = "☆";
+            Star4 = "☆";
+            Star5 = "☆";
+            starCount = 2;
+        }
+        public async Task SelectStar3()
+        {
+            Star1 = "★";
+            Star2 = "★";
+            Star3 = "★";
+            Star4 = "☆";
+            Star5 = "☆";
+            starCount = 3;
+        }
+        public async Task SelectStar4()
+        {
+            Star1 = "★";
+            Star2 = "★";
+            Star3 = "★";
+            Star4 = "★";
+            Star5 = "☆";
+            starCount = 4;
+        }
+        public async Task SelectStar5()
+        {
+            Star1 = "★";
+            Star2 = "★";
+            Star3 = "★";
+            Star4 = "★";
+            Star5 = "★";
+            starCount = 5;
+        }
+        public async Task SelectStar0()
+        {
+            Star1 = "☆";
+            Star2 = "☆";
+            Star3 = "☆";
+            Star4 = "☆";
+            Star5 = "☆";
+            starCount = 0;
+        }
+        public async Task SaveCard()
+        {
+            try
+            {
+                Country c = MainWindowViewModel.myConnection.Countries.FirstOrDefault(x => x.Name == select);
+                if (!state)
+                {
+                    int h = MainWindowViewModel.myConnection.Hotels.OrderBy(x => x.Id).Last().Id + 1;
+                    if (TitleHotel.Length > 0)
+                    {
+                        Hotel newHotel = new Hotel()
+                        {
+                            Id = MainWindowViewModel.myConnection.Hotels.OrderBy(x => x.Id).Last().Id + 1,
+                            Name = TitleHotel,
+                            Description = DescriptionHotel,
+                            CountOfStars = starCount,
+                            CountryCode = c.Code
+                        };
+                        MainWindowViewModel.myConnection.Hotels.Add(newHotel);
+                        MainWindowViewModel.myConnection.SaveChanges();
+                        Message = "Отель добавлен";
+                    }
+                    else Message = "Отель не добавлен. Укажите название";
+                }
+                else
+                {
+                    if (TitleHotel.Length > 0)
+                    {
+                        hotelEdit.Name = TitleHotel;
+                        hotelEdit.Description = DescriptionHotel;
+                        hotelEdit.CountOfStars = starCount;
+                        hotelEdit.CountryCode = c.Code;
+                        MainWindowViewModel.myConnection.SaveChanges();
+                        Message = "Данные изменены";
+                    }
+                    else Message = "Отель не изменен. Укажите название";
+                }
+            }
+            catch
+            {
+                Message = "Не удалось добавить отель";
+            }
+        }
+    }
+}

travel/ViewModels/MainWindowViewModel.cs

@@ -16,17 +16,33 @@ namespace travel.ViewModels
         public UserControl US { get => us; set => this.RaiseAndSetIfChanged(ref us, value); }
         ToursPageViewModel tPVMl1VM = new();
         public ToursPageViewModel TP_VM { get => tPVMl1VM; set => tPVMl1VM = value; }
-        HotelPageViewModel hpVM = new HotelPageViewModel();
 
+        HotelPageViewModel hpVM = new HotelPageViewModel();
         public HotelPageViewModel hp_VM { get => hpVM; set => hpVM = value; }
 
+        HotelCardViewModel hcVM = new HotelCardViewModel();
+        public HotelCardViewModel hc_VM { get => hcVM; set => hcVM = value; }
+
+
         public void GoPageHotel()
         {
+            hp_VM = new HotelPageViewModel();
             US = new HotelPage();
         }
         public void GoPageTour()
         {
+            TP_VM = new ToursPageViewModel();
             US = new ToursPage();
         }
+        public void GoHotelCard()
+        {
+            hc_VM = new HotelCardViewModel();
+            US = new HotelCard();
+        }
+        public void GoHotelCardChange(int ID)
+        {
+            hc_VM = new HotelCardViewModel(ID);
+            US = new HotelCard();
+        }
     }
 }

travel/Views/HotelCard.axaml

@@ -0,0 +1,49 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="travel.HotelCard"
+			 xmlns:vm="using:travel.ViewModels"
+			 x:DataType="vm:MainWindowViewModel">
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition/>
+			<RowDefinition Height="0.5*"/>
+			<RowDefinition Height="0.5*"/>
+			<RowDefinition Height="0.5*"/>
+			<RowDefinition Height="0.5*"/>
+			<RowDefinition/>
+			<RowDefinition/>
+		</Grid.RowDefinitions>
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="0.6*"/>
+			<ColumnDefinition/>
+		</Grid.ColumnDefinitions>
+		<StackPanel Orientation="Vertical" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" >
+		<TextBlock Text="Карточка отеля" FontSize="25" HorizontalAlignment="Center"/>
+		<Border BorderBrush="Black" BorderThickness="2" Height="2" Width="550"/>
+		</StackPanel>
+		<TextBlock Text="Название отеля:" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"/>
+		<TextBlock Text="Количество звезд:" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"/>
+		<TextBlock Text="Описание (не обяз):" Grid.Row="3" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"/>
+		<TextBlock Text="Страна:" Grid.Row="4" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,10,0"/>
+		
+		<TextBox Text="{Binding hc_VM.TitleHotel}" Width="350" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap"/>
+		<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" VerticalAlignment="Center">
+			<Button Content="{Binding hc_VM.Star1}" Command="{Binding hc_VM.SelectStar1}" Background="Transparent" FontSize="30" Foreground="#fac716"/>
+			<Button Content="{Binding hc_VM.Star2}" Command="{Binding hc_VM.SelectStar2}" Background="Transparent" FontSize="30" Foreground="#fac716"/>
+			<Button Content="{Binding hc_VM.Star3}" Command="{Binding hc_VM.SelectStar3}" Background="Transparent" FontSize="30" Foreground="#fac716"/>
+			<Button Content="{Binding hc_VM.Star4}" Command="{Binding hc_VM.SelectStar4}" Background="Transparent" FontSize="30" Foreground="#fac716"/>
+			<Button Content="{Binding hc_VM.Star5}" Command="{Binding hc_VM.SelectStar5}" Background="Transparent" FontSize="30" Foreground="#fac716"/>
+		</StackPanel>
+		<TextBox Text="{Binding hc_VM.DescriptionHotel}" Width="350" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" TextWrapping="Wrap"/>
+		<ComboBox ItemsSource="{Binding hc_VM.ListCountry}" SelectedItem="{Binding hc_VM.SelectCountry}" MinWidth="350" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+		<Image Source="/Assets/logo_travel.png" Grid.RowSpan="7" Width="150" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+		<TextBlock Text="{Binding hc_VM.Message}" Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Center"/>
+		<StackPanel Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Center">
+			<Button Content="Сохранить" Margin="10" Command="{Binding hc_VM.SaveCard}" Background="#bae3e8"/>
+			<Button Content="Назад" Margin="10" Command="{Binding GoPageHotel}" Background="#e31e24"/>
+		</StackPanel>
+	</Grid>
+</UserControl>

travel/Views/HotelCard.axaml.cs

@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace travel;
+
+public partial class HotelCard : UserControl
+{
+    public HotelCard()
+    {
+        InitializeComponent();
+    }
+}

travel/Views/HotelPage.axaml

@@ -17,9 +17,13 @@
 			<TextBlock Text="Количество элементов: " VerticalAlignment="Center"/>
 			<TextBox Text="{Binding hp_VM.CountElem}" MaxHeight="10"/>
 		</StackPanel>
-			<Button Content="Туры" Grid.Column="2" Margin="10" Command="{Binding GoPageTour}"/>
+			<Button Content="Туры" Margin="10" Command="{Binding GoPageTour}"/>
 		</StackPanel>
-		<ListBox ItemsSource="{Binding hp_VM.ListHotels}" Grid.Row="1">
+		<StackPanel Grid.Row="1">
+			<Button Content="Добавить" Margin="5" Command="{Binding GoHotelCard}" HorizontalAlignment="Right" Background="#bae3e8"/>
+			<Button Content="Удалить" Margin="5" Command="{Binding GoPageTour}" HorizontalAlignment="Right" Background="#e31e24"/>
+		</StackPanel>
+		<ListBox ItemsSource="{Binding hp_VM.ListHotels}" Grid.Row="1" Margin="100,0">
 			<ListBox.ItemsPanel>
 				<ItemsPanelTemplate>
 					<WrapPanel HorizontalAlignment="Center"/>
@@ -30,9 +34,10 @@
 					<Border CornerRadius="5" BorderBrush="Black" BorderThickness="2" Padding="10">
 						<StackPanel Width="200" >
 							<TextBlock Text="{Binding Name}" TextWrapping="Wrap"/>
-							<TextBlock Text="{Binding StarString}"/>
+							<TextBlock Text="{Binding StarString}" Foreground="#fac716"/>
 							<TextBlock Text="{Binding CountryHotel}"/>
 							<TextBlock Text="{Binding CountTour, StringFormat=Количество туров: {0}}"/>
+							<Button Content="Изменить" Command="{Binding $parent[Window].((vm:MainWindowViewModel)DataContext).GoHotelCardChange}" CommandParameter="{Binding Id}" Background="#bae3e8"/>
 						</StackPanel>
 					</Border>
 				</DataTemplate>
@@ -46,12 +51,12 @@
 					<ColumnDefinition/>
 				</Grid.ColumnDefinitions>
 				<StackPanel Orientation="Horizontal" Margin="5,25">
-				<Button Content="&lt;&lt;" Command="{Binding hp_VM.Start}"/>
-				<Button Content="&lt;" Margin="15,0" Command="{Binding hp_VM.Back}"/>
+				<Button Content="&lt;&lt;" Command="{Binding hp_VM.Start}" Background="#878787"/>
+				<Button Content="&lt;" Margin="15,0" Command="{Binding hp_VM.Back}" Background="#878787"/>
 				</StackPanel>
 				<StackPanel Orientation="Horizontal" Margin="5,25" Grid.Column="2" HorizontalAlignment="Right">
-					<Button Content=">" Margin="15,0" Command="{Binding hp_VM.Next}"/>
-					<Button Content=">>" Command="{Binding hp_VM.End}"/>
+					<Button Content=">" Margin="15,0" Command="{Binding hp_VM.Next}" Background="#878787"/>
+					<Button Content=">>" Command="{Binding hp_VM.End}" Background="#878787"/>
 				</StackPanel>
 				<StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
 					<TextBlock Text="{Binding hp_VM.T1}"/>

travel/Views/MainWindow.axaml

@@ -6,17 +6,19 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="travel.Views.MainWindow"
         x:DataType="vm:MainWindowViewModel"
-        Icon="/Assets/avalonia-logo.ico"
+        Icon="/Assets/logo_travel.png"
         Title="travel"
-		RequestedThemeVariant="Light">
+		RequestedThemeVariant="Light"
+		FontFamily="Comic Sans MS"
+		FontSize="18">
 	<Window.Styles>
 		<Style Selector="TextBlock">
-			<Setter Property="FontSize" Value="16"/>
+			<Setter Property="FontSize" Value="18"/>
 			<Setter Property="Foreground" Value="Black"/>
 		</Style>
 		<Style Selector="Button">
-			<Setter Property="Background" Value="Violet"/>
-			<Setter Property="FontSize" Value="16"/>
+			<Setter Property="Background" Value="#445c93"/>
+			<Setter Property="FontSize" Value="18"/>
 			<Setter Property="FontWeight" Value="Light"/>
 		</Style>
 	</Window.Styles>

travel/Views/ToursPage.axaml

@@ -32,7 +32,7 @@
 				<ComboBox MinWidth="250" ItemsSource="{Binding TP_VM.ListTypes}" SelectedValue="{Binding TP_VM.SelectType}" Height="30" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left" Margin="5,2" VerticalAlignment="Center"/>
 				<TextBlock Text="Условие сортировки" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"/>
 				<ComboBox MinWidth="250" ItemsSource="{Binding TP_VM.ListSort}" SelectedValue="{Binding TP_VM.SelectSort}" Height="30" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left" Margin="5,2" VerticalAlignment="Center"/>
-				<CheckBox Content="Только актуальные" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding TP_VM.ActualCheck}" Margin="5,0,0,0"/>
+				<CheckBox Content="Только актуальные" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" IsChecked="{Binding TP_VM.ActualCheck}" Margin="5,0,0,0" FontSize="18"/>
 				<Button Content="Отели" Grid.Column="2" Margin="10" Command="{Binding GoPageHotel}"/>
 			</Grid>
 		</StackPanel>

travel/obj/Debug/net7.0/Avalonia/Resources.Inputs.cache

@@ -1 +1 @@
-944e12ea2a2807ce34108f744d3f903e5e7739559d5150c16a8fa3f266b99624
+6f29d435f637f7193a7791735b52377324f32bd135f6f3cedf501b16a02539ae

travel/obj/Debug/net7.0/travel.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("travel")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+497d0b7de9f723f0516c7956d0f5ed710c3c348f")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+13d1736e2361bc53e6baf5d7489a7f1f01b73be3")]
 [assembly: System.Reflection.AssemblyProductAttribute("travel")]
 [assembly: System.Reflection.AssemblyTitleAttribute("travel")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

travel/obj/Debug/net7.0/travel.AssemblyInfoInputs.cache

@@ -1 +1 @@
-02688da914bef006a2a2a6d12a8b7a0ddc4d090b1c3ba0b0283205a30d9db24a
+e0d254028f60cc02f130cf5797163e580741f4b6769a223b7a9ae060b2c4ca2a

travel/obj/Debug/net7.0/travel.GeneratedMSBuildEditorConfig.editorconfig

@@ -20,6 +20,9 @@ build_property.EnableGeneratedComInterfaceComImportInterop =
 [C:/Users/Nadezhdin/Downloads/j/UP_Travel_Agency/travel/App.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 
+[C:/Users/Nadezhdin/Downloads/j/UP_Travel_Agency/travel/Views/HotelCard.axaml]
+build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
+
 [C:/Users/Nadezhdin/Downloads/j/UP_Travel_Agency/travel/Views/HotelPage.axaml]
 build_metadata.AdditionalFiles.SourceItemGroup = AvaloniaXaml
 

travel/obj/Debug/net7.0/travel.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-ed5593e13f2754497600ab8bcd4199040eebd780c50211b566f68f9f4e568a84
+d6398068677219c0c79449332cab28122364cc72aa7b82c0c63fd57fe9d20f76

travel/travel.csproj

@@ -39,6 +39,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Assets\logo_travel.png" />
     <None Remove="Assets\picture.png" />
   </ItemGroup>