mr.solder5 5 سال پیش
والد
کامیت
ea1cea8090
42فایلهای تغییر یافته به همراه1404 افزوده شده و 623 حذف شده
  1. 1 1
      InteractiveKiosk/App.config
  2. 1 1
      InteractiveKiosk/App.xaml
  3. 9 10
      InteractiveKiosk/Attractions.cs
  4. 0 35
      InteractiveKiosk/Attraction.xaml
  5. 0 33
      InteractiveKiosk/Attraction.xaml.cs
  6. 5 5
      InteractiveKiosk/AttractionInPlace.cs
  7. 5 5
      InteractiveKiosk/AttractionSchedule.cs
  8. 1 1
      InteractiveKiosk/AuthorizationWindow.xaml
  9. 14 14
      InteractiveKiosk/AuthorizationWindow.xaml.cs
  10. 10 10
      InteractiveKiosk/Constructions.cs
  11. 0 32
      InteractiveKiosk/Construction.xaml
  12. 0 33
      InteractiveKiosk/Construction.xaml.cs
  13. 5 5
      InteractiveKiosk/ConstructionInPlace.cs
  14. 5 5
      InteractiveKiosk/ConstructionSchedule.cs
  15. 22 22
      InteractiveKiosk/DataBase.Context.cs
  16. 9 9
      InteractiveKiosk/DataBase.Designer.cs
  17. 3 3
      InteractiveKiosk/DataBase.cs
  18. 126 148
      InteractiveKiosk/DataBase.edmx
  19. 10 11
      InteractiveKiosk/DataBase.edmx.diagram
  20. 7 7
      InteractiveKiosk/DayOfWeek.cs
  21. 356 0
      InteractiveKiosk/EditProfile.xaml
  22. 64 0
      InteractiveKiosk/EditProfile.xaml.cs
  23. 7 7
      InteractiveKiosk/Events.cs
  24. 5 5
      InteractiveKiosk/EventInPlace.cs
  25. 35 35
      InteractiveKiosk/InteractiveKiosk.csproj
  26. 1 1
      InteractiveKiosk/MainWindow.xaml
  27. 11 26
      InteractiveKiosk/MainWindow.xaml.cs
  28. 361 0
      InteractiveKiosk/Managers.xaml
  29. 83 0
      InteractiveKiosk/Managers.xaml.cs
  30. 4 4
      InteractiveKiosk/Map.cs
  31. 7 7
      InteractiveKiosk/Objects.cs
  32. 5 5
      InteractiveKiosk/ObjectInPlace.cs
  33. 8 4
      InteractiveKiosk/ParkManagers.cs
  34. 7 7
      InteractiveKiosk/ParkZones.cs
  35. 16 16
      InteractiveKiosk/Places.cs
  36. 137 72
      InteractiveKiosk/Profile.xaml
  37. 29 0
      InteractiveKiosk/Profile.xaml.cs
  38. 4 4
      InteractiveKiosk/ScheduleForAttraction.cs
  39. 4 4
      InteractiveKiosk/ScheduleForConstruction.cs
  40. 20 0
      InteractiveKiosk/TypeOfAttraction.cs
  41. 0 29
      InteractiveKiosk/TypeOfAttractions.cs
  42. 7 7
      InteractiveKiosk/TypeOfConstructions.cs

+ 1 - 1
InteractiveKiosk/App.config

@@ -20,4 +20,4 @@
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
-<connectionStrings><add name="InteractiveKioskEntities" connectionString="metadata=res://*/DataBase.csdl|res://*/DataBase.ssdl|res://*/DataBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=DEXP\SQLEXPRESS;initial catalog=InteractiveKiosk;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /></connectionStrings></configuration>
+<connectionStrings><add name="InteractiveKioskEntities" connectionString="metadata=res://*/DataBase.csdl|res://*/DataBase.ssdl|res://*/DataBase.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=DESKTOP-57848NR;initial catalog=InteractiveKiosk;integrated security=True;MultipleActiveResultSets=True;App=EntityFramework&quot;" providerName="System.Data.EntityClient" /></connectionStrings></configuration>

+ 1 - 1
InteractiveKiosk/App.xaml

@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:InteractiveKiosk"
-             StartupUri="AuthorizationWindow.xaml">
+             StartupUri="Managers.xaml">
     <Application.Resources>
          
     </Application.Resources>

+ 9 - 10
InteractiveKiosk/Attractions.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,13 +12,13 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class Attractions
+    public partial class Attraction
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Attractions()
+        public Attraction()
         {
-            this.AttractionInPlace = new HashSet<AttractionInPlace>();
-            this.ScheduleForAttraction = new HashSet<ScheduleForAttraction>();
+            this.AttractionInPlaces = new HashSet<AttractionInPlace>();
+            this.ScheduleForAttractions = new HashSet<ScheduleForAttraction>();
         }
     
         public int IDAttraction { get; set; }
@@ -32,9 +32,8 @@ namespace InteractiveKiosk
         public int IDTypeOfAttraction { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<AttractionInPlace> AttractionInPlace { get; set; }
-        public virtual TypeOfAttractions TypeOfAttractions { get; set; }
+        public virtual ICollection<AttractionInPlace> AttractionInPlaces { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForAttraction> ScheduleForAttraction { get; set; }
+        public virtual ICollection<ScheduleForAttraction> ScheduleForAttractions { get; set; }
     }
 }

+ 0 - 35
InteractiveKiosk/Attraction.xaml

@@ -1,35 +0,0 @@
-<Window x:Class="InteractiveKiosk.Attraction"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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"
-        xmlns:local="clr-namespace:InteractiveKiosk"
-        mc:Ignorable="d"
-        Title="Аттракционы" Height="600" Width="800" Loaded="Window_Loaded">
-    <Grid>
-        <ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Disabled">
-            <TabControl HorizontalAlignment="Left" Height="549" VerticalAlignment="Top" Width="5000">
-                <TabItem Header="Семейные">
-                    <DataGrid Name="RP" AutoGenerateColumns="False">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="Наименование" Binding="{Binding AttractionName}" Width="1*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Описание" Binding="{Binding DescriptionOfTheAttraction}" Width="15.7*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Возрастное ограничение" Binding="{Binding AgeLimit}" Width="4.3*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Цена" Binding="{Binding AttractionCost}" Width="0.4*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Бонусная система" Binding="{Binding PresenceOfTheBonusProgram}" Width="1.3*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Статус" Binding="{Binding StatusOfTheAttraction}" Width="1.3*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Изображение" Binding="{Binding ImageAttraction}" Width="2*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Тип аттракциона" Binding="{Binding IDTypeOfAttraction}" Width="0.7*"></DataGridTextColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </TabItem>
-                <TabItem Header="Детские">
-                    <Grid Background="#FFE5E5E5"/>
-                </TabItem>
-                <TabItem Header="Экстремальные">
-                    <Grid Background="#FFE5E5E5"/>
-                </TabItem>
-            </TabControl>
-        </ScrollViewer>
-    </Grid>
-</Window>

+ 0 - 33
InteractiveKiosk/Attraction.xaml.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace InteractiveKiosk
-{
-    /// <summary>
-    /// Логика взаимодействия для Attraction.xaml
-    /// </summary>
-    public partial class Attraction : Window
-    {
-        InteractiveKioskEntities db = new InteractiveKioskEntities();
-        public Attraction()
-        {
-            InitializeComponent();
-        }
-
-        private void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            RP.ItemsSource = db.Attractions.ToList();
-        }
-    }
-}

+ 5 - 5
InteractiveKiosk/AttractionInPlace.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ namespace InteractiveKiosk
         public int IDAttraction { get; set; }
         public int IDPlace { get; set; }
     
-        public virtual Attractions Attractions { get; set; }
-        public virtual Places Places { get; set; }
+        public virtual Attraction Attraction { get; set; }
+        public virtual Place Place { get; set; }
     }
 }

+ 5 - 5
InteractiveKiosk/AttractionSchedule.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ namespace InteractiveKiosk
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public AttractionSchedule()
         {
-            this.ScheduleForAttraction = new HashSet<ScheduleForAttraction>();
+            this.ScheduleForAttractions = new HashSet<ScheduleForAttraction>();
         }
     
         public int IDAttractionSchedule { get; set; }
@@ -29,6 +29,6 @@ namespace InteractiveKiosk
         public Nullable<System.TimeSpan> EndTimeOfTheWork { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForAttraction> ScheduleForAttraction { get; set; }
+        public virtual ICollection<ScheduleForAttraction> ScheduleForAttractions { get; set; }
     }
 }

+ 1 - 1
InteractiveKiosk/AuthorizationWindow.xaml

@@ -117,7 +117,7 @@
                     </Style.Triggers>
                 </Style>
             </Border.Style>
-            <Button Content="Войти" FontSize="14" Foreground="Black" FontFamily="Segoe UI Semilight">
+            <Button Content="Войти" FontSize="14" Foreground="Black" FontFamily="Segoe UI Semilight" Click="LoginButton">
                 <Button.Style>
                     <Style TargetType="Button">
                         <Setter Property="OverridesDefaultStyle" Value="True"/>

+ 14 - 14
InteractiveKiosk/AuthorizationWindow.xaml.cs

@@ -28,20 +28,20 @@ namespace InteractiveKiosk
 
         private void LoginButton(object sender, RoutedEventArgs e)
         {
-            //if (username.Text == "" || password.Text == "")
-            //{
-            //    MessageBox.Show("Введено неверное значение!");
-            //    return;
-            //}
-            //if (db.ParkManagers.Select(item => item.Username + " " + item.Password).Contains(username.Text + " " + password.Text))
-            //{
-            //    MessageBox.Show("Добро пожаловать, вы авторизированы");
-            //    this.Close();
-            //}
-            //else
-            //{
-            //    MessageBox.Show("Введено неверное значение логина/пароля");
-            //}
+            if (Login.Text == "" || Password.Password == "")
+            {
+                MessageBox.Show("Введено неверное значение!");
+                return;
+            }
+            if (db.ParkManagers.Select(item => item.Username + " " + item.Password).Contains(Login.Text + " " + Password.Password))
+            {
+                MessageBox.Show("Добро пожаловать, вы авторизированы");
+                this.Close();
+            }
+            else
+            {
+                MessageBox.Show("Введено неверное значение логина/пароля");
+            }
         }
 
         private void MinButton_MouseDown(object sender, MouseButtonEventArgs e)

+ 10 - 10
InteractiveKiosk/Constructions.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,13 +12,13 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class Constructions
+    public partial class Construction
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Constructions()
+        public Construction()
         {
-            this.ConstructionInPlace = new HashSet<ConstructionInPlace>();
-            this.ScheduleForConstruction = new HashSet<ScheduleForConstruction>();
+            this.ConstructionInPlaces = new HashSet<ConstructionInPlace>();
+            this.ScheduleForConstructions = new HashSet<ScheduleForConstruction>();
         }
     
         public int IDConstruction { get; set; }
@@ -29,9 +29,9 @@ namespace InteractiveKiosk
         public int IDTypeOfConstruction { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ConstructionInPlace> ConstructionInPlace { get; set; }
-        public virtual TypeOfConstructions TypeOfConstructions { get; set; }
+        public virtual ICollection<ConstructionInPlace> ConstructionInPlaces { get; set; }
+        public virtual TypeOfConstruction TypeOfConstruction { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForConstruction> ScheduleForConstruction { get; set; }
+        public virtual ICollection<ScheduleForConstruction> ScheduleForConstructions { get; set; }
     }
 }

+ 0 - 32
InteractiveKiosk/Construction.xaml

@@ -1,32 +0,0 @@
-<Window x:Class="InteractiveKiosk.Construction"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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"
-        xmlns:local="clr-namespace:InteractiveKiosk"
-        mc:Ignorable="d"
-        Title="Кафе и рестораны" Height="600" Width="800" Loaded="Window_Loaded">
-    <Grid>
-        <ScrollViewer HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Disabled">
-            <TabControl HorizontalAlignment="Left" Height="549" VerticalAlignment="Top" Width="5000">
-                <TabItem Header="Кафе">
-                    <DataGrid Name="RP" AutoGenerateColumns="False">
-                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="Наименование" Binding="{Binding ConstructionName}" Width="0.04*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Описание" Binding="{Binding DescriptionOfTheConstruction}" Width="0.05*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Статус" Binding="{Binding StatusOfTheConstruction}" Width="0.2*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Изображение" Binding="{Binding ImageConstruction}" Width="0.5*"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Тип сооружения" Binding="{Binding IDTypeOfConstruction}" Width="0.1*"></DataGridTextColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </TabItem>
-                <TabItem Header="Киоски">
-                    <Grid Background="#FFE5E5E5"/>
-                </TabItem>
-                <TabItem Header="Прочее">
-                    <Grid Background="#FFE5E5E5"/>
-                </TabItem>
-            </TabControl>
-        </ScrollViewer>
-    </Grid>
-</Window>

+ 0 - 33
InteractiveKiosk/Construction.xaml.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
-
-namespace InteractiveKiosk
-{
-    /// <summary>
-    /// Логика взаимодействия для Construction.xaml
-    /// </summary>
-    public partial class Construction : Window
-    {
-        InteractiveKioskEntities db = new InteractiveKioskEntities();
-        public Construction()
-        {
-            InitializeComponent();
-        }
-
-        public void Window_Loaded(object sender, RoutedEventArgs e)
-        {
-            RP.ItemsSource = db.Constructions.ToList();
-        }
-    }
-}

+ 5 - 5
InteractiveKiosk/ConstructionInPlace.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ namespace InteractiveKiosk
         public int IDConstruction { get; set; }
         public int IDPlace { get; set; }
     
-        public virtual Constructions Constructions { get; set; }
-        public virtual Places Places { get; set; }
+        public virtual Construction Construction { get; set; }
+        public virtual Place Place { get; set; }
     }
 }

+ 5 - 5
InteractiveKiosk/ConstructionSchedule.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ namespace InteractiveKiosk
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public ConstructionSchedule()
         {
-            this.ScheduleForConstruction = new HashSet<ScheduleForConstruction>();
+            this.ScheduleForConstructions = new HashSet<ScheduleForConstruction>();
         }
     
         public int IDConstructionSchedule { get; set; }
@@ -27,6 +27,6 @@ namespace InteractiveKiosk
         public Nullable<System.TimeSpan> EndTimeOfTheWork { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForConstruction> ScheduleForConstruction { get; set; }
+        public virtual ICollection<ScheduleForConstruction> ScheduleForConstructions { get; set; }
     }
 }

+ 22 - 22
InteractiveKiosk/DataBase.Context.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -25,24 +25,24 @@ namespace InteractiveKiosk
             throw new UnintentionalCodeFirstException();
         }
     
-        public virtual DbSet<AttractionInPlace> AttractionInPlace { get; set; }
-        public virtual DbSet<Attractions> Attractions { get; set; }
-        public virtual DbSet<AttractionSchedule> AttractionSchedule { get; set; }
-        public virtual DbSet<ConstructionInPlace> ConstructionInPlace { get; set; }
-        public virtual DbSet<Constructions> Constructions { get; set; }
-        public virtual DbSet<ConstructionSchedule> ConstructionSchedule { get; set; }
-        public virtual DbSet<DayOfWeek> DayOfWeek { get; set; }
-        public virtual DbSet<EventInPlace> EventInPlace { get; set; }
-        public virtual DbSet<Events> Events { get; set; }
-        public virtual DbSet<Map> Map { get; set; }
-        public virtual DbSet<ObjectInPlace> ObjectInPlace { get; set; }
-        public virtual DbSet<Objects> Objects { get; set; }
-        public virtual DbSet<ParkManagers> ParkManagers { get; set; }
-        public virtual DbSet<ParkZones> ParkZones { get; set; }
-        public virtual DbSet<Places> Places { get; set; }
-        public virtual DbSet<ScheduleForAttraction> ScheduleForAttraction { get; set; }
-        public virtual DbSet<ScheduleForConstruction> ScheduleForConstruction { get; set; }
-        public virtual DbSet<TypeOfAttractions> TypeOfAttractions { get; set; }
-        public virtual DbSet<TypeOfConstructions> TypeOfConstructions { get; set; }
+        public virtual DbSet<AttractionInPlace> AttractionInPlaces { get; set; }
+        public virtual DbSet<Attraction> Attractions { get; set; }
+        public virtual DbSet<AttractionSchedule> AttractionSchedules { get; set; }
+        public virtual DbSet<ConstructionInPlace> ConstructionInPlaces { get; set; }
+        public virtual DbSet<Construction> Constructions { get; set; }
+        public virtual DbSet<ConstructionSchedule> ConstructionSchedules { get; set; }
+        public virtual DbSet<DayOfWeek> DayOfWeeks { get; set; }
+        public virtual DbSet<EventInPlace> EventInPlaces { get; set; }
+        public virtual DbSet<Event> Events { get; set; }
+        public virtual DbSet<Map> Maps { get; set; }
+        public virtual DbSet<ObjectInPlace> ObjectInPlaces { get; set; }
+        public virtual DbSet<Object> Objects { get; set; }
+        public virtual DbSet<ParkManager> ParkManagers { get; set; }
+        public virtual DbSet<ParkZone> ParkZones { get; set; }
+        public virtual DbSet<Place> Places { get; set; }
+        public virtual DbSet<ScheduleForAttraction> ScheduleForAttractions { get; set; }
+        public virtual DbSet<ScheduleForConstruction> ScheduleForConstructions { get; set; }
+        public virtual DbSet<TypeOfAttraction> TypeOfAttractions { get; set; }
+        public virtual DbSet<TypeOfConstruction> TypeOfConstructions { get; set; }
     }
 }

+ 9 - 9
InteractiveKiosk/DataBase.Designer.cs

@@ -1,10 +1,10 @@
-// Создание кода T4 для модели "C:\Users\1\Source\Repos\InteractiveKiosk9\InteractiveKiosk\DataBase.edmx" включено. 
-// Чтобы включить формирование кода прежних версий, измените значение свойства "Стратегия создания кода" конструктора
-// на "Legacy ObjectContext". Это свойство доступно в окне "Свойства", если модель
-// открыта в конструкторе.
+// T4 code generation is enabled for model 'C:\Users\locadm\Source\Repos\InteractiveKiosk9\InteractiveKiosk\DataBase.edmx'. 
+// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
+// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
+// is open in the designer.
 
-// Если не сформированы контекст и классы сущности, возможная причина в том, что вы создали пустую модель, но
-// еще не выбрали версию Entity Framework для использования. Чтобы сформировать класс контекста и классы сущностей
-// для своей модели, откройте модель в конструкторе, щелкните правой кнопкой область конструктора и
-// выберите "Обновить модель из базы данных", "Сформировать базу данных из модели" или "Добавить элемент формирования
-// кода...".
+// If no context and entity classes have been generated, it may be because you created an empty model but
+// have not yet chosen which version of Entity Framework to use. To generate a context class and entity
+// classes for your model, open the model in the designer, right-click on the designer surface, and
+// select 'Update Model from Database...', 'Generate Database from Model...', or 'Add Code Generation
+// Item...'.

+ 3 - 3
InteractiveKiosk/DataBase.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

+ 126 - 148
InteractiveKiosk/DataBase.edmx

@@ -4,7 +4,7 @@
   <edmx:Runtime>
     <!-- SSDL content -->
     <edmx:StorageModels>
-      <Schema Namespace="Хранилище InteractiveKioskModel" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
+      <Schema Namespace="InteractiveKioskModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
         <EntityType Name="AttractionInPlace">
           <Key>
             <PropertyRef Name="IDAttractionInTheParkZone" />
@@ -129,6 +129,10 @@
           <Property Name="MiddleName" Type="nvarchar" MaxLength="150" />
           <Property Name="Username" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="Password" Type="nvarchar(max)" Nullable="false" />
+          <Property Name="Email" Type="nvarchar(max)" />
+          <Property Name="PhoneNumber" Type="numeric" Precision="12" Scale="0" />
+          <Property Name="Birthday" Type="date" />
+          <Property Name="ProfilePhoto" Type="image" />
         </EntityType>
         <EntityType Name="ParkZones">
           <Key>
@@ -201,18 +205,6 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK__Attractio__IDTyp__44FF419A">
-          <End Role="TypeOfAttractions" Type="Self.TypeOfAttractions" Multiplicity="1" />
-          <End Role="Attractions" Type="Self.Attractions" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="TypeOfAttractions">
-              <PropertyRef Name="IDTypeOfAttraction" />
-            </Principal>
-            <Dependent Role="Attractions">
-              <PropertyRef Name="IDTypeOfAttraction" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK__Construct__IDCon__59FA5E80">
           <End Role="Constructions" Type="Self.Constructions" Multiplicity="1" />
           <End Role="ConstructionInPlace" Type="Self.ConstructionInPlace" Multiplicity="*" />
@@ -393,7 +385,7 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <EntityContainer Name="Хранилище InteractiveKioskModelContainer">
+        <EntityContainer Name="InteractiveKioskModelStoreContainer">
           <EntitySet Name="AttractionInPlace" EntityType="Self.AttractionInPlace" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Attractions" EntityType="Self.Attractions" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="AttractionSchedule" EntityType="Self.AttractionSchedule" Schema="dbo" store:Type="Tables" />
@@ -421,10 +413,6 @@
             <End Role="Places" EntitySet="Places" />
             <End Role="AttractionInPlace" EntitySet="AttractionInPlace" />
           </AssociationSet>
-          <AssociationSet Name="FK__Attractio__IDTyp__44FF419A" Association="Self.FK__Attractio__IDTyp__44FF419A">
-            <End Role="TypeOfAttractions" EntitySet="TypeOfAttractions" />
-            <End Role="Attractions" EntitySet="Attractions" />
-          </AssociationSet>
           <AssociationSet Name="FK__Construct__IDCon__59FA5E80" Association="Self.FK__Construct__IDCon__59FA5E80">
             <End Role="Constructions" EntitySet="Constructions" />
             <End Role="ConstructionInPlace" EntitySet="ConstructionInPlace" />
@@ -498,10 +486,10 @@
           <Property Name="IDAttractionInTheParkZone" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="IDAttraction" Type="Int32" Nullable="false" />
           <Property Name="IDPlace" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Attractions" Relationship="Self.FK__Attractio__IDAtt__52593CB8" FromRole="AttractionInPlace" ToRole="Attractions" />
-          <NavigationProperty Name="Places" Relationship="Self.FK__Attractio__IDPla__534D60F1" FromRole="AttractionInPlace" ToRole="Places" />
+          <NavigationProperty Name="Attraction" Relationship="Self.FK__Attractio__IDAtt__52593CB8" FromRole="AttractionInPlace" ToRole="Attractions" />
+          <NavigationProperty Name="Place" Relationship="Self.FK__Attractio__IDPla__534D60F1" FromRole="AttractionInPlace" ToRole="Places" />
         </EntityType>
-        <EntityType Name="Attractions">
+        <EntityType Name="Attraction">
           <Key>
             <PropertyRef Name="IDAttraction" />
           </Key>
@@ -514,9 +502,8 @@
           <Property Name="StatusOfTheAttraction" Type="Boolean" Nullable="false" />
           <Property Name="ImageAttraction" Type="Binary" MaxLength="Max" FixedLength="false" />
           <Property Name="IDTypeOfAttraction" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="AttractionInPlace" Relationship="Self.FK__Attractio__IDAtt__52593CB8" FromRole="Attractions" ToRole="AttractionInPlace" />
-          <NavigationProperty Name="TypeOfAttractions" Relationship="Self.FK__Attractio__IDTyp__44FF419A" FromRole="Attractions" ToRole="TypeOfAttractions" />
-          <NavigationProperty Name="ScheduleForAttraction" Relationship="Self.FK__ScheduleF__IDAtt__6383C8BA" FromRole="Attractions" ToRole="ScheduleForAttraction" />
+          <NavigationProperty Name="AttractionInPlaces" Relationship="Self.FK__Attractio__IDAtt__52593CB8" FromRole="Attractions" ToRole="AttractionInPlace" />
+          <NavigationProperty Name="ScheduleForAttractions" Relationship="Self.FK__ScheduleF__IDAtt__6383C8BA" FromRole="Attractions" ToRole="ScheduleForAttraction" />
         </EntityType>
         <EntityType Name="AttractionSchedule">
           <Key>
@@ -529,7 +516,7 @@
           <Property Name="StartOfTheSecondLunchtime" Type="Time" Precision="7" />
           <Property Name="EndOfTheSecondLunchtime" Type="Time" Precision="7" />
           <Property Name="EndTimeOfTheWork" Type="Time" Precision="7" />
-          <NavigationProperty Name="ScheduleForAttraction" Relationship="Self.FK__ScheduleF__IDAtt__6477ECF3" FromRole="AttractionSchedule" ToRole="ScheduleForAttraction" />
+          <NavigationProperty Name="ScheduleForAttractions" Relationship="Self.FK__ScheduleF__IDAtt__6477ECF3" FromRole="AttractionSchedule" ToRole="ScheduleForAttraction" />
         </EntityType>
         <EntityType Name="ConstructionInPlace">
           <Key>
@@ -538,10 +525,10 @@
           <Property Name="IDConstructionInPlace" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="IDConstruction" Type="Int32" Nullable="false" />
           <Property Name="IDPlace" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Constructions" Relationship="Self.FK__Construct__IDCon__59FA5E80" FromRole="ConstructionInPlace" ToRole="Constructions" />
-          <NavigationProperty Name="Places" Relationship="Self.FK__Construct__IDPla__5AEE82B9" FromRole="ConstructionInPlace" ToRole="Places" />
+          <NavigationProperty Name="Construction" Relationship="Self.FK__Construct__IDCon__59FA5E80" FromRole="ConstructionInPlace" ToRole="Constructions" />
+          <NavigationProperty Name="Place" Relationship="Self.FK__Construct__IDPla__5AEE82B9" FromRole="ConstructionInPlace" ToRole="Places" />
         </EntityType>
-        <EntityType Name="Constructions">
+        <EntityType Name="Construction">
           <Key>
             <PropertyRef Name="IDConstruction" />
           </Key>
@@ -551,9 +538,9 @@
           <Property Name="StatusOfTheConstruction" Type="Boolean" Nullable="false" />
           <Property Name="ConstructionImage" Type="Binary" MaxLength="Max" FixedLength="false" />
           <Property Name="IDTypeOfConstruction" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="ConstructionInPlace" Relationship="Self.FK__Construct__IDCon__59FA5E80" FromRole="Constructions" ToRole="ConstructionInPlace" />
-          <NavigationProperty Name="TypeOfConstructions" Relationship="Self.FK__Construct__IDTyp__4D94879B" FromRole="Constructions" ToRole="TypeOfConstructions" />
-          <NavigationProperty Name="ScheduleForConstruction" Relationship="Self.FK__ScheduleF__IDCon__68487DD7" FromRole="Constructions" ToRole="ScheduleForConstruction" />
+          <NavigationProperty Name="ConstructionInPlaces" Relationship="Self.FK__Construct__IDCon__59FA5E80" FromRole="Constructions" ToRole="ConstructionInPlace" />
+          <NavigationProperty Name="TypeOfConstruction" Relationship="Self.FK__Construct__IDTyp__4D94879B" FromRole="Constructions" ToRole="TypeOfConstructions" />
+          <NavigationProperty Name="ScheduleForConstructions" Relationship="Self.FK__ScheduleF__IDCon__68487DD7" FromRole="Constructions" ToRole="ScheduleForConstruction" />
         </EntityType>
         <EntityType Name="ConstructionSchedule">
           <Key>
@@ -564,7 +551,7 @@
           <Property Name="StartOfTheLunchtime" Type="Time" Precision="7" />
           <Property Name="EndOfTheLunchtime" Type="Time" Precision="7" />
           <Property Name="EndTimeOfTheWork" Type="Time" Precision="7" />
-          <NavigationProperty Name="ScheduleForConstruction" Relationship="Self.FK__ScheduleF__IDCon__693CA210" FromRole="ConstructionSchedule" ToRole="ScheduleForConstruction" />
+          <NavigationProperty Name="ScheduleForConstructions" Relationship="Self.FK__ScheduleF__IDCon__693CA210" FromRole="ConstructionSchedule" ToRole="ScheduleForConstruction" />
         </EntityType>
         <EntityType Name="DayOfWeek">
           <Key>
@@ -572,8 +559,8 @@
           </Key>
           <Property Name="IDDayOfWeek" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="NameDayOfWeek" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <NavigationProperty Name="ScheduleForAttraction" Relationship="Self.FK__ScheduleF__IDDay__656C112C" FromRole="DayOfWeek" ToRole="ScheduleForAttraction" />
-          <NavigationProperty Name="ScheduleForConstruction" Relationship="Self.FK__ScheduleF__IDDay__6A30C649" FromRole="DayOfWeek" ToRole="ScheduleForConstruction" />
+          <NavigationProperty Name="ScheduleForAttractions" Relationship="Self.FK__ScheduleF__IDDay__656C112C" FromRole="DayOfWeek" ToRole="ScheduleForAttraction" />
+          <NavigationProperty Name="ScheduleForConstructions" Relationship="Self.FK__ScheduleF__IDDay__6A30C649" FromRole="DayOfWeek" ToRole="ScheduleForConstruction" />
         </EntityType>
         <EntityType Name="EventInPlace">
           <Key>
@@ -582,10 +569,10 @@
           <Property Name="IDEventInTheParkZone" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="IDEvent" Type="Int32" Nullable="false" />
           <Property Name="IDPlace" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Events" Relationship="Self.FK__EventInPl__IDEve__5DCAEF64" FromRole="EventInPlace" ToRole="Events" />
-          <NavigationProperty Name="Places" Relationship="Self.FK__EventInPl__IDPla__5EBF139D" FromRole="EventInPlace" ToRole="Places" />
+          <NavigationProperty Name="Event" Relationship="Self.FK__EventInPl__IDEve__5DCAEF64" FromRole="EventInPlace" ToRole="Events" />
+          <NavigationProperty Name="Place" Relationship="Self.FK__EventInPl__IDPla__5EBF139D" FromRole="EventInPlace" ToRole="Places" />
         </EntityType>
-        <EntityType Name="Events">
+        <EntityType Name="Event">
           <Key>
             <PropertyRef Name="IDEvent" />
           </Key>
@@ -595,7 +582,7 @@
           <Property Name="BeginningOfEvent" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="EndingOfEvent" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="StatusOfTheEvent" Type="Boolean" Nullable="false" />
-          <NavigationProperty Name="EventInPlace" Relationship="Self.FK__EventInPl__IDEve__5DCAEF64" FromRole="Events" ToRole="EventInPlace" />
+          <NavigationProperty Name="EventInPlaces" Relationship="Self.FK__EventInPl__IDEve__5DCAEF64" FromRole="Events" ToRole="EventInPlace" />
         </EntityType>
         <EntityType Name="Map">
           <Key>
@@ -603,7 +590,7 @@
           </Key>
           <Property Name="IDMap" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="IDPlace" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Places" Relationship="Self.FK__Map__IDPlace__3C69FB99" FromRole="Map" ToRole="Places" />
+          <NavigationProperty Name="Place" Relationship="Self.FK__Map__IDPlace__3C69FB99" FromRole="Map" ToRole="Places" />
         </EntityType>
         <EntityType Name="ObjectInPlace">
           <Key>
@@ -612,10 +599,10 @@
           <Property Name="IDObjectInTheParkZone" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="IDObject" Type="Int32" Nullable="false" />
           <Property Name="IDPlace" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Objects" Relationship="Self.FK__ObjectInP__IDObj__5629CD9C" FromRole="ObjectInPlace" ToRole="Objects" />
-          <NavigationProperty Name="Places" Relationship="Self.FK__ObjectInP__IDPla__571DF1D5" FromRole="ObjectInPlace" ToRole="Places" />
+          <NavigationProperty Name="Object" Relationship="Self.FK__ObjectInP__IDObj__5629CD9C" FromRole="ObjectInPlace" ToRole="Objects" />
+          <NavigationProperty Name="Place" Relationship="Self.FK__ObjectInP__IDPla__571DF1D5" FromRole="ObjectInPlace" ToRole="Places" />
         </EntityType>
-        <EntityType Name="Objects">
+        <EntityType Name="Object">
           <Key>
             <PropertyRef Name="IDObject" />
           </Key>
@@ -624,9 +611,9 @@
           <Property Name="ObjectDescription" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="StatusOfTheObject" Type="Boolean" Nullable="false" />
           <Property Name="ObjectImage" Type="Binary" MaxLength="Max" FixedLength="false" />
-          <NavigationProperty Name="ObjectInPlace" Relationship="Self.FK__ObjectInP__IDObj__5629CD9C" FromRole="Objects" ToRole="ObjectInPlace" />
+          <NavigationProperty Name="ObjectInPlaces" Relationship="Self.FK__ObjectInP__IDObj__5629CD9C" FromRole="Objects" ToRole="ObjectInPlace" />
         </EntityType>
-        <EntityType Name="ParkManagers">
+        <EntityType Name="ParkManager">
           <Key>
             <PropertyRef Name="IDParkManager" />
           </Key>
@@ -636,8 +623,12 @@
           <Property Name="MiddleName" Type="String" MaxLength="150" FixedLength="false" Unicode="true" />
           <Property Name="Username" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
           <Property Name="Password" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" Nullable="false" />
+          <Property Name="Email" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="PhoneNumber" Type="Decimal" Precision="12" Scale="0" />
+          <Property Name="Birthday" Type="DateTime" Precision="0" />
+          <Property Name="ProfilePhoto" Type="Binary" MaxLength="Max" FixedLength="false" />
         </EntityType>
-        <EntityType Name="ParkZones">
+        <EntityType Name="ParkZone">
           <Key>
             <PropertyRef Name="IDParkZone" />
           </Key>
@@ -645,19 +636,19 @@
           <Property Name="ParkZoneName" Type="String" MaxLength="100" FixedLength="false" Unicode="true" Nullable="false" />
           <NavigationProperty Name="Places" Relationship="Self.FK__Places__IDParkZo__398D8EEE" FromRole="ParkZones" ToRole="Places" />
         </EntityType>
-        <EntityType Name="Places">
+        <EntityType Name="Place">
           <Key>
             <PropertyRef Name="IDPlace" />
           </Key>
           <Property Name="IDPlace" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="PlaceName" Type="String" MaxLength="100" FixedLength="false" Unicode="true" Nullable="false" />
           <Property Name="IDParkZone" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="AttractionInPlace" Relationship="Self.FK__Attractio__IDPla__534D60F1" FromRole="Places" ToRole="AttractionInPlace" />
-          <NavigationProperty Name="ConstructionInPlace" Relationship="Self.FK__Construct__IDPla__5AEE82B9" FromRole="Places" ToRole="ConstructionInPlace" />
-          <NavigationProperty Name="EventInPlace" Relationship="Self.FK__EventInPl__IDPla__5EBF139D" FromRole="Places" ToRole="EventInPlace" />
-          <NavigationProperty Name="Map" Relationship="Self.FK__Map__IDPlace__3C69FB99" FromRole="Places" ToRole="Map" />
-          <NavigationProperty Name="ObjectInPlace" Relationship="Self.FK__ObjectInP__IDPla__571DF1D5" FromRole="Places" ToRole="ObjectInPlace" />
-          <NavigationProperty Name="ParkZones" Relationship="Self.FK__Places__IDParkZo__398D8EEE" FromRole="Places" ToRole="ParkZones" />
+          <NavigationProperty Name="AttractionInPlaces" Relationship="Self.FK__Attractio__IDPla__534D60F1" FromRole="Places" ToRole="AttractionInPlace" />
+          <NavigationProperty Name="ConstructionInPlaces" Relationship="Self.FK__Construct__IDPla__5AEE82B9" FromRole="Places" ToRole="ConstructionInPlace" />
+          <NavigationProperty Name="EventInPlaces" Relationship="Self.FK__EventInPl__IDPla__5EBF139D" FromRole="Places" ToRole="EventInPlace" />
+          <NavigationProperty Name="Maps" Relationship="Self.FK__Map__IDPlace__3C69FB99" FromRole="Places" ToRole="Map" />
+          <NavigationProperty Name="ObjectInPlaces" Relationship="Self.FK__ObjectInP__IDPla__571DF1D5" FromRole="Places" ToRole="ObjectInPlace" />
+          <NavigationProperty Name="ParkZone" Relationship="Self.FK__Places__IDParkZo__398D8EEE" FromRole="Places" ToRole="ParkZones" />
         </EntityType>
         <EntityType Name="ScheduleForAttraction">
           <Key>
@@ -667,7 +658,7 @@
           <Property Name="IDAttraction" Type="Int32" Nullable="false" />
           <Property Name="IDAttractionSchedule" Type="Int32" Nullable="false" />
           <Property Name="IDDayOfWeek" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Attractions" Relationship="Self.FK__ScheduleF__IDAtt__6383C8BA" FromRole="ScheduleForAttraction" ToRole="Attractions" />
+          <NavigationProperty Name="Attraction" Relationship="Self.FK__ScheduleF__IDAtt__6383C8BA" FromRole="ScheduleForAttraction" ToRole="Attractions" />
           <NavigationProperty Name="AttractionSchedule" Relationship="Self.FK__ScheduleF__IDAtt__6477ECF3" FromRole="ScheduleForAttraction" ToRole="AttractionSchedule" />
           <NavigationProperty Name="DayOfWeek" Relationship="Self.FK__ScheduleF__IDDay__656C112C" FromRole="ScheduleForAttraction" ToRole="DayOfWeek" />
         </EntityType>
@@ -679,19 +670,18 @@
           <Property Name="IDConstruction" Type="Int32" Nullable="false" />
           <Property Name="IDConstructionSchedule" Type="Int32" Nullable="false" />
           <Property Name="IDDayOfWeek" Type="Int32" Nullable="false" />
-          <NavigationProperty Name="Constructions" Relationship="Self.FK__ScheduleF__IDCon__68487DD7" FromRole="ScheduleForConstruction" ToRole="Constructions" />
+          <NavigationProperty Name="Construction" Relationship="Self.FK__ScheduleF__IDCon__68487DD7" FromRole="ScheduleForConstruction" ToRole="Constructions" />
           <NavigationProperty Name="ConstructionSchedule" Relationship="Self.FK__ScheduleF__IDCon__693CA210" FromRole="ScheduleForConstruction" ToRole="ConstructionSchedule" />
           <NavigationProperty Name="DayOfWeek" Relationship="Self.FK__ScheduleF__IDDay__6A30C649" FromRole="ScheduleForConstruction" ToRole="DayOfWeek" />
         </EntityType>
-        <EntityType Name="TypeOfAttractions">
+        <EntityType Name="TypeOfAttraction">
           <Key>
             <PropertyRef Name="IDTypeOfAttraction" />
           </Key>
           <Property Name="IDTypeOfAttraction" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="TypeName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" Nullable="false" />
-          <NavigationProperty Name="Attractions" Relationship="Self.FK__Attractio__IDTyp__44FF419A" FromRole="TypeOfAttractions" ToRole="Attractions" />
         </EntityType>
-        <EntityType Name="TypeOfConstructions">
+        <EntityType Name="TypeOfConstruction">
           <Key>
             <PropertyRef Name="IDTypeOfConstruction" />
           </Key>
@@ -700,7 +690,7 @@
           <NavigationProperty Name="Constructions" Relationship="Self.FK__Construct__IDTyp__4D94879B" FromRole="TypeOfConstructions" ToRole="Constructions" />
         </EntityType>
         <Association Name="FK__Attractio__IDAtt__52593CB8">
-          <End Role="Attractions" Type="Self.Attractions" Multiplicity="1" />
+          <End Role="Attractions" Type="Self.Attraction" Multiplicity="1" />
           <End Role="AttractionInPlace" Type="Self.AttractionInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Attractions">
@@ -712,7 +702,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Attractio__IDPla__534D60F1">
-          <End Role="Places" Type="Self.Places" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="1" />
           <End Role="AttractionInPlace" Type="Self.AttractionInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Places">
@@ -723,20 +713,8 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
-        <Association Name="FK__Attractio__IDTyp__44FF419A">
-          <End Role="TypeOfAttractions" Type="Self.TypeOfAttractions" Multiplicity="1" />
-          <End Role="Attractions" Type="Self.Attractions" Multiplicity="*" />
-          <ReferentialConstraint>
-            <Principal Role="TypeOfAttractions">
-              <PropertyRef Name="IDTypeOfAttraction" />
-            </Principal>
-            <Dependent Role="Attractions">
-              <PropertyRef Name="IDTypeOfAttraction" />
-            </Dependent>
-          </ReferentialConstraint>
-        </Association>
         <Association Name="FK__ScheduleF__IDAtt__6383C8BA">
-          <End Role="Attractions" Type="Self.Attractions" Multiplicity="1" />
+          <End Role="Attractions" Type="Self.Attraction" Multiplicity="1" />
           <End Role="ScheduleForAttraction" Type="Self.ScheduleForAttraction" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Attractions">
@@ -760,7 +738,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Construct__IDCon__59FA5E80">
-          <End Role="Constructions" Type="Self.Constructions" Multiplicity="1" />
+          <End Role="Constructions" Type="Self.Construction" Multiplicity="1" />
           <End Role="ConstructionInPlace" Type="Self.ConstructionInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Constructions">
@@ -772,7 +750,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Construct__IDPla__5AEE82B9">
-          <End Role="Places" Type="Self.Places" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="1" />
           <End Role="ConstructionInPlace" Type="Self.ConstructionInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Places">
@@ -784,8 +762,8 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Construct__IDTyp__4D94879B">
-          <End Role="TypeOfConstructions" Type="Self.TypeOfConstructions" Multiplicity="1" />
-          <End Role="Constructions" Type="Self.Constructions" Multiplicity="*" />
+          <End Role="TypeOfConstructions" Type="Self.TypeOfConstruction" Multiplicity="1" />
+          <End Role="Constructions" Type="Self.Construction" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="TypeOfConstructions">
               <PropertyRef Name="IDTypeOfConstruction" />
@@ -796,7 +774,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__ScheduleF__IDCon__68487DD7">
-          <End Role="Constructions" Type="Self.Constructions" Multiplicity="1" />
+          <End Role="Constructions" Type="Self.Construction" Multiplicity="1" />
           <End Role="ScheduleForConstruction" Type="Self.ScheduleForConstruction" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Constructions">
@@ -844,7 +822,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__EventInPl__IDEve__5DCAEF64">
-          <End Role="Events" Type="Self.Events" Multiplicity="1" />
+          <End Role="Events" Type="Self.Event" Multiplicity="1" />
           <End Role="EventInPlace" Type="Self.EventInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Events">
@@ -856,7 +834,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__EventInPl__IDPla__5EBF139D">
-          <End Role="Places" Type="Self.Places" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="1" />
           <End Role="EventInPlace" Type="Self.EventInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Places">
@@ -868,7 +846,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Map__IDPlace__3C69FB99">
-          <End Role="Places" Type="Self.Places" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="1" />
           <End Role="Map" Type="Self.Map" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Places">
@@ -880,7 +858,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__ObjectInP__IDObj__5629CD9C">
-          <End Role="Objects" Type="Self.Objects" Multiplicity="1" />
+          <End Role="Objects" Type="Self.Object" Multiplicity="1" />
           <End Role="ObjectInPlace" Type="Self.ObjectInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Objects">
@@ -892,7 +870,7 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__ObjectInP__IDPla__571DF1D5">
-          <End Role="Places" Type="Self.Places" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="1" />
           <End Role="ObjectInPlace" Type="Self.ObjectInPlace" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="Places">
@@ -904,8 +882,8 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK__Places__IDParkZo__398D8EEE">
-          <End Role="ParkZones" Type="Self.ParkZones" Multiplicity="1" />
-          <End Role="Places" Type="Self.Places" Multiplicity="*" />
+          <End Role="ParkZones" Type="Self.ParkZone" Multiplicity="1" />
+          <End Role="Places" Type="Self.Place" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="ParkZones">
               <PropertyRef Name="IDParkZone" />
@@ -916,52 +894,48 @@
           </ReferentialConstraint>
         </Association>
         <EntityContainer Name="InteractiveKioskEntities" annotation:LazyLoadingEnabled="true">
-          <EntitySet Name="AttractionInPlace" EntityType="Self.AttractionInPlace" />
-          <EntitySet Name="Attractions" EntityType="Self.Attractions" />
-          <EntitySet Name="AttractionSchedule" EntityType="Self.AttractionSchedule" />
-          <EntitySet Name="ConstructionInPlace" EntityType="Self.ConstructionInPlace" />
-          <EntitySet Name="Constructions" EntityType="Self.Constructions" />
-          <EntitySet Name="ConstructionSchedule" EntityType="Self.ConstructionSchedule" />
-          <EntitySet Name="DayOfWeek" EntityType="Self.DayOfWeek" />
-          <EntitySet Name="EventInPlace" EntityType="Self.EventInPlace" />
-          <EntitySet Name="Events" EntityType="Self.Events" />
-          <EntitySet Name="Map" EntityType="Self.Map" />
-          <EntitySet Name="ObjectInPlace" EntityType="Self.ObjectInPlace" />
-          <EntitySet Name="Objects" EntityType="Self.Objects" />
-          <EntitySet Name="ParkManagers" EntityType="Self.ParkManagers" />
-          <EntitySet Name="ParkZones" EntityType="Self.ParkZones" />
-          <EntitySet Name="Places" EntityType="Self.Places" />
-          <EntitySet Name="ScheduleForAttraction" EntityType="Self.ScheduleForAttraction" />
-          <EntitySet Name="ScheduleForConstruction" EntityType="Self.ScheduleForConstruction" />
-          <EntitySet Name="TypeOfAttractions" EntityType="Self.TypeOfAttractions" />
-          <EntitySet Name="TypeOfConstructions" EntityType="Self.TypeOfConstructions" />
+          <EntitySet Name="AttractionInPlaces" EntityType="Self.AttractionInPlace" />
+          <EntitySet Name="Attractions" EntityType="Self.Attraction" />
+          <EntitySet Name="AttractionSchedules" EntityType="Self.AttractionSchedule" />
+          <EntitySet Name="ConstructionInPlaces" EntityType="Self.ConstructionInPlace" />
+          <EntitySet Name="Constructions" EntityType="Self.Construction" />
+          <EntitySet Name="ConstructionSchedules" EntityType="Self.ConstructionSchedule" />
+          <EntitySet Name="DayOfWeeks" EntityType="Self.DayOfWeek" />
+          <EntitySet Name="EventInPlaces" EntityType="Self.EventInPlace" />
+          <EntitySet Name="Events" EntityType="Self.Event" />
+          <EntitySet Name="Maps" EntityType="Self.Map" />
+          <EntitySet Name="ObjectInPlaces" EntityType="Self.ObjectInPlace" />
+          <EntitySet Name="Objects" EntityType="Self.Object" />
+          <EntitySet Name="ParkManagers" EntityType="Self.ParkManager" />
+          <EntitySet Name="ParkZones" EntityType="Self.ParkZone" />
+          <EntitySet Name="Places" EntityType="Self.Place" />
+          <EntitySet Name="ScheduleForAttractions" EntityType="Self.ScheduleForAttraction" />
+          <EntitySet Name="ScheduleForConstructions" EntityType="Self.ScheduleForConstruction" />
+          <EntitySet Name="TypeOfAttractions" EntityType="Self.TypeOfAttraction" />
+          <EntitySet Name="TypeOfConstructions" EntityType="Self.TypeOfConstruction" />
           <AssociationSet Name="FK__Attractio__IDAtt__52593CB8" Association="Self.FK__Attractio__IDAtt__52593CB8">
             <End Role="Attractions" EntitySet="Attractions" />
-            <End Role="AttractionInPlace" EntitySet="AttractionInPlace" />
+            <End Role="AttractionInPlace" EntitySet="AttractionInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__Attractio__IDPla__534D60F1" Association="Self.FK__Attractio__IDPla__534D60F1">
             <End Role="Places" EntitySet="Places" />
-            <End Role="AttractionInPlace" EntitySet="AttractionInPlace" />
-          </AssociationSet>
-          <AssociationSet Name="FK__Attractio__IDTyp__44FF419A" Association="Self.FK__Attractio__IDTyp__44FF419A">
-            <End Role="TypeOfAttractions" EntitySet="TypeOfAttractions" />
-            <End Role="Attractions" EntitySet="Attractions" />
+            <End Role="AttractionInPlace" EntitySet="AttractionInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDAtt__6383C8BA" Association="Self.FK__ScheduleF__IDAtt__6383C8BA">
             <End Role="Attractions" EntitySet="Attractions" />
-            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttraction" />
+            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttractions" />
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDAtt__6477ECF3" Association="Self.FK__ScheduleF__IDAtt__6477ECF3">
-            <End Role="AttractionSchedule" EntitySet="AttractionSchedule" />
-            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttraction" />
+            <End Role="AttractionSchedule" EntitySet="AttractionSchedules" />
+            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttractions" />
           </AssociationSet>
           <AssociationSet Name="FK__Construct__IDCon__59FA5E80" Association="Self.FK__Construct__IDCon__59FA5E80">
             <End Role="Constructions" EntitySet="Constructions" />
-            <End Role="ConstructionInPlace" EntitySet="ConstructionInPlace" />
+            <End Role="ConstructionInPlace" EntitySet="ConstructionInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__Construct__IDPla__5AEE82B9" Association="Self.FK__Construct__IDPla__5AEE82B9">
             <End Role="Places" EntitySet="Places" />
-            <End Role="ConstructionInPlace" EntitySet="ConstructionInPlace" />
+            <End Role="ConstructionInPlace" EntitySet="ConstructionInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__Construct__IDTyp__4D94879B" Association="Self.FK__Construct__IDTyp__4D94879B">
             <End Role="TypeOfConstructions" EntitySet="TypeOfConstructions" />
@@ -969,39 +943,39 @@
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDCon__68487DD7" Association="Self.FK__ScheduleF__IDCon__68487DD7">
             <End Role="Constructions" EntitySet="Constructions" />
-            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstruction" />
+            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstructions" />
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDCon__693CA210" Association="Self.FK__ScheduleF__IDCon__693CA210">
-            <End Role="ConstructionSchedule" EntitySet="ConstructionSchedule" />
-            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstruction" />
+            <End Role="ConstructionSchedule" EntitySet="ConstructionSchedules" />
+            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstructions" />
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDDay__656C112C" Association="Self.FK__ScheduleF__IDDay__656C112C">
-            <End Role="DayOfWeek" EntitySet="DayOfWeek" />
-            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttraction" />
+            <End Role="DayOfWeek" EntitySet="DayOfWeeks" />
+            <End Role="ScheduleForAttraction" EntitySet="ScheduleForAttractions" />
           </AssociationSet>
           <AssociationSet Name="FK__ScheduleF__IDDay__6A30C649" Association="Self.FK__ScheduleF__IDDay__6A30C649">
-            <End Role="DayOfWeek" EntitySet="DayOfWeek" />
-            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstruction" />
+            <End Role="DayOfWeek" EntitySet="DayOfWeeks" />
+            <End Role="ScheduleForConstruction" EntitySet="ScheduleForConstructions" />
           </AssociationSet>
           <AssociationSet Name="FK__EventInPl__IDEve__5DCAEF64" Association="Self.FK__EventInPl__IDEve__5DCAEF64">
             <End Role="Events" EntitySet="Events" />
-            <End Role="EventInPlace" EntitySet="EventInPlace" />
+            <End Role="EventInPlace" EntitySet="EventInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__EventInPl__IDPla__5EBF139D" Association="Self.FK__EventInPl__IDPla__5EBF139D">
             <End Role="Places" EntitySet="Places" />
-            <End Role="EventInPlace" EntitySet="EventInPlace" />
+            <End Role="EventInPlace" EntitySet="EventInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__Map__IDPlace__3C69FB99" Association="Self.FK__Map__IDPlace__3C69FB99">
             <End Role="Places" EntitySet="Places" />
-            <End Role="Map" EntitySet="Map" />
+            <End Role="Map" EntitySet="Maps" />
           </AssociationSet>
           <AssociationSet Name="FK__ObjectInP__IDObj__5629CD9C" Association="Self.FK__ObjectInP__IDObj__5629CD9C">
             <End Role="Objects" EntitySet="Objects" />
-            <End Role="ObjectInPlace" EntitySet="ObjectInPlace" />
+            <End Role="ObjectInPlace" EntitySet="ObjectInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__ObjectInP__IDPla__571DF1D5" Association="Self.FK__ObjectInP__IDPla__571DF1D5">
             <End Role="Places" EntitySet="Places" />
-            <End Role="ObjectInPlace" EntitySet="ObjectInPlace" />
+            <End Role="ObjectInPlace" EntitySet="ObjectInPlaces" />
           </AssociationSet>
           <AssociationSet Name="FK__Places__IDParkZo__398D8EEE" Association="Self.FK__Places__IDParkZo__398D8EEE">
             <End Role="ParkZones" EntitySet="ParkZones" />
@@ -1013,8 +987,8 @@
     <!-- C-S mapping content -->
     <edmx:Mappings>
       <Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2009/11/mapping/cs">
-        <EntityContainerMapping StorageEntityContainer="Хранилище InteractiveKioskModelContainer" CdmEntityContainer="InteractiveKioskEntities">
-          <EntitySetMapping Name="AttractionInPlace">
+        <EntityContainerMapping StorageEntityContainer="InteractiveKioskModelStoreContainer" CdmEntityContainer="InteractiveKioskEntities">
+          <EntitySetMapping Name="AttractionInPlaces">
             <EntityTypeMapping TypeName="InteractiveKioskModel.AttractionInPlace">
               <MappingFragment StoreEntitySet="AttractionInPlace">
                 <ScalarProperty Name="IDAttractionInTheParkZone" ColumnName="IDAttractionInTheParkZone" />
@@ -1024,7 +998,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Attractions">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.Attractions">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.Attraction">
               <MappingFragment StoreEntitySet="Attractions">
                 <ScalarProperty Name="IDAttraction" ColumnName="IDAttraction" />
                 <ScalarProperty Name="AttractionName" ColumnName="AttractionName" />
@@ -1038,7 +1012,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="AttractionSchedule">
+          <EntitySetMapping Name="AttractionSchedules">
             <EntityTypeMapping TypeName="InteractiveKioskModel.AttractionSchedule">
               <MappingFragment StoreEntitySet="AttractionSchedule">
                 <ScalarProperty Name="IDAttractionSchedule" ColumnName="IDAttractionSchedule" />
@@ -1051,7 +1025,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ConstructionInPlace">
+          <EntitySetMapping Name="ConstructionInPlaces">
             <EntityTypeMapping TypeName="InteractiveKioskModel.ConstructionInPlace">
               <MappingFragment StoreEntitySet="ConstructionInPlace">
                 <ScalarProperty Name="IDConstructionInPlace" ColumnName="IDConstructionInPlace" />
@@ -1061,7 +1035,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Constructions">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.Constructions">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.Construction">
               <MappingFragment StoreEntitySet="Constructions">
                 <ScalarProperty Name="IDConstruction" ColumnName="IDConstruction" />
                 <ScalarProperty Name="ConstructionName" ColumnName="ConstructionName" />
@@ -1072,7 +1046,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ConstructionSchedule">
+          <EntitySetMapping Name="ConstructionSchedules">
             <EntityTypeMapping TypeName="InteractiveKioskModel.ConstructionSchedule">
               <MappingFragment StoreEntitySet="ConstructionSchedule">
                 <ScalarProperty Name="IDConstructionSchedule" ColumnName="IDConstructionSchedule" />
@@ -1083,7 +1057,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="DayOfWeek">
+          <EntitySetMapping Name="DayOfWeeks">
             <EntityTypeMapping TypeName="InteractiveKioskModel.DayOfWeek">
               <MappingFragment StoreEntitySet="DayOfWeek">
                 <ScalarProperty Name="IDDayOfWeek" ColumnName="IDDayOfWeek" />
@@ -1091,7 +1065,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="EventInPlace">
+          <EntitySetMapping Name="EventInPlaces">
             <EntityTypeMapping TypeName="InteractiveKioskModel.EventInPlace">
               <MappingFragment StoreEntitySet="EventInPlace">
                 <ScalarProperty Name="IDEventInTheParkZone" ColumnName="IDEventInTheParkZone" />
@@ -1101,7 +1075,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Events">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.Events">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.Event">
               <MappingFragment StoreEntitySet="Events">
                 <ScalarProperty Name="IDEvent" ColumnName="IDEvent" />
                 <ScalarProperty Name="EventName" ColumnName="EventName" />
@@ -1112,7 +1086,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="Map">
+          <EntitySetMapping Name="Maps">
             <EntityTypeMapping TypeName="InteractiveKioskModel.Map">
               <MappingFragment StoreEntitySet="Map">
                 <ScalarProperty Name="IDMap" ColumnName="IDMap" />
@@ -1120,7 +1094,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ObjectInPlace">
+          <EntitySetMapping Name="ObjectInPlaces">
             <EntityTypeMapping TypeName="InteractiveKioskModel.ObjectInPlace">
               <MappingFragment StoreEntitySet="ObjectInPlace">
                 <ScalarProperty Name="IDObjectInTheParkZone" ColumnName="IDObjectInTheParkZone" />
@@ -1130,7 +1104,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Objects">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.Objects">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.Object">
               <MappingFragment StoreEntitySet="Objects">
                 <ScalarProperty Name="IDObject" ColumnName="IDObject" />
                 <ScalarProperty Name="ObjectName" ColumnName="ObjectName" />
@@ -1141,7 +1115,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ParkManagers">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.ParkManagers">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.ParkManager">
               <MappingFragment StoreEntitySet="ParkManagers">
                 <ScalarProperty Name="IDParkManager" ColumnName="IDParkManager" />
                 <ScalarProperty Name="Surname" ColumnName="Surname" />
@@ -1149,11 +1123,15 @@
                 <ScalarProperty Name="MiddleName" ColumnName="MiddleName" />
                 <ScalarProperty Name="Username" ColumnName="Username" />
                 <ScalarProperty Name="Password" ColumnName="Password" />
+                <ScalarProperty Name="Email" ColumnName="Email" />
+                <ScalarProperty Name="PhoneNumber" ColumnName="PhoneNumber" />
+                <ScalarProperty Name="Birthday" ColumnName="Birthday" />
+                <ScalarProperty Name="ProfilePhoto" ColumnName="ProfilePhoto" />
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="ParkZones">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.ParkZones">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.ParkZone">
               <MappingFragment StoreEntitySet="ParkZones">
                 <ScalarProperty Name="IDParkZone" ColumnName="IDParkZone" />
                 <ScalarProperty Name="ParkZoneName" ColumnName="ParkZoneName" />
@@ -1161,7 +1139,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="Places">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.Places">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.Place">
               <MappingFragment StoreEntitySet="Places">
                 <ScalarProperty Name="IDPlace" ColumnName="IDPlace" />
                 <ScalarProperty Name="PlaceName" ColumnName="PlaceName" />
@@ -1169,7 +1147,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ScheduleForAttraction">
+          <EntitySetMapping Name="ScheduleForAttractions">
             <EntityTypeMapping TypeName="InteractiveKioskModel.ScheduleForAttraction">
               <MappingFragment StoreEntitySet="ScheduleForAttraction">
                 <ScalarProperty Name="IDScheduleForAttraction" ColumnName="IDScheduleForAttraction" />
@@ -1179,7 +1157,7 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ScheduleForConstruction">
+          <EntitySetMapping Name="ScheduleForConstructions">
             <EntityTypeMapping TypeName="InteractiveKioskModel.ScheduleForConstruction">
               <MappingFragment StoreEntitySet="ScheduleForConstruction">
                 <ScalarProperty Name="IDScheduleForConstruction" ColumnName="IDScheduleForConstruction" />
@@ -1190,7 +1168,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="TypeOfAttractions">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.TypeOfAttractions">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.TypeOfAttraction">
               <MappingFragment StoreEntitySet="TypeOfAttractions">
                 <ScalarProperty Name="IDTypeOfAttraction" ColumnName="IDTypeOfAttraction" />
                 <ScalarProperty Name="TypeName" ColumnName="TypeName" />
@@ -1198,7 +1176,7 @@
             </EntityTypeMapping>
           </EntitySetMapping>
           <EntitySetMapping Name="TypeOfConstructions">
-            <EntityTypeMapping TypeName="InteractiveKioskModel.TypeOfConstructions">
+            <EntityTypeMapping TypeName="InteractiveKioskModel.TypeOfConstruction">
               <MappingFragment StoreEntitySet="TypeOfConstructions">
                 <ScalarProperty Name="IDTypeOfConstruction" ColumnName="IDTypeOfConstruction" />
                 <ScalarProperty Name="TypeName" ColumnName="TypeName" />
@@ -1219,10 +1197,10 @@
     <Options>
       <DesignerInfoPropertySet>
         <DesignerProperty Name="ValidateOnBuild" Value="true" />
-        <DesignerProperty Name="EnablePluralization" Value="false" />
+        <DesignerProperty Name="EnablePluralization" Value="true" />
         <DesignerProperty Name="IncludeForeignKeysInModel" Value="true" />
         <DesignerProperty Name="UseLegacyProvider" Value="false" />
-        <DesignerProperty Name="CodeGenerationStrategy" Value="Нет" />
+        <DesignerProperty Name="CodeGenerationStrategy" Value="None" />
       </DesignerInfoPropertySet>
     </Options>
     <!-- Diagram content (shape and connector positions) -->

+ 10 - 11
InteractiveKiosk/DataBase.edmx.diagram

@@ -4,29 +4,28 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="5c7c16964a114ee69a52ff2e0b59133c" Name="Diagram1">
+      <Diagram DiagramId="1651e709643e47ef9f26f1c53baeeb0c" Name="Diagram1">
         <EntityTypeShape EntityType="InteractiveKioskModel.AttractionInPlace" Width="1.5" PointX="5.25" PointY="6.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.Attractions" Width="1.5" PointX="3" PointY="10.125" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.Attraction" Width="1.5" PointX="3" PointY="10.25" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.AttractionSchedule" Width="1.5" PointX="7.75" PointY="14.75" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.ConstructionInPlace" Width="1.5" PointX="5.25" PointY="3.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.Constructions" Width="1.5" PointX="3" PointY="2.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.Construction" Width="1.5" PointX="3" PointY="2.5" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.ConstructionSchedule" Width="1.5" PointX="8.75" PointY="3.125" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.DayOfWeek" Width="1.5" PointX="7.75" PointY="12.125" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.EventInPlace" Width="1.5" PointX="5.25" PointY="9.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.Events" Width="1.5" PointX="3" PointY="14.625" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.Event" Width="1.5" PointX="3" PointY="14.625" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.Map" Width="1.5" PointX="5.25" PointY="15.25" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.ObjectInPlace" Width="1.5" PointX="8.25" PointY="6.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.Objects" Width="1.5" PointX="6" PointY="0.75" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.ParkManagers" Width="1.5" PointX="10.75" PointY="0.875" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.ParkZones" Width="1.5" PointX="0.75" PointY="7" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.Places" Width="1.5" PointX="3" PointY="6.5" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.Object" Width="1.5" PointX="6" PointY="0.75" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.ParkManager" Width="1.5" PointX="10.75" PointY="0.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.ParkZone" Width="1.5" PointX="0.75" PointY="7" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.Place" Width="1.5" PointX="3" PointY="6.5" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.ScheduleForAttraction" Width="1.5" PointX="10" PointY="10.875" IsExpanded="true" />
         <EntityTypeShape EntityType="InteractiveKioskModel.ScheduleForConstruction" Width="1.5" PointX="11" PointY="7" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.TypeOfAttractions" Width="1.5" PointX="0.75" PointY="11" IsExpanded="true" />
-        <EntityTypeShape EntityType="InteractiveKioskModel.TypeOfConstructions" Width="1.5" PointX="0.75" PointY="3" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.TypeOfAttraction" Width="1.5" PointX="12.75" PointY="0.875" IsExpanded="true" />
+        <EntityTypeShape EntityType="InteractiveKioskModel.TypeOfConstruction" Width="1.5" PointX="0.75" PointY="3" IsExpanded="true" />
         <AssociationConnector Association="InteractiveKioskModel.FK__Attractio__IDAtt__52593CB8" ManuallyRouted="false" />
         <AssociationConnector Association="InteractiveKioskModel.FK__Attractio__IDPla__534D60F1" ManuallyRouted="false" />
-        <AssociationConnector Association="InteractiveKioskModel.FK__Attractio__IDTyp__44FF419A" ManuallyRouted="false" />
         <AssociationConnector Association="InteractiveKioskModel.FK__ScheduleF__IDAtt__6383C8BA" ManuallyRouted="false" />
         <AssociationConnector Association="InteractiveKioskModel.FK__ScheduleF__IDAtt__6477ECF3" ManuallyRouted="false" />
         <AssociationConnector Association="InteractiveKioskModel.FK__Construct__IDCon__59FA5E80" ManuallyRouted="false" />

+ 7 - 7
InteractiveKiosk/DayOfWeek.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -17,16 +17,16 @@ namespace InteractiveKiosk
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public DayOfWeek()
         {
-            this.ScheduleForAttraction = new HashSet<ScheduleForAttraction>();
-            this.ScheduleForConstruction = new HashSet<ScheduleForConstruction>();
+            this.ScheduleForAttractions = new HashSet<ScheduleForAttraction>();
+            this.ScheduleForConstructions = new HashSet<ScheduleForConstruction>();
         }
     
         public int IDDayOfWeek { get; set; }
         public string NameDayOfWeek { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForAttraction> ScheduleForAttraction { get; set; }
+        public virtual ICollection<ScheduleForAttraction> ScheduleForAttractions { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ScheduleForConstruction> ScheduleForConstruction { get; set; }
+        public virtual ICollection<ScheduleForConstruction> ScheduleForConstructions { get; set; }
     }
 }

+ 356 - 0
InteractiveKiosk/EditProfile.xaml

@@ -0,0 +1,356 @@
+<Window x:Class="InteractiveKiosk.EditProfile"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        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"
+        xmlns:local="clr-namespace:InteractiveKiosk"
+        mc:Ignorable="d"
+        Height="440" Width="400" AllowsTransparency="True" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Icon="Logo.png" WindowStyle="None" Background="Transparent">
+    <Window.Resources>
+        <Style x:Key="TextBox" TargetType="TextBox">
+            <Setter Property="Background" Value="White"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Height" Value="23"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="FontSize" Value="13"/>
+            <Setter Property="Padding" Value="10,0,0,0"/>
+            <Setter Property="BorderBrush" Value="Black"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="TextBox">
+                        <Grid x:Name="root" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" SnapsToDevicePixels="True">
+                            <Border x:Name="Background" BorderThickness="1" CornerRadius="15" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"/>
+                            <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Padding="{TemplateBinding Padding}" IsTabStop="False" Background="{x:Null}" TextElement.Foreground="{TemplateBinding Foreground}"/>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter Property="BorderBrush" Value="Black"/>
+                                <Setter Property="Background" Value="White"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="Password" TargetType="PasswordBox">
+            <Setter Property="Background" Value="White"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Height" Value="23"/>
+            <Setter Property="Foreground" Value="Black"/>
+            <Setter Property="FontSize" Value="13"/>
+            <Setter Property="BorderBrush" Value="Black"/>
+            <Setter Property="Padding" Value="10,0,0,0"/>
+            <EventSetter Event="PasswordChanged" Handler="OnPasswordChanged"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="PasswordBox">
+                        <Grid x:Name="root" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}" SnapsToDevicePixels="True">
+                            <Border x:Name="Background" BorderThickness="1" CornerRadius="15" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"/>
+                            <ScrollViewer x:Name="PART_ContentHost" BorderThickness="0" Padding="{TemplateBinding Padding}" IsTabStop="False" Background="{x:Null}" TextElement.Foreground="{TemplateBinding Foreground}"/>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsFocused" Value="True">
+                                <Setter Property="BorderBrush" Value="Black"/>
+                                <Setter Property="Background" Value="White"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid Name="Authorization" Background="Transparent" MouseDown="EditProfile_MouseDown">
+        <Border CornerRadius="20" BorderBrush="Black" BorderThickness="0">
+            <Border.Background>
+                <ImageBrush ImageSource="file.jpg"/>
+            </Border.Background>
+            <Border x:Name="CancelButton" Width="106" BorderThickness="1" Background="Black" CornerRadius="15" Margin="214,397,80,10">
+                <Border.Style>
+                    <Style TargetType="{x:Type Border}">
+                        <Setter Property="BorderBrush" Value="Black"/>
+                        <Style.Triggers>
+                            <EventTrigger RoutedEvent="UIElement.PreviewMouseDown">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Gray"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                            <EventTrigger RoutedEvent="UIElement.PreviewMouseUp">
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Black"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Border.Style>
+                <Button Content="Отмена" FontSize="14" Foreground="Black" FontFamily="Segoe UI Semilight" Click="Cancel">
+                    <Button.Style>
+                        <Style TargetType="{x:Type Button}">
+                            <Setter Property="OverridesDefaultStyle" Value="True"/>
+                            <Setter Property="Background" Value="White"/>
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type Button}">
+                                        <Border x:Name="Border" BorderThickness="0" BorderBrush="Black" CornerRadius="15" Background="{TemplateBinding Background}">
+                                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                        </Border>
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="True">
+                                                <Setter Property="Background" Value="Gray"/>
+                                            </Trigger>
+                                            <EventTrigger RoutedEvent="UIElement.PreviewMouseDown">
+                                                <BeginStoryboard>
+                                                    <Storyboard>
+                                                        <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="2, 2, 0, 0"/>
+                                                        <ColorAnimation Storyboard.TargetProperty="Background.Color" To="Gray" Duration="0:0:0.0002"/>
+                                                    </Storyboard>
+                                                </BeginStoryboard>
+                                            </EventTrigger>
+                                            <EventTrigger RoutedEvent="UIElement.PreviewMouseUp">
+                                                <BeginStoryboard>
+                                                    <Storyboard>
+                                                        <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="0, 0, 0, 0"/>
+                                                        <ColorAnimation Storyboard.TargetProperty="Background.Color" To="White" Duration="0:0:0.0002"/>
+                                                    </Storyboard>
+                                                </BeginStoryboard>
+                                            </EventTrigger>
+                                        </ControlTemplate.Triggers>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </Style>
+                    </Button.Style>
+                </Button>
+            </Border>
+        </Border>
+        <TextBlock HorizontalAlignment="Left" TextWrapping="Wrap" Text="РЕДАКТИРОВАНИЕ ПРОФИЛЯ" VerticalAlignment="Top" Height="29" Width="275" Margin="60,40,0,0" FontSize="20" FontFamily="Segoe UI Semilight"/>
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Width="69">
+            <Image Name="MinButton" Height="23" Width="20" Margin="5,-395,-13,0" MouseDown="MinButton_MouseDown">
+                <Image.Style>
+                    <Style TargetType="{x:Type Image}">
+                        <Setter Property="Source" Value="Resources/min(inactive).png"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsMouseOver, ElementName=MinButton}"
+                                         Value="True">
+                                <Setter Property="Source" Value="Resources/min.png"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Image.Style>
+            </Image>
+            <Image Name="ExitButton" Height="23" Width="20" Margin="20,-395,20,0" MouseDown="ExitButton_MouseDown">
+                <Image.Style>
+                    <Style TargetType="{x:Type Image}">
+                        <Setter Property="Source" Value="Resources/exit(inactive).png"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsMouseOver, ElementName=ExitButton}"
+                                         Value="True">
+                                <Setter Property="Source" Value="Resources/exit.png"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Image.Style>
+            </Image>
+        </StackPanel>
+        <Border Name="SaveButton" Width="106" BorderThickness="1" Background="Black" CornerRadius="15" Margin="80,397,214,10">
+            <Border.Style>
+                <Style TargetType="{x:Type Border}">
+                    <Setter Property="BorderBrush" Value="Black"/>
+                    <Style.Triggers>
+                        <EventTrigger RoutedEvent="PreviewMouseDown">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Gray"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="PreviewMouseUp">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Black"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Border.Style>
+            <Button Content="Сохранить" FontSize="14" Foreground="Black" FontFamily="Segoe UI Semilight">
+                <Button.Style>
+                    <Style TargetType="Button">
+                        <Setter Property="OverridesDefaultStyle" Value="True"/>
+                        <Setter Property="Background" Value="White"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Border Name="Border" BorderThickness="0" BorderBrush="Black" CornerRadius="15" Background="{TemplateBinding Background}">
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="Background" Value="Gray"/>
+                                        </Trigger>
+                                        <EventTrigger RoutedEvent="PreviewMouseDown">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="2, 2, 0, 0"/>
+                                                    <ColorAnimation Storyboard.TargetProperty="Background.Color" To="Gray" Duration="0:0:0.0002"/>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                        <EventTrigger RoutedEvent="PreviewMouseUp">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="0, 0, 0, 0"/>
+                                                    <ColorAnimation Storyboard.TargetProperty="Background.Color" To="White" Duration="0:0:0.0002"/>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Button.Style>
+            </Button>
+        </Border>
+        <Border Name="ReviewButton" Width="106" BorderThickness="1" Background="Black" CornerRadius="15" Margin="186,333,108,75">
+            <Border.Style>
+                <Style TargetType="{x:Type Border}">
+                    <Setter Property="BorderBrush" Value="Black"/>
+                    <Style.Triggers>
+                        <EventTrigger RoutedEvent="PreviewMouseDown">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Gray"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="PreviewMouseUp">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <ColorAnimation Storyboard.TargetProperty="BorderBrush.Color" Duration="0:0:0.100" To="Black"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </Style.Triggers>
+                </Style>
+            </Border.Style>
+            <Button Content="Обзор..." FontSize="12" Foreground="Black" FontFamily="Segoe UI Semilight">
+                <Button.Style>
+                    <Style TargetType="Button">
+                        <Setter Property="OverridesDefaultStyle" Value="True"/>
+                        <Setter Property="Background" Value="White"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="Button">
+                                    <Border Name="Border" BorderThickness="0" BorderBrush="Black" CornerRadius="15" Background="{TemplateBinding Background}">
+                                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="Background" Value="Gray"/>
+                                        </Trigger>
+                                        <EventTrigger RoutedEvent="PreviewMouseDown">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="2, 2, 0, 0"/>
+                                                    <ColorAnimation Storyboard.TargetProperty="Background.Color" To="Gray" Duration="0:0:0.0002"/>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                        <EventTrigger RoutedEvent="PreviewMouseUp">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ThicknessAnimation Storyboard.TargetProperty="Margin" Duration="0:0:0.100" To="0, 0, 0, 0"/>
+                                                    <ColorAnimation Storyboard.TargetProperty="Background.Color" To="White" Duration="0:0:0.0002"/>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </Button.Style>
+            </Button>
+        </Border>
+        <TextBox x:Name="Login" Style="{StaticResource TextBox}" Margin="186,98,46,309" Height="33"/>
+        <TextBox x:Name="Name" Style="{StaticResource TextBox}" Margin="186,176,46,231" Height="33"/>
+        <TextBox x:Name="EMail" Style="{StaticResource TextBox}" Margin="186,216,46,191" Height="33"/>
+        <TextBox x:Name="Phone" Style="{StaticResource TextBox}" Margin="186,255,46,152" Height="33"/>
+        <TextBox x:Name="Birthday" Style="{StaticResource TextBox}" Margin="186,294,46,113" Height="33"/>
+        <TextBlock IsHitTestVisible="False" FontSize="12" Text="Имя" VerticalAlignment="Top" Foreground="Gray" Margin="200,185,84,0" FontFamily="Segoe UI Semilight">
+            <TextBlock.Style>
+                <Style TargetType="{x:Type TextBlock}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Text, ElementName=Name}" Value="">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        <TextBlock IsHitTestVisible="False" FontSize="12" Text="E-mail" VerticalAlignment="Top" Foreground="Gray" Margin="200,224,84,0" FontFamily="Segoe UI Semilight">
+            <TextBlock.Style>
+                <Style TargetType="{x:Type TextBlock}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Text, ElementName=EMail}" Value="">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        <TextBlock IsHitTestVisible="False" FontSize="12" Text="Телефон" VerticalAlignment="Top" Foreground="Gray" Margin="200,263,84,0" FontFamily="Segoe UI Semilight">
+            <TextBlock.Style>
+                <Style TargetType="{x:Type TextBlock}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Text, ElementName=Phone}" Value="">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        <TextBlock IsHitTestVisible="False" FontSize="12" Text="Логин" VerticalAlignment="Top" Foreground="Gray" Margin="200,107,84,0" FontFamily="Segoe UI Semilight">
+            <TextBlock.Style>
+                <Style TargetType="{x:Type TextBlock}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Text, ElementName=Login}" Value="">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        <TextBlock IsHitTestVisible="False" FontSize="12" Text="ГГГГ-ММ-ДД" VerticalAlignment="Top" Foreground="Gray" Margin="200,302,84,0" FontFamily="Segoe UI Semilight">
+                <TextBlock.Style>
+                <Style TargetType="{x:Type TextBlock}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Text, ElementName=Birthday}" Value="">
+                            <Setter Property="Visibility" Value="Visible"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBlock.Style>
+        </TextBlock>
+        <PasswordBox x:Name="Password" Style="{StaticResource Password}" Margin="186,137,46,270" Height="33"/>
+        <TextBlock Name="Watermark" IsHitTestVisible="False" FontSize="12" Text="Пароль" VerticalAlignment="Top" Foreground="Gray" Margin="200,146,84,0" FontFamily="Segoe UI Semilight">
+        </TextBlock>
+        <TextBlock HorizontalAlignment="Left" Margin="46,107,0,0" TextWrapping="Wrap" Text="Имя пользователя:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,146,0,0" TextWrapping="Wrap" Text="Пароль:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,185,0,0" TextWrapping="Wrap" Text="Полное имя:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,224,0,0" TextWrapping="Wrap" Text="E-mail адрес:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,263,0,0" TextWrapping="Wrap" Text="Телефон:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,302,0,0" TextWrapping="Wrap" Text="Дата рождения:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+        <TextBlock HorizontalAlignment="Left" Margin="46,341,0,0" TextWrapping="Wrap" Text="Аватар:" VerticalAlignment="Top" Height="23" Width="125" FontSize="14" FontFamily="Segoe UI Semilight"/>
+    </Grid>
+</Window>

+ 64 - 0
InteractiveKiosk/EditProfile.xaml.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace InteractiveKiosk
+{
+    /// <summary>
+    /// Interaction logic for EditProfile.xaml
+    /// </summary>
+    public partial class EditProfile : Window
+    {
+        public EditProfile()
+        {
+            InitializeComponent();
+        }
+
+        private void MinButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            this.WindowState = WindowState.Minimized;
+        }
+
+        private void ExitButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            this.Close();
+        }
+
+        private void EditProfile_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                this.DragMove();
+            }
+        }
+
+        private void OnPasswordChanged(object sender, RoutedEventArgs e)
+        {
+            if (Password.Password.Length > 0)
+            {
+                Watermark.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                Watermark.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void Cancel(object sender, RoutedEventArgs e)
+        {
+            Profile p = new Profile();
+            p.Show();
+            this.Close();
+        }
+    }
+}

+ 7 - 7
InteractiveKiosk/Events.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,12 +12,12 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class Events
+    public partial class Event
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Events()
+        public Event()
         {
-            this.EventInPlace = new HashSet<EventInPlace>();
+            this.EventInPlaces = new HashSet<EventInPlace>();
         }
     
         public int IDEvent { get; set; }
@@ -28,6 +28,6 @@ namespace InteractiveKiosk
         public bool StatusOfTheEvent { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<EventInPlace> EventInPlace { get; set; }
+        public virtual ICollection<EventInPlace> EventInPlaces { get; set; }
     }
 }

+ 5 - 5
InteractiveKiosk/EventInPlace.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ namespace InteractiveKiosk
         public int IDEvent { get; set; }
         public int IDPlace { get; set; }
     
-        public virtual Events Events { get; set; }
-        public virtual Places Places { get; set; }
+        public virtual Event Event { get; set; }
+        public virtual Place Place { get; set; }
     }
 }

+ 35 - 35
InteractiveKiosk/InteractiveKiosk.csproj

@@ -68,25 +68,19 @@
     <Compile Include="AboutThePark.xaml.cs">
       <DependentUpon>AboutThePark.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Attraction.xaml.cs">
-      <DependentUpon>Attraction.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="AttractionInPlace.cs">
+    <Compile Include="Attraction.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Attractions.cs">
+    <Compile Include="AttractionInPlace.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
     <Compile Include="AttractionSchedule.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Construction.xaml.cs">
-      <DependentUpon>Construction.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ConstructionInPlace.cs">
+    <Compile Include="Construction.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Constructions.cs">
+    <Compile Include="ConstructionInPlace.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
     <Compile Include="ConstructionSchedule.cs">
@@ -110,31 +104,37 @@
     <Compile Include="DayOfWeek.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="EventInPlace.cs">
+    <Compile Include="EditProfile.xaml.cs">
+      <DependentUpon>EditProfile.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Event.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Events.cs">
+    <Compile Include="EventInPlace.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
+    <Compile Include="Managers.xaml.cs">
+      <DependentUpon>Managers.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Map.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
     <Compile Include="Map.xaml.cs">
       <DependentUpon>Map.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ObjectInPlace.cs">
+    <Compile Include="Object.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Objects.cs">
+    <Compile Include="ObjectInPlace.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="ParkManagers.cs">
+    <Compile Include="ParkManager.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="ParkZones.cs">
+    <Compile Include="ParkZone.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="Places.cs">
+    <Compile Include="Place.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
     <Compile Include="Profile.xaml.cs">
@@ -146,25 +146,21 @@
     <Compile Include="ScheduleForConstruction.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="TypeOfAttractions.cs">
+    <Compile Include="TypeOfAttraction.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
-    <Compile Include="TypeOfConstructions.cs">
+    <Compile Include="TypeOfConstruction.cs">
       <DependentUpon>DataBase.tt</DependentUpon>
     </Compile>
     <Page Include="AboutThePark.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Attraction.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="AuthorizationWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Construction.xaml">
+    <Page Include="EditProfile.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -183,6 +179,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Managers.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Map.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -218,29 +218,29 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="AboutThePark\" />
-    <Folder Include="HistoryThePark\" />
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="Resources\checked.png" />
+    <Resource Include="Resources\people.png" />
+    <Resource Include="Resources\man.png" />
+    <Resource Include="Resources\exit%28inactive%29.png" />
+    <Resource Include="Resources\exit.png" />
+    <Resource Include="Resources\min%28inactive%29.png" />
+    <Resource Include="Resources\min.png" />
+    <Resource Include="file.jpg" />
+  </ItemGroup>
+  <ItemGroup>
     <Content Include="DataBase.Context.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>DataBase.Context.cs</LastGenOutput>
       <DependentUpon>DataBase.edmx</DependentUpon>
+      <LastGenOutput>DataBase.Context.cs</LastGenOutput>
     </Content>
     <Content Include="DataBase.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <DependentUpon>DataBase.edmx</DependentUpon>
       <LastGenOutput>DataBase.cs</LastGenOutput>
     </Content>
-    <Resource Include="Resources\checked.png" />
-    <Resource Include="Resources\people.png" />
-    <Resource Include="Resources\man.png" />
-    <Resource Include="Resources\exit%28inactive%29.png" />
-    <Resource Include="Resources\exit.png" />
-    <Resource Include="Resources\min%28inactive%29.png" />
-    <Resource Include="Resources\min.png" />
-    <Resource Include="file.jpg" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 1 - 1
InteractiveKiosk/MainWindow.xaml

@@ -17,7 +17,7 @@
         </Button>
         <Button Content="ДОСТОПРИМЕЧАТЕЛЬНОСТИ" HorizontalAlignment="Left" Margin="291,633,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" FontFamily="Century Gothic" Background="#00000000">
         </Button>
-        <Button Content="КАФЕ И РЕСТОРАНЫ" HorizontalAlignment="Left" Margin="291,748,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" Background="#00000000" FontFamily="Century Gothic" Click="Constructions"/>
+        <Button Content="КАФЕ И РЕСТОРАНЫ" HorizontalAlignment="Left" Margin="291,748,0,0" VerticalAlignment="Top" Width="242" Height="110" FontSize="11" Background="#00000000" FontFamily="Century Gothic"/>
         <Button Content="АТТРАКЦИОНЫ" HorizontalAlignment="Left" Margin="538,633,0,0" VerticalAlignment="Top" Width="99" Height="225" FontSize="11" FontFamily="Century Gothic" Background="#00000000" Click="Attractions"/>
         <Button Content="АФИША ПАРКА" HorizontalAlignment="Left" Margin="476,342,0,0" VerticalAlignment="Top" Width="194" Height="42" FontFamily="Century Gothic" Background="#00000000"/>
         <Button Content="ПОДРОБНЕЕ" HorizontalAlignment="Left" Margin="253,195,0,0" VerticalAlignment="Top" Width="180" Height="40" FontFamily="Century Gothic" Background="#00000000" Click="More"/>

+ 11 - 26
InteractiveKiosk/MainWindow.xaml.cs

@@ -82,32 +82,17 @@ namespace InteractiveKiosk
 
         private void Attractions(object sender, RoutedEventArgs e)
         {
-            this.Opacity = 0.5;
-            this.Effect = new BlurEffect();
-            Attraction a = new Attraction()
-            {
-                Owner = this,
-                ShowInTaskbar = false,
-                Topmost = true
-            };
-            a.ShowDialog();
-            this.Opacity = 1;
-            this.Effect = null;
-        }
-
-        private void Constructions(object sender, RoutedEventArgs e)
-        {
-            this.Opacity = 0.5;
-            this.Effect = new BlurEffect();
-            Construction c = new Construction()
-            {
-                Owner = this,
-                ShowInTaskbar = false,
-                Topmost = true
-            };
-            c.ShowDialog();
-            this.Opacity = 1;
-            this.Effect = null;
+            //this.Opacity = 0.5;
+            //this.Effect = new BlurEffect();
+            //Attraction a = new Attraction()
+            //{
+            //    Owner = this,
+            //    ShowInTaskbar = false,
+            //    Topmost = true
+            //};
+            //a.ShowDialog();
+            //this.Opacity = 1;
+            //this.Effect = null;
         }
     }
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 361 - 0
InteractiveKiosk/Managers.xaml


+ 83 - 0
InteractiveKiosk/Managers.xaml.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace InteractiveKiosk
+{
+    /// <summary>
+    /// Interaction logic for Managers.xaml
+    /// </summary>
+    public partial class Managers : Window
+    {
+        InteractiveKioskEntities db = new InteractiveKioskEntities();
+        public Managers()
+        {
+            InitializeComponent();
+            Profiles.ItemsSource = db.ParkManagers.ToList();
+        }
+
+        private void CancelButton(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Add(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void Save(object sender, RoutedEventArgs e)
+        {
+            db.SaveChanges();
+        }
+
+        private void Delete(object sender, RoutedEventArgs e)
+        {
+            var result = MessageBox.Show("Вы точно хотите уволить сотрудника?", "Подтверждение", MessageBoxButton.YesNo, MessageBoxImage.Question);
+
+           if (result == MessageBoxResult.Yes)
+           {
+              ParkManager m = (ParkManager)Profiles.SelectedItem;
+              db.ParkManagers.Remove(m);
+              db.SaveChanges();
+              MessageBox.Show("Сотрудник успешно уволен!");
+              Profiles.ItemsSource = db.ParkManagers.ToList();
+
+           }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            db = new InteractiveKioskEntities();
+        }
+
+        private void Managers_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                this.DragMove();
+            }
+        }
+
+        private void MinButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            this.WindowState = WindowState.Minimized;
+        }
+
+        private void ExitButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            this.Close();
+        }
+
+    }
+}

+ 4 - 4
InteractiveKiosk/Map.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -17,6 +17,6 @@ namespace InteractiveKiosk
         public int IDMap { get; set; }
         public int IDPlace { get; set; }
     
-        public virtual Places Places { get; set; }
+        public virtual Place Place { get; set; }
     }
 }

+ 7 - 7
InteractiveKiosk/Objects.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,12 +12,12 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class Objects
+    public partial class Object
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Objects()
+        public Object()
         {
-            this.ObjectInPlace = new HashSet<ObjectInPlace>();
+            this.ObjectInPlaces = new HashSet<ObjectInPlace>();
         }
     
         public int IDObject { get; set; }
@@ -27,6 +27,6 @@ namespace InteractiveKiosk
         public byte[] ObjectImage { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ObjectInPlace> ObjectInPlace { get; set; }
+        public virtual ICollection<ObjectInPlace> ObjectInPlaces { get; set; }
     }
 }

+ 5 - 5
InteractiveKiosk/ObjectInPlace.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ namespace InteractiveKiosk
         public int IDObject { get; set; }
         public int IDPlace { get; set; }
     
-        public virtual Objects Objects { get; set; }
-        public virtual Places Places { get; set; }
+        public virtual Object Object { get; set; }
+        public virtual Place Place { get; set; }
     }
 }

+ 8 - 4
InteractiveKiosk/ParkManagers.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class ParkManagers
+    public partial class ParkManager
     {
         public int IDParkManager { get; set; }
         public string Surname { get; set; }
@@ -20,5 +20,9 @@ namespace InteractiveKiosk
         public string MiddleName { get; set; }
         public string Username { get; set; }
         public string Password { get; set; }
+        public string Email { get; set; }
+        public Nullable<decimal> PhoneNumber { get; set; }
+        public Nullable<System.DateTime> Birthday { get; set; }
+        public byte[] ProfilePhoto { get; set; }
     }
 }

+ 7 - 7
InteractiveKiosk/ParkZones.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,18 +12,18 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class ParkZones
+    public partial class ParkZone
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public ParkZones()
+        public ParkZone()
         {
-            this.Places = new HashSet<Places>();
+            this.Places = new HashSet<Place>();
         }
     
         public int IDParkZone { get; set; }
         public string ParkZoneName { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Places> Places { get; set; }
+        public virtual ICollection<Place> Places { get; set; }
     }
 }

+ 16 - 16
InteractiveKiosk/Places.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,16 +12,16 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class Places
+    public partial class Place
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public Places()
+        public Place()
         {
-            this.AttractionInPlace = new HashSet<AttractionInPlace>();
-            this.ConstructionInPlace = new HashSet<ConstructionInPlace>();
-            this.EventInPlace = new HashSet<EventInPlace>();
-            this.Map = new HashSet<Map>();
-            this.ObjectInPlace = new HashSet<ObjectInPlace>();
+            this.AttractionInPlaces = new HashSet<AttractionInPlace>();
+            this.ConstructionInPlaces = new HashSet<ConstructionInPlace>();
+            this.EventInPlaces = new HashSet<EventInPlace>();
+            this.Maps = new HashSet<Map>();
+            this.ObjectInPlaces = new HashSet<ObjectInPlace>();
         }
     
         public int IDPlace { get; set; }
@@ -29,15 +29,15 @@ namespace InteractiveKiosk
         public int IDParkZone { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<AttractionInPlace> AttractionInPlace { get; set; }
+        public virtual ICollection<AttractionInPlace> AttractionInPlaces { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ConstructionInPlace> ConstructionInPlace { get; set; }
+        public virtual ICollection<ConstructionInPlace> ConstructionInPlaces { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<EventInPlace> EventInPlace { get; set; }
+        public virtual ICollection<EventInPlace> EventInPlaces { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Map> Map { get; set; }
+        public virtual ICollection<Map> Maps { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<ObjectInPlace> ObjectInPlace { get; set; }
-        public virtual ParkZones ParkZones { get; set; }
+        public virtual ICollection<ObjectInPlace> ObjectInPlaces { get; set; }
+        public virtual ParkZone ParkZone { get; set; }
     }
 }

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 137 - 72
InteractiveKiosk/Profile.xaml


+ 29 - 0
InteractiveKiosk/Profile.xaml.cs

@@ -19,9 +19,16 @@ namespace InteractiveKiosk
     /// </summary>
     public partial class Profile : Window
     {
+        InteractiveKioskEntities db = new InteractiveKioskEntities();
         public Profile()
         {
             InitializeComponent();
+            Profiles.ItemsSource = db.ParkManagers.Where(x => x.IDParkManager == 1).ToList();
+            //Profiles.ItemsSource = db.ParkManagers.ToList();
+        }
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            db = new InteractiveKioskEntities();
         }
 
         private void MinButton_MouseDown(object sender, MouseButtonEventArgs e)
@@ -33,5 +40,27 @@ namespace InteractiveKiosk
         {
             this.Close();
         }
+
+        private void Profile_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                this.DragMove();
+            }
+        }
+
+        private void Edit(object sender, RoutedEventArgs e)
+        {
+            EditProfile ep = new EditProfile();
+            ep.Show();
+            this.Close();
+        }
+
+        private void Cancel(object sender, RoutedEventArgs e)
+        {
+            MainWindow mw = new MainWindow();
+            mw.Show();
+            this.Close();
+        }
     }
 }

+ 4 - 4
InteractiveKiosk/ScheduleForAttraction.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ namespace InteractiveKiosk
         public int IDAttractionSchedule { get; set; }
         public int IDDayOfWeek { get; set; }
     
-        public virtual Attractions Attractions { get; set; }
+        public virtual Attraction Attraction { get; set; }
         public virtual AttractionSchedule AttractionSchedule { get; set; }
         public virtual DayOfWeek DayOfWeek { get; set; }
     }

+ 4 - 4
InteractiveKiosk/ScheduleForConstruction.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -19,7 +19,7 @@ namespace InteractiveKiosk
         public int IDConstructionSchedule { get; set; }
         public int IDDayOfWeek { get; set; }
     
-        public virtual Constructions Constructions { get; set; }
+        public virtual Construction Construction { get; set; }
         public virtual ConstructionSchedule ConstructionSchedule { get; set; }
         public virtual DayOfWeek DayOfWeek { get; set; }
     }

+ 20 - 0
InteractiveKiosk/TypeOfAttraction.cs

@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace InteractiveKiosk
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class TypeOfAttraction
+    {
+        public int IDTypeOfAttraction { get; set; }
+        public string TypeName { get; set; }
+    }
+}

+ 0 - 29
InteractiveKiosk/TypeOfAttractions.cs

@@ -1,29 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     Этот код создан по шаблону.
-//
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace InteractiveKiosk
-{
-    using System;
-    using System.Collections.Generic;
-    
-    public partial class TypeOfAttractions
-    {
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public TypeOfAttractions()
-        {
-            this.Attractions = new HashSet<Attractions>();
-        }
-    
-        public int IDTypeOfAttraction { get; set; }
-        public string TypeName { get; set; }
-    
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Attractions> Attractions { get; set; }
-    }
-}

+ 7 - 7
InteractiveKiosk/TypeOfConstructions.cs

@@ -1,9 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Этот код создан по шаблону.
+//     This code was generated from a template.
 //
-//     Изменения, вносимые в этот файл вручную, могут привести к непредвиденной работе приложения.
-//     Изменения, вносимые в этот файл вручную, будут перезаписаны при повторном создании кода.
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,18 +12,18 @@ namespace InteractiveKiosk
     using System;
     using System.Collections.Generic;
     
-    public partial class TypeOfConstructions
+    public partial class TypeOfConstruction
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
-        public TypeOfConstructions()
+        public TypeOfConstruction()
         {
-            this.Constructions = new HashSet<Constructions>();
+            this.Constructions = new HashSet<Construction>();
         }
     
         public int IDTypeOfConstruction { get; set; }
         public string TypeName { get; set; }
     
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public virtual ICollection<Constructions> Constructions { get; set; }
+        public virtual ICollection<Construction> Constructions { get; set; }
     }
 }