ГОТОВО

Hotel_Course_Project/AdminPage.xaml

@@ -49,7 +49,6 @@
                             <DataGridTextColumn Header="Имя" Binding="{Binding FName}"></DataGridTextColumn>
                             <DataGridTextColumn Header="Отчество" Binding="{Binding MName}"></DataGridTextColumn>
                             <DataGridTextColumn Header="Логин" Binding="{Binding Login}"></DataGridTextColumn>
-                            <DataGridTextColumn Header="Пароль" Binding="{Binding Password}"></DataGridTextColumn>
                             <DataGridTextColumn Header="Должность" Binding="{Binding StaffRole.Name}"></DataGridTextColumn>
                             <DataGridTemplateColumn>
                                 <DataGridTemplateColumn.CellTemplate>

Hotel_Course_Project/AuthorizationWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Авторизация" Height="300" Width="400" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="Window_Loaded">
+        Title="Авторизация" Height="300" Width="400" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="Window_Loaded"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     
     <Grid>
         <Grid.ColumnDefinitions>

Hotel_Course_Project/ChangePasLogWindow.xaml

@@ -5,7 +5,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Изменение логина\пароля" Height="200" Width="300" Loaded="Window_Loaded">
+        Title="Изменение логина\пароля" Height="200" Width="300" Loaded="Window_Loaded"
+        Icon="pack://application:,,,/Resources/favicon.ico">
+    
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

Hotel_Course_Project/ClientAddOnOrderWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Выбор клиента" Height="300" Width="500" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+        Title="Выбор клиента" Height="300" Width="500" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"></RowDefinition>

Hotel_Course_Project/ClientChangeOrAddPage.xaml

@@ -32,7 +32,7 @@
         <TextBox Grid.Row="2" Grid.Column="2" x:Name="CMName" Text="{Binding MName}"></TextBox>
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">Фотография паспорта</TextBlock>
         <Image x:Name="CPassportPhoto" Grid.RowSpan="4" Grid.Row="1" Source="{Binding Passport}" MouseLeftButtonDown="CPassportPhoto_MouseLeftButtonDown"></Image>
-        <Button Grid.Row="6" Grid.Column="1" x:Name="ClientDeleteOrRestoreBtn" Click="ClientDeleteOrRestoreBtn_Click"></Button>
-        <Button Grid.Row="6" Grid.Column="2" x:Name="ClientChangeOrAddBtn" Click="ClientChangeOrAddBtn_Click"></Button>
+        <Button Grid.Row="6" Grid.Column="1" Width="150" x:Name="ClientDeleteOrRestoreBtn" Click="ClientDeleteOrRestoreBtn_Click"></Button>
+        <Button Grid.Row="6" Grid.Column="2" Width="150" x:Name="ClientChangeOrAddBtn" Click="ClientChangeOrAddBtn_Click"></Button>
     </Grid>
 </Page>

Hotel_Course_Project/EnterLoginWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="EnterLoginWindow" Height="200" Width="300" WindowStartupLocation="CenterScreen">
+        Title="EnterLoginWindow" Height="200" Width="300" WindowStartupLocation="CenterScreen"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>

Hotel_Course_Project/HelpQustionWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="HelpQustionWindow" Height="300" Width="400">
+        Title="HelpQustionWindow" Height="300" Width="400"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

Hotel_Course_Project/Hotel_Course_Project.csproj

@@ -36,6 +36,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
@@ -298,6 +302,7 @@
       <DependentUpon>ModelDB.edmx</DependentUpon>
       <LastGenOutput>ModelDB.cs</LastGenOutput>
     </Content>
+    <Resource Include="Resources\favicon.ico" />
     <Resource Include="Resources\no_picture.jpg" />
     <Resource Include="Resources\PersDefaultPhoto.png" />
   </ItemGroup>

Hotel_Course_Project/LoginRememberWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Проверка логина" Height="200" Width="300" WindowStartupLocation="CenterScreen">
+        Title="Проверка логина" Height="200" Width="300" WindowStartupLocation="CenterScreen"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>

Hotel_Course_Project/MainWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"       
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="{Binding ElementName=MainFrame,Path=Content.Title}" Height="450" Width="800" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+        Title="{Binding ElementName=MainFrame,Path=Content.Title}" Height="450" Width="800" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"></RowDefinition>

Hotel_Course_Project/OrderChangeOrAddPage.xaml

@@ -39,7 +39,7 @@
             <Button x:Name="SRoomBtn" Click="SRoomBtn_Click">Добавить</Button>
         </StackPanel>
 
-        <TextBlock Margin="10,0,0,0" x:Name="SOrderDateStart" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
+        <TextBlock HorizontalAlignment="Left" Margin="10,0,0,0" x:Name="SOrderDateStart" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center"></TextBlock>
         <DatePicker Margin="10,0,0,0" x:Name="SOrderDateEnd" Grid.Row="3" Grid.Column="1" VerticalAlignment="Center"></DatePicker>
 
         <Button Width="120" x:Name="PayMakeBtn" Click="PayMakeBtn_Click" Grid.Row="4" Grid.Column="1">Совершить платёж</Button>

Hotel_Course_Project/OrderChangeOrAddPage.xaml.cs

@@ -20,7 +20,7 @@ namespace Hotel_Course_Project
             _hostel = hostel;
             if (DataContext == null)
             {
-                SOrderDateStart.Text = DateTime.Now.Date.ToString();
+                SOrderDateStart.Text = DateTime.Now.Date.ToString("d"); ;
                 SOrderDateEnd.DisplayDateStart = DateTime.Now.AddDays(1);
                 SOrderDateEnd.DisplayDateEnd = DateTime.Now.AddMonths(12);
                 PaySP.Visibility = Visibility.Collapsed;

Hotel_Course_Project/PayAddOnOrderWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Подтверждение платежа" Height="200" Width="200" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+        Title="Подтверждение платежа" Height="200" Width="200" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

Hotel_Course_Project/PayTypeAddWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Виды платежей" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="Виды платежей" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

Hotel_Course_Project/RoleAddWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Добавление должности" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="Добавление должности" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

Hotel_Course_Project/RoomAddOnOrderWindow.xaml

@@ -6,7 +6,8 @@
         xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Добавление комнаты" Height="350" Width="500" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
+        Title="Добавление комнаты" Height="350" Width="500" WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"></RowDefinition>

Hotel_Course_Project/StaffChangeOrAddPage.xaml

@@ -37,7 +37,7 @@
         <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">Фотография Договора</TextBlock>
         <Image x:Name="SContractPhoto" Grid.RowSpan="4" Grid.Row="1" Source="{Binding PhotoContract}" MouseLeftButtonDown="SContractPhoto_MouseLeftButtonDown"></Image>
 
-        <Button Grid.Row="5" Width="130" Grid.Column="1" x:Name="StaffDeleteOrRestoreBtn" Click="StaffDeleteOrRestoreBtn_Click"></Button>
-        <Button Grid.Row="5" Width="110" Grid.Column="2" x:Name="StaffChangeOrAddBtn" Click="StaffChangeOrAddBtn_Click"></Button>
+        <Button Grid.Row="5" Width="150" Grid.Column="1" x:Name="StaffDeleteOrRestoreBtn" Click="StaffDeleteOrRestoreBtn_Click"></Button>
+        <Button Grid.Row="5" Width="150" Grid.Column="2" x:Name="StaffChangeOrAddBtn" Click="StaffChangeOrAddBtn_Click"></Button>
     </Grid>
 </Page>

Hotel_Course_Project/StatusRoomAddWindow.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
-        Title="Добавление статуса комнаты" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen">
+        Title="Добавление статуса комнаты" Height="150" Width="200" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"
+        Icon="pack://application:,,,/Resources/favicon.ico">
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>

UnitTestCourseProject/UnitTest.cs

@@ -209,21 +209,16 @@ namespace UnitTestCourseProject
             pass = "123";
             hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
             Assert.AreEqual(SomeMethods.Hash(pass), hash);
-            pass = "123";
-            hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
-            Assert.AreEqual(SomeMethods.Hash(pass), hash);
-            pass = "123";
-            hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
-            Assert.AreEqual(SomeMethods.Hash(pass), hash);
-            pass = "123";
+            pass = "321";
             hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
             Assert.AreEqual(SomeMethods.Hash(pass), hash);
-            pass = "123";
-            hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
+            pass = "AlexOmega";
+            hash = "29ac25660e3078e87e3097d3822e50d7cxcsdsa612ds123d1254s";
             Assert.AreEqual(SomeMethods.Hash(pass), hash);
-            pass = "123";
-            hash = "5fa285e1bebe0a6623e33afc04a1fbd5";
+            pass = "asd";
+            hash = "29ac25660e3078e87e3097d3822e50d7";
             Assert.AreEqual(SomeMethods.Hash(pass), hash);
+
         }
         [TestMethod]
         public void TestAddImage()