Артем Гавриленко 3 gadi atpakaļ
vecāks
revīzija
c564382d44

+ 7 - 0
Kusach/Kusach.csproj

@@ -73,6 +73,9 @@
     <Compile Include="Pages\DriversListPage.xaml.cs">
     <Compile Include="Pages\DriversListPage.xaml.cs">
       <DependentUpon>DriversListPage.xaml</DependentUpon>
       <DependentUpon>DriversListPage.xaml</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="Pages\PointsListPage.xaml.cs">
+      <DependentUpon>PointsListPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\TransportListPage.xaml.cs">
     <Compile Include="Pages\TransportListPage.xaml.cs">
       <DependentUpon>TransportListPage.xaml</DependentUpon>
       <DependentUpon>TransportListPage.xaml</DependentUpon>
     </Compile>
     </Compile>
@@ -170,6 +173,10 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     </Page>
+    <Page Include="Pages\PointsListPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\TransportListPage.xaml">
     <Page Include="Pages\TransportListPage.xaml">
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>

+ 5 - 0
Kusach/MainWindow.xaml

@@ -37,6 +37,11 @@
                 Height="40"
                 Height="40"
                 Click="RoutesButton_Click"/>
                 Click="RoutesButton_Click"/>
                 <Button
                 <Button
+                    Margin="0,0,0,10"
+                Content="Остановки"
+                Height="40"
+                Click="PointsButton_Click"/>
+                <Button
                 Margin="0,0,0,10"
                 Margin="0,0,0,10"
                 Content="Водители"
                 Content="Водители"
                 Height="40"
                 Height="40"

+ 4 - 0
Kusach/MainWindow.xaml.cs

@@ -43,5 +43,9 @@ namespace Kusach
         }
         }
         #endregion
         #endregion
 
 
+        private void PointsButton_Click(object sender, RoutedEventArgs e)
+        {
+            MainFrame.Content = new Pages.PointsListPage();
+        }
     }
     }
 }
 }

+ 2 - 1
Kusach/Pages/DispatcherListPage.xaml

@@ -44,7 +44,8 @@
             AutoGenerateColumns="False" 
             AutoGenerateColumns="False" 
             VerticalAlignment="Top" 
             VerticalAlignment="Top" 
             HorizontalAlignment="Left" 
             HorizontalAlignment="Left" 
-            CanUserAddRows="false" Width="642">
+            CanUserAddRows="false" 
+            Width="642">
             <DataGrid.ItemContainerStyle>
             <DataGrid.ItemContainerStyle>
                 <Style TargetType="DataGridRow">
                 <Style TargetType="DataGridRow">
                     <EventSetter 
                     <EventSetter 

+ 2 - 1
Kusach/Pages/DriversListPage.xaml

@@ -44,7 +44,8 @@
             AutoGenerateColumns="False" 
             AutoGenerateColumns="False" 
             VerticalAlignment="Top" 
             VerticalAlignment="Top" 
             HorizontalAlignment="Left" 
             HorizontalAlignment="Left" 
-            CanUserAddRows="false" Width="642">
+            CanUserAddRows="false" 
+            Width="642">
             <DataGrid.ItemContainerStyle>
             <DataGrid.ItemContainerStyle>
                 <Style TargetType="DataGridRow">
                 <Style TargetType="DataGridRow">
                     <EventSetter 
                     <EventSetter 

+ 73 - 0
Kusach/Pages/PointsListPage.xaml

@@ -0,0 +1,73 @@
+<Page x:Class="Kusach.Pages.PointsListPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      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:local="clr-namespace:Kusach.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="419"
+      d:DesignWidth="692"
+      Title="PointsListPage">
+    <Grid
+        Background="White"
+        Margin="25">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="4*"/>
+            <RowDefinition Height="21*"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal">
+            <TextBox
+                Name="SearchBox"
+                PreviewMouseLeftButtonUp="SearchBoxPreviewMouseLeftButtonUp"
+                LostFocus="SearchLostFocus"
+                TextChanged="SearchTextChanged"
+                FontSize="14"
+                TextWrapping="Wrap"
+                Text="Поиск..." 
+                Width="120"/>
+            <Button
+                Width="120"
+                Content="Создать"
+                Click="AddPointButton_Click"/>
+            <Button
+                Width="120"
+                Content="Удалить"
+                Click="DeletePointsButton_Click"/>
+            <Button
+                Width="120"
+                Content="Обновить"
+                Click="UpdatePointsButton_Click"/>
+        </StackPanel>
+        <DataGrid
+            Name="PointsList" 
+            Grid.Row="1"
+            AutoGenerateColumns="False" 
+            VerticalAlignment="Top" 
+            HorizontalAlignment="Left" 
+            CanUserAddRows="false" 
+            Width="642">
+            <DataGrid.ItemContainerStyle>
+                <Style TargetType="DataGridRow">
+                    <EventSetter 
+                        Event="MouseDoubleClick" 
+                        Handler="DataGridRow_MouseDoubleClick"/>
+                </Style>
+            </DataGrid.ItemContainerStyle>
+            <DataGrid.Columns>
+                <DataGridTextColumn 
+                    Binding="{Binding IdPoint}" 
+                    Header="Номер"  
+                    Width="70"
+                    IsReadOnly="True"/>
+                <DataGridTextColumn 
+                    Binding="{Binding Name}" 
+                    Header="Название"
+                    IsReadOnly="True"/>
+                <DataGridTextColumn 
+                    Binding="{Binding location}" 
+                    Header="Локация"
+                    IsReadOnly="True"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </Grid>
+</Page>

+ 69 - 0
Kusach/Pages/PointsListPage.xaml.cs

@@ -0,0 +1,69 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace Kusach.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для PointsListPage.xaml
+    /// </summary>
+    public partial class PointsListPage : Page
+    {
+        public PointsListPage()
+        {
+            InitializeComponent();
+            PointsList.ItemsSource = cnt.db.Points.ToList();
+        }
+        private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            Windows.PointEditWindow dew = new Windows.PointEditWindow(((Points)PointsList.SelectedItem).IdPoint);
+            dew.Show();
+        }
+
+        #region Поиск
+        private void SearchBoxPreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if (SearchBox.Text == "Поиск...")
+                SearchBox.Text = "";
+        }
+        private void SearchLostFocus(object sender, RoutedEventArgs e)
+        {
+            if (SearchBox.Text == "")
+                SearchBox.Text = "Поиск...";
+        }
+        private void SearchTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (SearchBox.Text != "" && SearchBox.Text != "Поиск...")
+                PointsList.ItemsSource = cnt.db.Points.Where(item => (item.IdPoint + " " + item.Name + " " + item.location).Contains(SearchBox.Text)).ToList();
+            else
+                cnt.db.Points.ToList();
+        }
+        #endregion
+        private void AddPointButton_Click(object sender, RoutedEventArgs e)
+        {
+            AddPointWindow adw = new AddPointWindow();
+            adw.Show();
+        }
+
+        private void DeletePointsButton_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void UpdatePointsButton_Click(object sender, RoutedEventArgs e)
+        {
+            PointsList.ItemsSource = cnt.db.Points.ToList();
+        }
+    }
+}

+ 2 - 1
Kusach/Pages/RoutesListPage.xaml

@@ -44,7 +44,8 @@
             AutoGenerateColumns="False" 
             AutoGenerateColumns="False" 
             VerticalAlignment="Top" 
             VerticalAlignment="Top" 
             HorizontalAlignment="Left" 
             HorizontalAlignment="Left" 
-            CanUserAddRows="false" Width="642">
+            CanUserAddRows="false" 
+            Width="642">
             <DataGrid.ItemContainerStyle>
             <DataGrid.ItemContainerStyle>
                 <Style TargetType="DataGridRow">
                 <Style TargetType="DataGridRow">
                     <EventSetter 
                     <EventSetter 

+ 2 - 1
Kusach/Pages/TransportListPage.xaml

@@ -44,7 +44,8 @@
             AutoGenerateColumns="False" 
             AutoGenerateColumns="False" 
             VerticalAlignment="Top" 
             VerticalAlignment="Top" 
             HorizontalAlignment="Left" 
             HorizontalAlignment="Left" 
-            CanUserAddRows="false" Width="642">
+            CanUserAddRows="false" 
+            Width="642">
             <DataGrid.ItemContainerStyle>
             <DataGrid.ItemContainerStyle>
                 <Style TargetType="DataGridRow">
                 <Style TargetType="DataGridRow">
                     <EventSetter 
                     <EventSetter 

+ 2 - 1
Kusach/Windows/RouteEditWindow.xaml.cs

@@ -24,7 +24,8 @@ namespace Kusach.Windows
         }
         }
         private void DriversDataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         private void DriversDataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
         {
-            MessageBox.Show("cell: " + ((DriversList)DriversListDataGrid.SelectedItem).IdDriver);
+            DriverEditWindow dew = new DriverEditWindow(((DriversList)DriversListDataGrid.SelectedItem).IdDriver);
+            dew.ShowDialog();
         }
         }
         private void AddPoint_Click(object sender, RoutedEventArgs e)
         private void AddPoint_Click(object sender, RoutedEventArgs e)
         {
         {