Oleg Kireev 3 yıl önce
ebeveyn
işleme
df811679aa

+ 1 - 1
Hotel_Course_Project/AdminPage.xaml

@@ -26,7 +26,7 @@
 
                     <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
                         <TextBlock VerticalAlignment="Center">Сортировка</TextBlock>
-                        <ComboBox VerticalAlignment="Center" Name="SortStaffCB" SelectionChanged="SortStaffCB_SelectionChanged">
+                        <ComboBox Margin="10,0,0,0" VerticalAlignment="Center" Name="SortStaffCB" SelectionChanged="SortStaffCB_SelectionChanged">
                             <ComboBoxItem IsSelected="True" Name="activeS">Активные пользователи</ComboBoxItem>
                             <ComboBoxItem Name="nonActiveS">Удалённые пользователи</ComboBoxItem>
                         </ComboBox>

+ 1 - 1
Hotel_Course_Project/App.xaml

@@ -4,6 +4,6 @@
              xmlns:local="clr-namespace:Hotel_Course_Project"
              StartupUri="AuthorizationWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
     </Application.Resources>
 </Application>

+ 3 - 0
Hotel_Course_Project/AuthorizationWindow.xaml

@@ -3,10 +3,13 @@
         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:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         xmlns:local="clr-namespace:Hotel_Course_Project"
         mc:Ignorable="d"
         Title="Авторизация" Height="300" Width="400" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Loaded="Window_Loaded">
+    
     <Grid>
+        
         <Grid.ColumnDefinitions>
             <ColumnDefinition></ColumnDefinition>
             <ColumnDefinition></ColumnDefinition>

+ 1 - 0
Hotel_Course_Project/ClientAddOnOrderWindow.xaml

@@ -3,6 +3,7 @@
         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: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">

+ 1 - 0
Hotel_Course_Project/ClientChangeOrAddPage.xaml

@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"

+ 1 - 0
Hotel_Course_Project/HostelsPage.xaml

@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"

+ 1 - 0
Hotel_Course_Project/MainWindow.xaml

@@ -3,6 +3,7 @@
         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:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
         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">

+ 1 - 0
Hotel_Course_Project/OrderChangeOrAddPage.xaml

@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"

+ 1 - 0
Hotel_Course_Project/PayAddOnOrderWindow.xaml

@@ -3,6 +3,7 @@
         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: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">

+ 1 - 0
Hotel_Course_Project/PayTypeAddWindow.xaml

@@ -3,6 +3,7 @@
         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: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">

+ 1 - 0
Hotel_Course_Project/RoleAddWindow.xaml

@@ -3,6 +3,7 @@
         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: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">

+ 1 - 0
Hotel_Course_Project/RoomAddOnOrderWindow.xaml

@@ -3,6 +3,7 @@
         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: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">

+ 1 - 0
Hotel_Course_Project/RoomAddOrChangePage.xaml

@@ -4,6 +4,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Hotel_Course_Project"
+      xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="RoomAddOrChangePage">

+ 1 - 0
Hotel_Course_Project/StaffChangeOrAddPage.xaml

@@ -3,6 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:materialDesign="https://materialdesigninxaml.net/winfx/xaml/themes"
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800" Loaded="Page_Loaded"

+ 1 - 1
UnitTestCourseProject/UnitTest.cs

@@ -201,7 +201,7 @@ namespace UnitTestCourseProject
             clientList.Add(Client4);
 
             //заполняем итоговый лист с тем, что должно найтись после поиска
-            searchText = "45";
+            searchText = "1231234124";
             List<Client> scrh = new List<Client>();
             CollectionAssert.AreEqual(adminPage.SearchClient(clientList, searchText, scrh), searchedClientList);
             searchedClientList = new List<Client>();