Parcourir la source

Сделать хостеса

Oleg Kireev il y a 3 ans
Parent
commit
98b3d81b6f

+ 18 - 13
Hotel_Course_Project/HostelsPage.xaml

@@ -6,7 +6,7 @@
       xmlns:local="clr-namespace:Hotel_Course_Project"
       xmlns:local="clr-namespace:Hotel_Course_Project"
       mc:Ignorable="d" 
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       d:DesignHeight="450" d:DesignWidth="800"
-      Title="HostelsPage">
+      Title="Окно Заказов" Loaded="Page_Loaded">
 
 
         <Grid>        
         <Grid>        
             <Grid.RowDefinitions>
             <Grid.RowDefinitions>
@@ -22,27 +22,23 @@
 
 
             <StackPanel Grid.Column="2" Orientation="Horizontal">
             <StackPanel Grid.Column="2" Orientation="Horizontal">
                 <TextBlock VerticalAlignment="Center">Поиск</TextBlock>
                 <TextBlock VerticalAlignment="Center">Поиск</TextBlock>
-                <TextBox  Name="StaffSeacrhTB" TextChanged="StaffSeacrhTB_TextChanged" VerticalAlignment="Center" Width="100"></TextBox>
-                <Button Name="StaffSrchBtn" Click="StaffSrchBtn_Click">Поиск</Button>
+            <TextBox  Name="OrderSeacrhTB" TextChanged="OrderSeacrhTB_TextChanged" VerticalAlignment="Center" Width="100"></TextBox>
+            <Button Name="OrderSrchBtn" Click="OrderSrchBtn_Click">Поиск</Button>
             </StackPanel>
             </StackPanel>
-        <DataGrid Grid.Row="1" Grid.ColumnSpan="2" x:Name="PayList" AutoGenerateColumns="False" ColumnWidth="*" IsReadOnly="True">
+        <DataGrid Grid.Row="1" Grid.ColumnSpan="2" x:Name="OrderList" AutoGenerateColumns="False" ColumnWidth="*" IsReadOnly="True">
             <DataGrid.Columns>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Дата" Binding="{Binding Pay.PayDate}"></DataGridTextColumn>
-                <DataGridTextColumn Header="Номер" Binding="{Binding Room.NumRoom}"></DataGridTextColumn>
-                <DataGridTemplateColumn Header="Хостес">
+                <DataGridTemplateColumn Header="Период сдачи">
                     <DataGridTemplateColumn.CellTemplate>
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{Binding Staff.LName}"></TextBlock>
-                                <TextBlock Text=" "></TextBlock>
-                                <TextBlock Text="{Binding Staff.FName[0]}"></TextBlock>
-                                <TextBlock Text="."></TextBlock>
-                                <TextBlock Text="{Binding Staff.MName[0]}"></TextBlock>
-                                <TextBlock Text="."></TextBlock>
+                                <TextBlock Text="{Binding DateStart ,StringFormat=\{0:dd.MM.yy\}}"></TextBlock>
+                                <TextBlock Text=" - "></TextBlock>
+                                <TextBlock Text="{Binding DateEnd , StringFormat=\{0:dd.MM.yy\}}"></TextBlock>
                             </StackPanel>
                             </StackPanel>
                         </DataTemplate>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Номер" Binding="{Binding Room.NumRoom}"></DataGridTextColumn>
                 <DataGridTemplateColumn Header="Клиент">
                 <DataGridTemplateColumn Header="Клиент">
                     <DataGridTemplateColumn.CellTemplate>
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                         <DataTemplate>
@@ -57,7 +53,16 @@
                         </DataTemplate>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>
                 </DataGridTemplateColumn>
+                <DataGridTextColumn Header="Дата оплаты" Binding="{Binding Pay.PayDate}"></DataGridTextColumn>
+                <DataGridTextColumn Header="Статус заказа" Binding="{Binding OrderStatus.Name}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Стоимость" Binding="{Binding Pay.EndSum}"></DataGridTextColumn>
                 <DataGridTextColumn Header="Стоимость" Binding="{Binding Pay.EndSum}"></DataGridTextColumn>
+                <DataGridTemplateColumn>
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Button>Выбрать</Button>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
             </DataGrid.Columns>
         </DataGrid>
         </DataGrid>
     </Grid>
     </Grid>

+ 17 - 1
Hotel_Course_Project/HostelsPage.xaml.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System.Linq;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls;
 
 
 namespace Hotel_Course_Project
 namespace Hotel_Course_Project
@@ -17,5 +18,20 @@ namespace Hotel_Course_Project
         {
         {
 
 
         }
         }
+
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+            OrderList.ItemsSource = DataBase.db.Order.ToList();
+        }
+
+        private void OrderSeacrhTB_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+        }
+
+        private void OrderSrchBtn_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
     }
 }
 }

+ 61 - 0
Hotel_Course_Project/ModelDB.edmx

@@ -27,6 +27,14 @@
           <Property Name="Id_Pay" Type="int" />
           <Property Name="Id_Pay" Type="int" />
           <Property Name="DateStart" Type="date" />
           <Property Name="DateStart" Type="date" />
           <Property Name="DateEnd" Type="nchar" MaxLength="10" />
           <Property Name="DateEnd" Type="nchar" MaxLength="10" />
+          <Property Name="Id_OrderStatus" Type="int" />
+        </EntityType>
+        <EntityType Name="OrderStatus">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="Name" Type="nvarchar" MaxLength="50" Nullable="false" />
         </EntityType>
         </EntityType>
         <EntityType Name="Pay">
         <EntityType Name="Pay">
           <Key>
           <Key>
@@ -123,6 +131,18 @@
             </Dependent>
             </Dependent>
           </ReferentialConstraint>
           </ReferentialConstraint>
         </Association>
         </Association>
+        <Association Name="FK_Order_OrderStatus">
+          <End Role="OrderStatus" Type="Self.OrderStatus" Multiplicity="0..1" />
+          <End Role="Order" Type="Self.Order" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="OrderStatus">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="Order">
+              <PropertyRef Name="Id_OrderStatus" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_Order_Pay">
         <Association Name="FK_Order_Pay">
           <End Role="Pay" Type="Self.Pay" Multiplicity="0..1" />
           <End Role="Pay" Type="Self.Pay" Multiplicity="0..1" />
           <End Role="Order" Type="Self.Order" Multiplicity="*" />
           <End Role="Order" Type="Self.Order" Multiplicity="*" />
@@ -210,6 +230,7 @@
         <EntityContainer Name="Хранилище gr692_kovModelContainer">
         <EntityContainer Name="Хранилище gr692_kovModelContainer">
           <EntitySet Name="Client" EntityType="Self.Client" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Client" EntityType="Self.Client" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Order" EntityType="Self.Order" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Order" EntityType="Self.Order" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="OrderStatus" EntityType="Self.OrderStatus" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Pay" EntityType="Self.Pay" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="Pay" EntityType="Self.Pay" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PayType" EntityType="Self.PayType" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PayType" EntityType="Self.PayType" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PersStasus" EntityType="Self.PersStasus" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PersStasus" EntityType="Self.PersStasus" Schema="dbo" store:Type="Tables" />
@@ -226,6 +247,10 @@
             <End Role="Client" EntitySet="Client" />
             <End Role="Client" EntitySet="Client" />
             <End Role="Order" EntitySet="Order" />
             <End Role="Order" EntitySet="Order" />
           </AssociationSet>
           </AssociationSet>
+          <AssociationSet Name="FK_Order_OrderStatus" Association="Self.FK_Order_OrderStatus">
+            <End Role="OrderStatus" EntitySet="OrderStatus" />
+            <End Role="Order" EntitySet="Order" />
+          </AssociationSet>
           <AssociationSet Name="FK_Order_Pay" Association="Self.FK_Order_Pay">
           <AssociationSet Name="FK_Order_Pay" Association="Self.FK_Order_Pay">
             <End Role="Pay" EntitySet="Pay" />
             <End Role="Pay" EntitySet="Pay" />
             <End Role="Order" EntitySet="Order" />
             <End Role="Order" EntitySet="Order" />
@@ -287,6 +312,8 @@
           <NavigationProperty Name="Staff" Relationship="Self.FK_Order_Staff" FromRole="Order" ToRole="Staff" />
           <NavigationProperty Name="Staff" Relationship="Self.FK_Order_Staff" FromRole="Order" ToRole="Staff" />
           <Property Name="Id_Pay" Type="Int32" />
           <Property Name="Id_Pay" Type="Int32" />
           <NavigationProperty Name="Pay" Relationship="gr692_kovModel.FK_Order_Pay" FromRole="Order" ToRole="Pay" />
           <NavigationProperty Name="Pay" Relationship="gr692_kovModel.FK_Order_Pay" FromRole="Order" ToRole="Pay" />
+          <Property Name="Id_OrderStatus" Type="Int32" />
+          <NavigationProperty Name="OrderStatus" Relationship="gr692_kovModel.FK_Order_OrderStatus" FromRole="Order" ToRole="OrderStatus" />
         </EntityType>
         </EntityType>
         <EntityType Name="Room">
         <EntityType Name="Room">
           <Key>
           <Key>
@@ -450,6 +477,11 @@
             <End Role="PersStasus" EntitySet="PersStasus" />
             <End Role="PersStasus" EntitySet="PersStasus" />
             <End Role="Staff" EntitySet="Staff" />
             <End Role="Staff" EntitySet="Staff" />
           </AssociationSet>
           </AssociationSet>
+          <EntitySet Name="OrderStatus" EntityType="gr692_kovModel.OrderStatus" />
+          <AssociationSet Name="FK_Order_OrderStatus" Association="gr692_kovModel.FK_Order_OrderStatus">
+            <End Role="OrderStatus" EntitySet="OrderStatus" />
+            <End Role="Order" EntitySet="Order" />
+          </AssociationSet>
         </EntityContainer>
         </EntityContainer>
         <EntityType Name="Pay">
         <EntityType Name="Pay">
           <Key>
           <Key>
@@ -527,6 +559,26 @@
             </Dependent>
             </Dependent>
           </ReferentialConstraint>
           </ReferentialConstraint>
         </Association>
         </Association>
+        <EntityType Name="OrderStatus">
+          <Key>
+            <PropertyRef Name="Id" />
+          </Key>
+          <Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="Name" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <NavigationProperty Name="Order" Relationship="gr692_kovModel.FK_Order_OrderStatus" FromRole="OrderStatus" ToRole="Order" />
+        </EntityType>
+        <Association Name="FK_Order_OrderStatus">
+          <End Type="gr692_kovModel.OrderStatus" Role="OrderStatus" Multiplicity="0..1" />
+          <End Type="gr692_kovModel.Order" Role="Order" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="OrderStatus">
+              <PropertyRef Name="Id" />
+            </Principal>
+            <Dependent Role="Order">
+              <PropertyRef Name="Id_OrderStatus" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
       </Schema>
       </Schema>
     </edmx:ConceptualModels>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
     <!-- C-S mapping content -->
@@ -548,6 +600,7 @@
           <EntitySetMapping Name="Order">
           <EntitySetMapping Name="Order">
             <EntityTypeMapping TypeName="gr692_kovModel.Order">
             <EntityTypeMapping TypeName="gr692_kovModel.Order">
               <MappingFragment StoreEntitySet="Order">
               <MappingFragment StoreEntitySet="Order">
+                <ScalarProperty Name="Id_OrderStatus" ColumnName="Id_OrderStatus" />
                 <ScalarProperty Name="Id_Pay" ColumnName="Id_Pay" />
                 <ScalarProperty Name="Id_Pay" ColumnName="Id_Pay" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="Id" ColumnName="Id" />
                 <ScalarProperty Name="Id_Staff" ColumnName="Id_Staff" />
                 <ScalarProperty Name="Id_Staff" ColumnName="Id_Staff" />
@@ -637,6 +690,14 @@
               </MappingFragment>
               </MappingFragment>
             </EntityTypeMapping>
             </EntityTypeMapping>
           </EntitySetMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="OrderStatus">
+            <EntityTypeMapping TypeName="gr692_kovModel.OrderStatus">
+              <MappingFragment StoreEntitySet="OrderStatus">
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="Id" ColumnName="Id" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
         </EntityContainerMapping>
         </EntityContainerMapping>
       </Mapping>
       </Mapping>
     </edmx:Mappings>
     </edmx:Mappings>

+ 2 - 0
Hotel_Course_Project/ModelDB.edmx.diagram

@@ -24,6 +24,8 @@
         <EntityTypeShape EntityType="gr692_kovModel.PersStasus" Width="1.5" PointX="0.75" PointY="8" />
         <EntityTypeShape EntityType="gr692_kovModel.PersStasus" Width="1.5" PointX="0.75" PointY="8" />
         <AssociationConnector Association="gr692_kovModel.FK_Client_PersStasus" />
         <AssociationConnector Association="gr692_kovModel.FK_Client_PersStasus" />
         <AssociationConnector Association="gr692_kovModel.FK_Staff_PersStasus" />
         <AssociationConnector Association="gr692_kovModel.FK_Staff_PersStasus" />
+        <EntityTypeShape EntityType="gr692_kovModel.OrderStatus" Width="1.5" PointX="7.375" PointY="0.875" />
+        <AssociationConnector Association="gr692_kovModel.FK_Order_OrderStatus" />
       </Diagram>
       </Diagram>
     </edmx:Diagrams>
     </edmx:Diagrams>
   </edmx:Designer>
   </edmx:Designer>