Kaynağa Gözat

НАКОНЕЦТА. РЕлизная версия(без багов, но всё равно не нравится)

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

+ 1 - 1
Hotel_Course_Project/ClientAddOnOrderWindow.xaml

@@ -19,7 +19,7 @@
         </Grid.ColumnDefinitions>
 
         <Button Name="BackBtn" Click="BackBtn_Click">Назад</Button>
-        <StackPanel Grid.Column="1" Orientation="Horizontal">
+        <StackPanel Margin="20,0,0,0" Grid.Column="1" Orientation="Horizontal" Grid.ColumnSpan="2">
             <TextBlock VerticalAlignment="Center">Поиск</TextBlock>
             <TextBox  Name="ClientSeacrhTB" TextChanged="ClientSeacrhTB_TextChanged" VerticalAlignment="Center" Width="100"></TextBox>
             <Button Name="ClientSrchBtn" Click="ClientSrchBtn_Click">Поиск</Button>

+ 1 - 1
Hotel_Course_Project/EnterLoginWindow.xaml

@@ -5,7 +5,7 @@
         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">
+        Title="EnterLoginWindow" Height="200" Width="300" WindowStartupLocation="CenterScreen">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition></RowDefinition>

+ 1 - 0
Hotel_Course_Project/HelpQustionWindow.xaml.cs

@@ -70,6 +70,7 @@ namespace Hotel_Course_Project
                     }
                     else
                     {
+                        MessageBox.Show("Пароль сброшен!\nНовый пароль: 123");
                         _user.Password = SomeMethods.Hash("123");
                         DataBase.db.SaveChanges();
                         DialogResult = true;

+ 1 - 1
Hotel_Course_Project/HostelsPage.xaml

@@ -24,7 +24,7 @@
 
                     <Button x:Name="AddOrderBtn" Click="AddOrderBtn_Click">Добавить</Button>
 
-                    <StackPanel Grid.Column="2" Orientation="Horizontal">
+                    <StackPanel Margin="20,0,0,0" Grid.Column="2" Orientation="Horizontal">
                         <TextBlock VerticalAlignment="Center">Поиск</TextBlock>
                         <TextBox  Name="OrderSeacrhTB" TextChanged="OrderSeacrhTB_TextChanged" VerticalAlignment="Center" Width="100"></TextBox>
                         <Button Name="OrderSrchBtn" Click="OrderSrchBtn_Click">Поиск</Button>

+ 1 - 1
Hotel_Course_Project/LoginRememberWindow.xaml

@@ -15,7 +15,7 @@
             <ColumnDefinition></ColumnDefinition>
             <ColumnDefinition></ColumnDefinition>
         </Grid.ColumnDefinitions>
-        <TextBlock Grid.ColumnSpan="2">Вы помните свой логин?</TextBlock>
+        <TextBlock Grid.ColumnSpan="2" HorizontalAlignment="Center">Вы помните свой логин?</TextBlock>
         <Button x:Name="CancelBtn" Grid.Row="1" Click="CancelBtn_Click">Нет</Button>
         <Button x:Name="AcceptBtn" Grid.Row="1" Grid.Column="1" Click="AcceptBtn_Click">Да</Button>
     </Grid>

+ 1 - 1
Hotel_Course_Project/ModelDB.edmx.diagram

@@ -4,7 +4,7 @@
   <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx">
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
-      <Diagram DiagramId="7b379ebd51334675b3099ff3e8b1d4e0" Name="Diagram1" ZoomLevel="124">
+      <Diagram DiagramId="7b379ebd51334675b3099ff3e8b1d4e0" Name="Diagram1" ZoomLevel="80">
         <EntityTypeShape EntityType="gr692_kovModel.Client" Width="1.5" PointX="3" PointY="5.625" IsExpanded="true" />
         <EntityTypeShape EntityType="gr692_kovModel.Order" Width="1.5" PointX="5.25" PointY="1" IsExpanded="true" />
         <EntityTypeShape EntityType="gr692_kovModel.Room" Width="1.5" PointX="3" PointY="1.5" IsExpanded="true" />

+ 1 - 1
Hotel_Course_Project/OrderChangeOrAddPage.xaml

@@ -42,7 +42,7 @@
         <TextBlock 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 x:Name="PayMakeBtn" Click="PayMakeBtn_Click" Grid.Row="4" Grid.Column="1">Совершить платёж</Button>
+        <Button Width="120" x:Name="PayMakeBtn" Click="PayMakeBtn_Click" Grid.Row="4" Grid.Column="1">Совершить платёж</Button>
         <StackPanel Margin="10,0,0,0" Grid.Row="4" Grid.Column="1" Name="PaySP">
             <StackPanel Orientation="Horizontal">
                 <TextBlock>Стоимость: </TextBlock>

+ 2 - 2
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" Grid.Column="1" x:Name="StaffDeleteOrRestoreBtn" Click="StaffDeleteOrRestoreBtn_Click"></Button>
-        <Button Grid.Row="5" Grid.Column="2" x:Name="StaffChangeOrAddBtn" Click="StaffChangeOrAddBtn_Click"></Button>
+        <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>
     </Grid>
 </Page>