ПрытовИЕ 8 tháng trước cách đây
mục cha
commit
cc9cc865e5

+ 13 - 0
UPtur/.Models/Country.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class Country
+{
+    public string Code { get; set; } = null!;
+
+    public string Name { get; set; } = null!;
+
+    public virtual ICollection<Hotel> Hotels { get; set; } = new List<Hotel>();
+}

+ 25 - 0
UPtur/.Models/Hotel.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class Hotel
+{
+    public int Id { get; set; }
+
+    public string Name { get; set; } = null!;
+
+    public int CountOfStars { get; set; }
+
+    public string CountryCode { get; set; } = null!;
+
+    public string? Description { get; set; }
+
+    public virtual Country CountryCodeNavigation { get; set; } = null!;
+
+    public virtual ICollection<HotelComment> HotelComments { get; set; } = new List<HotelComment>();
+
+    public virtual ICollection<HotelImage> HotelImages { get; set; } = new List<HotelImage>();
+
+    public virtual ICollection<HotelOfTour> HotelOfTours { get; set; } = new List<HotelOfTour>();
+}

+ 19 - 0
UPtur/.Models/HotelComment.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class HotelComment
+{
+    public int Id { get; set; }
+
+    public int HotelId { get; set; }
+
+    public string Text { get; set; } = null!;
+
+    public string Author { get; set; } = null!;
+
+    public DateOnly CreationDate { get; set; }
+
+    public virtual Hotel Hotel { get; set; } = null!;
+}

+ 15 - 0
UPtur/.Models/HotelImage.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class HotelImage
+{
+    public int Id { get; set; }
+
+    public int HotelId { get; set; }
+
+    public byte[] ImageSource { get; set; } = null!;
+
+    public virtual Hotel Hotel { get; set; } = null!;
+}

+ 17 - 0
UPtur/.Models/HotelOfTour.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class HotelOfTour
+{
+    public int HotelId { get; set; }
+
+    public int TourId { get; set; }
+
+    public int Id { get; set; }
+
+    public virtual Hotel Hotel { get; set; } = null!;
+
+    public virtual Tour Tour { get; set; } = null!;
+}

+ 26 - 0
UPtur/.Models/Tour.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class Tour
+{
+    public int Id { get; set; }
+
+    public int TicketCount { get; set; }
+
+    public string Name { get; set; } = null!;
+
+    public string? Desription { get; set; }
+
+    public byte[]? ImagePreview { get; set; }
+
+    public decimal Price { get; set; }
+
+    public BitArray IsActual { get; set; } = null!;
+
+    public virtual ICollection<HotelOfTour> HotelOfTours { get; set; } = new List<HotelOfTour>();
+
+    public virtual ICollection<TypeOfTour> TypeOfTours { get; set; } = new List<TypeOfTour>();
+}

+ 15 - 0
UPtur/.Models/Type.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class Type
+{
+    public int Id { get; set; }
+
+    public string Name { get; set; } = null!;
+
+    public string? Description { get; set; }
+
+    public virtual ICollection<TypeOfTour> TypeOfTours { get; set; } = new List<TypeOfTour>();
+}

+ 17 - 0
UPtur/.Models/TypeOfTour.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+namespace UPtur..Models;
+
+public partial class TypeOfTour
+{
+    public int TourId { get; set; }
+
+    public int TypeId { get; set; }
+
+    public int Id { get; set; }
+
+    public virtual Tour Tour { get; set; } = null!;
+
+    public virtual Type Type { get; set; } = null!;
+}

+ 224 - 0
UPtur/.Models/UpPrytovContext.cs

@@ -0,0 +1,224 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
+
+namespace UPtur..Models;
+
+public partial class UpPrytovContext : DbContext
+{
+    public UpPrytovContext()
+    {
+    }
+
+    public UpPrytovContext(DbContextOptions<UpPrytovContext> options)
+        : base(options)
+    {
+    }
+
+    public virtual DbSet<Country> Countries { get; set; }
+
+    public virtual DbSet<Hotel> Hotels { get; set; }
+
+    public virtual DbSet<HotelComment> HotelComments { get; set; }
+
+    public virtual DbSet<HotelImage> HotelImages { get; set; }
+
+    public virtual DbSet<HotelOfTour> HotelOfTours { get; set; }
+
+    public virtual DbSet<Tour> Tours { get; set; }
+
+    public virtual DbSet<Type> Types { get; set; }
+
+    public virtual DbSet<TypeOfTour> TypeOfTours { get; set; }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
+        => optionsBuilder.UseNpgsql("Host=edu.pg.ngknn.local;Port=5432;Database=UP_Prytov;Username=43P;Password=444444");
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        modelBuilder.Entity<Country>(entity =>
+        {
+            entity.HasKey(e => e.Code).HasName("country_pk");
+
+            entity.ToTable("country");
+
+            entity.Property(e => e.Code)
+                .HasMaxLength(2)
+                .IsFixedLength()
+                .HasColumnName("code");
+            entity.Property(e => e.Name)
+                .HasColumnType("character varying")
+                .HasColumnName("name");
+        });
+
+        modelBuilder.Entity<Hotel>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("hotel_pk");
+
+            entity.ToTable("hotel");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.CountOfStars).HasColumnName("count_of_stars");
+            entity.Property(e => e.CountryCode)
+                .HasMaxLength(2)
+                .IsFixedLength()
+                .HasColumnName("country_code");
+            entity.Property(e => e.Description)
+                .HasColumnType("character varying")
+                .HasColumnName("description");
+            entity.Property(e => e.Name)
+                .HasColumnType("character varying")
+                .HasColumnName("name");
+
+            entity.HasOne(d => d.CountryCodeNavigation).WithMany(p => p.Hotels)
+                .HasForeignKey(d => d.CountryCode)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("hotel_country_fk");
+        });
+
+        modelBuilder.Entity<HotelComment>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("hotel_comment_pk");
+
+            entity.ToTable("hotel_comment");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.Author)
+                .HasColumnType("character varying")
+                .HasColumnName("author");
+            entity.Property(e => e.CreationDate).HasColumnName("creation_date");
+            entity.Property(e => e.HotelId).HasColumnName("hotel_id");
+            entity.Property(e => e.Text)
+                .HasColumnType("character varying")
+                .HasColumnName("text");
+
+            entity.HasOne(d => d.Hotel).WithMany(p => p.HotelComments)
+                .HasForeignKey(d => d.HotelId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("hotel_comment_hotel_fk");
+        });
+
+        modelBuilder.Entity<HotelImage>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("hotel_image_pk");
+
+            entity.ToTable("hotel_image");
+
+            entity.Property(e => e.Id)
+                .ValueGeneratedNever()
+                .HasColumnName("id");
+            entity.Property(e => e.HotelId).HasColumnName("hotel_id");
+            entity.Property(e => e.ImageSource).HasColumnName("image_source");
+
+            entity.HasOne(d => d.Hotel).WithMany(p => p.HotelImages)
+                .HasForeignKey(d => d.HotelId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("hotel_image_hotel_fk");
+        });
+
+        modelBuilder.Entity<HotelOfTour>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("hotel_of_tour_pk");
+
+            entity.ToTable("hotel_of_tour");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.HotelId).HasColumnName("hotel_id");
+            entity.Property(e => e.TourId).HasColumnName("tour_id");
+
+            entity.HasOne(d => d.Hotel).WithMany(p => p.HotelOfTours)
+                .HasForeignKey(d => d.HotelId)
+                .HasConstraintName("hotel_of_tour_hotel_fk");
+
+            entity.HasOne(d => d.Tour).WithMany(p => p.HotelOfTours)
+                .HasForeignKey(d => d.TourId)
+                .HasConstraintName("hotel_of_tour_tour_fk");
+        });
+
+        modelBuilder.Entity<Tour>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("tour_pk");
+
+            entity.ToTable("tour");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.Desription)
+                .HasColumnType("character varying")
+                .HasColumnName("desription");
+            entity.Property(e => e.ImagePreview).HasColumnName("image_preview");
+            entity.Property(e => e.IsActual)
+                .HasColumnType("bit(1)")
+                .HasColumnName("is_actual");
+            entity.Property(e => e.Name)
+                .HasColumnType("character varying")
+                .HasColumnName("name");
+            entity.Property(e => e.Price)
+                .HasColumnType("money")
+                .HasColumnName("price");
+            entity.Property(e => e.TicketCount).HasColumnName("ticket_count");
+        });
+
+        modelBuilder.Entity<Type>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("type_pk");
+
+            entity.ToTable("type");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.Description)
+                .HasColumnType("character varying")
+                .HasColumnName("description");
+            entity.Property(e => e.Name)
+                .HasColumnType("character varying")
+                .HasColumnName("name");
+        });
+
+        modelBuilder.Entity<TypeOfTour>(entity =>
+        {
+            entity.HasKey(e => e.Id).HasName("type_of_tour_pk");
+
+            entity.ToTable("type_of_tour");
+
+            entity.Property(e => e.Id)
+                .UseIdentityAlwaysColumn()
+                .HasColumnName("id");
+            entity.Property(e => e.TourId).HasColumnName("tour_id");
+            entity.Property(e => e.TypeId).HasColumnName("type_id");
+
+            entity.HasOne(d => d.Tour).WithMany(p => p.TypeOfTours)
+                .HasForeignKey(d => d.TourId)
+                .HasConstraintName("type_of_tour_tour_fk");
+
+            entity.HasOne(d => d.Type).WithMany(p => p.TypeOfTours)
+                .HasForeignKey(d => d.TypeId)
+                .HasConstraintName("type_of_tour_type_fk");
+        });
+        modelBuilder.HasSequence("hotel_comment_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("hotel_comment_id_seq1").HasMax(2147483647L);
+        modelBuilder.HasSequence("hotel_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("hotel_id_seq1").HasMax(2147483647L);
+        modelBuilder.HasSequence("hotel_of_tour_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("hotel_of_tour_id_seq1").HasMax(2147483647L);
+        modelBuilder.HasSequence("tour_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("tour_id_seq1").HasMax(2147483647L);
+        modelBuilder.HasSequence("type_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("type_id_seq1").HasMax(2147483647L);
+        modelBuilder.HasSequence("type_of_tour_id_seq").HasMax(2147483647L);
+        modelBuilder.HasSequence("type_of_tour_id_seq1").HasMax(2147483647L);
+
+        OnModelCreatingPartial(modelBuilder);
+    }
+
+    partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
+}

+ 7 - 0
UPtur/ViewModels/MainWindowViewModel.cs

@@ -28,6 +28,13 @@ namespace UPtur.ViewModels
         {
             US = new Tours();
         }
+        ToursViewModel tvm = new ToursViewModel();
+        public ToursViewModel ToursVM
+        {
+            get => tvm;
+            set => tvm = value;
+        }
+
     }
 
     

+ 43 - 1
UPtur/ViewModels/ToursViewModel.cs

@@ -1,10 +1,52 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ReactiveUI;
+using UPtur.Models;
 
 namespace UPtur.ViewModels
 {
 	public class ToursViewModel : ReactiveObject
 	{
-	}
+        UpPrytovContext DB = new UpPrytovContext();
+        private List<Tour>? _tours;
+        public List<Tour>? Tours { get => _tours; set => this.RaiseAndSetIfChanged(ref _tours, value); }
+
+        private List<string>? _types;
+        public List<string>? Types { get => _types; set => this.RaiseAndSetIfChanged(ref _types, value); }
+
+        private bool _checkOrNot = false;
+        public bool CheckOrNot
+        {
+            get => _checkOrNot;
+            set
+            {
+                _checkOrNot = value;
+                Filter();
+            }
+        }
+
+        private string? _findTour;
+        public string? FindTour
+        {
+            get => _findTour;
+            set
+            {
+                _findTour = value;
+                Filter();
+            }
+        }
+
+        public ToursViewModel()
+        {
+            Tours = DB.Tours.ToList();
+            Types = DB.Types.Select(x => x.Name).ToList();
+            Types.Insert(0, "Âñå");
+        }
+
+        public void Filter()
+        {
+
+        }
+    }
 }

+ 1 - 1
UPtur/Views/MainWindow.axaml

@@ -15,6 +15,6 @@
         <vm:MainWindowViewModel/>
     </Design.DataContext>
 
-    <TextBlock Text="{Binding US}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    <ContentControl Content="{Binding US}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
 </Window>

+ 4 - 3
UPtur/Views/PageNavigate.axaml

@@ -6,11 +6,12 @@
 			 xmlns:vm="using:UPtur.ViewModels"
 			 x:DataType="vm:MainWindowViewModel"
              x:Class="UPtur.Views.PageNavigate">
-	<Grid>
+	<Grid Background="">
 
 		<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center"  >
-			<Button> Command="{Binding ChangePageToHotels}" </Button>
-			<Button> </Button>
+			<TextBlock FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,0,40" > Путешествуй по России </TextBlock>
+			<Button Background="" Command="{Binding ChangePageToTours}" HorizontalContentAlignment="Center" Content="Просмотр Туров" Width="250" Height="32" >  </Button>
+			<Button Background="" Command="{Binding ChangePageToHotels}" HorizontalContentAlignment="Center" Margin="0,20,0,0" Content="Просмотр Отелей" Width="250" Height="32" > </Button>
 		</StackPanel>
 		
 	</Grid>

+ 46 - 2
UPtur/Views/Tours.axaml

@@ -3,6 +3,50 @@
              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="UPtur.Views.Tours">
-  Welcome to Avalonia!
+             x:Class="UPtur.Views.Tours"
+			 xmlns:vm="using:UPtur.ViewModels"
+			 x:DataType="vm:MainWindowViewModel"
+			 FontFamily="{StaticResource Comic}">
+
+	<Grid RowDefinitions="*,2.0*">
+		<StackPanel Margin="0,10,0,10" Orientation="Vertical" HorizontalAlignment="Center" >
+			<StackPanel Orientation="Vertical" VerticalAlignment="Center">
+				<TextBlock Text="Введите текст для поиска: "/>
+				<TextBox Text="{Binding ToursVM.FindTour}" Width="300" Watermark="Поиск по названию и описанию"></TextBox>
+			</StackPanel>
+			<StackPanel Margin="0,10,0,0" Orientation="Vertical" VerticalAlignment="Center">
+				<TextBlock Margin="0,0,0,0" Text="Выберите тип: "/>
+				<ComboBox SelectedIndex="0" ItemsSource="{Binding ToursVM.Types}" Width="300"/>
+			</StackPanel>
+			<CheckBox IsChecked="{Binding ToursVM.CheckOrNot}" HorizontalAlignment="Left" Content="Только актуальные туры"/>
+		</StackPanel>
+
+		<ListBox ItemsSource="{Binding ToursVM.Tours}" Grid.Row="1">
+			<ListBox.ItemsPanel>
+				<ItemsPanelTemplate>
+					<WrapPanel Orientation="Horizontal" HorizontalAlignment="Center"/>
+				</ItemsPanelTemplate>
+			</ListBox.ItemsPanel>
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<Border Width="300" Height="270" BorderBrush="Black" BorderThickness="1" Padding="5">
+						<StackPanel Orientation="Vertical" VerticalAlignment="Center">
+							<TextBlock Margin="0 0 0 5" TextWrapping="Wrap" FontSize="19" TextAlignment="Center" HorizontalAlignment="Center" Text="{Binding Name}"></TextBlock>
+							<Image Margin="5" Source="avares://TravelAgency/Assets/picture.png" Width="270" Height="120"></Image>
+							<TextBlock Margin="5" FontSize="20" FontWeight="ExtraBold" HorizontalAlignment="Center" TextAlignment="Center" Text="{Binding StringFormat={}{0:#} РУБ, Path=Price}"></TextBlock>
+							<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+								<StackPanel HorizontalAlignment="Left" Margin="0 0 25 0">
+									<TextBlock FontSize="16" Text="{Binding GetActual}"></TextBlock>
+								</StackPanel>
+								<StackPanel HorizontalAlignment="Right" Margin="25 0 0 0">
+									<TextBlock FontSize="16" Text="{Binding StringFormat=Билетов: {0:#}, Path=TicketCount}"></TextBlock>
+								</StackPanel>
+								
+							</StackPanel>
+						</StackPanel>
+					</Border>
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
+	</Grid>
 </UserControl>

+ 5 - 0
UPtur/Views/Tours.axaml.cs

@@ -10,4 +10,9 @@ public partial class Tours : UserControl
     {
         InitializeComponent();
     }
+
+    private void CheckBox_Checked(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
+    {
+    }
+
 }