/

Kusach/DataWindow.xaml

@@ -1,196 +0,0 @@
-<Window x:Class="Kusach.DataWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        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:local="clr-namespace:Kusach"
-        mc:Ignorable="d"
-        Loaded="UserDateView"
-        Title="Взаимодействие с информацией" Height="450" Width="800">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="50"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="100" />
-            <ColumnDefinition/>
-        </Grid.ColumnDefinitions>
-        <Button 
-            x:Name="BackButton" 
-            Content="Выход" 
-            HorizontalAlignment="Stretch" 
-            VerticalAlignment="Stretch" 
-            Click="BackButton_Click"/>
-        <TabControl
-            Name="TabContrl"
-            Grid.Row="2">
-            <TabItem>
-                <TabItem.Header>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Width="90">
-                            <Run Text="Управление"/>
-                            <LineBreak/>
-                            <Run Text="пользователями"/>
-                        </TextBlock>
-                    </StackPanel>
-                </TabItem.Header>
-                <TabItem.Content>
-                    <StackPanel>
-                        <TextBox 
-                            Name="UserSearch" 
-                            HorizontalAlignment="Left" 
-                            TextWrapping="Wrap" 
-                            Text="Поиск..."
-                            Width="94"
-                            Foreground="#808080"
-                            VerticalAlignment="Top" 
-                            TextChanged="UserSearch_TextChanged"/>
-                        <Button 
-                            Content="Добавить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="AddUserButton_Click"/>
-                        <Button 
-                            Content="Изменить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="UpdateUserButton_Click"/>
-                        <Button 
-                            Content="Обновить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="UserDateView"/>
-                        <Button 
-                            Content="Удалить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="DeleteUserButton_Click"/>
-                    </StackPanel>
-                </TabItem.Content>
-            </TabItem>
-            <TabItem>
-                <TabItem.Header>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Width="90">
-                            <Run Text="Управление"/>
-                            <LineBreak/>
-                            <Run Text="маршрутами"/>
-                        </TextBlock>
-                    </StackPanel>
-                </TabItem.Header>
-                <TabItem.Content>
-                    <StackPanel>
-                        <Button 
-                            Content="Поиск" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="FindRouteButton_Click"/>
-                        <Button
-                            Content="Добавить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="AddRouteButton_Click"/>
-                        <Button 
-                            Content="Обновить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="RoutesDateView"/>
-                        <Button 
-                            Content="Удалить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"/>
-                    </StackPanel>
-                </TabItem.Content>
-            </TabItem>
-            <TabItem>
-                <TabItem.Header>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Width="90">
-                            <Run Text="Управление"/>
-                            <LineBreak/>
-                            <Run Text="водителями"/>
-                        </TextBlock>
-                    </StackPanel>
-                </TabItem.Header>
-                <TabItem.Content>
-                    <StackPanel>
-                        <Button 
-                            Content="Поиск" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="FindRouteButton_Click"/>
-                        <Button 
-                            Content="Добавить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="AddDriverButton_Click"/>
-                        <Button 
-                            Content="Обновить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="DriversDateView"/>
-                        <Button 
-                            Content="Удалить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"/>
-                    </StackPanel>
-                </TabItem.Content>
-            </TabItem>
-            <TabItem>
-                <TabItem.Header>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Width="90">
-                            <Run Text="Управление"/>
-                            <LineBreak/>
-                            <Run Text="транспортом"/>
-                        </TextBlock>
-                    </StackPanel>
-                </TabItem.Header>
-                <TabItem.Content>
-                    <StackPanel>
-                        <Button 
-                            Content="Поиск" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="FindRouteButton_Click"/>
-                        <Button 
-                            Content="Добавить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="AddTransportButton_Click"/>
-                        <Button 
-                            Content="Обновить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"
-                            Click="TransportDateView"/>
-                        <Button 
-                            Content="Удалить" 
-                            HorizontalAlignment="Stretch" 
-                            VerticalAlignment="Top" 
-                            Height="20"/>
-                    </StackPanel>
-                </TabItem.Content>
-            </TabItem>
-        </TabControl>
-        <DataGrid
-            x:Name="DataGrid"
-            Grid.Column="1"
-            Grid.RowSpan="2"/>
-    </Grid>
-</Window>

Kusach/DataWindow.xaml.cs

@@ -1,107 +0,0 @@
-using System.Data;
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-using System.Diagnostics;
-
-namespace Kusach
-{
-    /// <summary>
-    /// Логика взаимодействия для DataWindow.xaml
-    /// </summary>
-    public partial class DataWindow : Window
-    {
-        public DataWindow()
-        {
-            InitializeComponent();
-        }
-        private void UserDateView(object sender, RoutedEventArgs e)
-        {
-            var query = from Dispatcher in cnt.db.Dispatcher
-                        select new { Dispatcher.IdDispatcher, Dispatcher.Login, Dispatcher.Password };
-            DataGrid.ItemsSource = query.ToList();
-        }
-        private void RoutesDateView(object sender, RoutedEventArgs e)
-        {
-            var query = from Routes in cnt.db.Routes
-                        select new { Routes.IdRoute, Routes.Name };
-            DataGrid.ItemsSource = query.ToList();
-        }
-        private void TransportDateView(object sender, RoutedEventArgs e)
-        {
-            var query = from Transport in cnt.db.Transport
-                        select new { Transport.IdTransport, Transport.NameOfTransport, Transport.NumberPlate };
-            DataGrid.ItemsSource = query.ToList();
-        }
-        private void PointDateView(object sender, RoutedEventArgs e)
-        {
-            var query = from Points in cnt.db.Points
-                        select new { Points.IdPoint, Points.Name, Points.location };
-            DataGrid.ItemsSource = query.ToList();
-        }
-        private void DriversDateView(object sender, RoutedEventArgs e)
-        {
-            var query = from Drivers in cnt.db.Drivers
-                        select new { Drivers.IdDriver, Drivers.Transport, Drivers.Name, Drivers.Surname, Drivers.Patronymic };
-            DataGrid.ItemsSource = query.ToList();
-        }
-        private void BackButton_Click(object sender, RoutedEventArgs e)
-        {
-            LogWindow lw = new LogWindow();
-            lw.Show();
-            this.Close();
-        }
-
-        private void AddUserButton_Click(object sender, RoutedEventArgs e)
-        {
-            AddUserWindow auw = new AddUserWindow();
-            auw.ShowDialog();
-        }
-        private void DeleteUserButton_Click(object sender, RoutedEventArgs e)
-        {
-
-            //MessageBox.Show(TabContrl.SelectedItem());
-        }
-
-        private void FindRouteButton_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void AddRouteButton_Click(object sender, RoutedEventArgs e)
-        {
-            AddRouteWindow arw = new AddRouteWindow();
-            arw.ShowDialog();
-        }
-
-        private void AddTransportButton_Click(object sender, RoutedEventArgs e)
-        {
-            AddTransportWindow atw = new AddTransportWindow();
-            atw.ShowDialog();
-        }
-
-        private void AddPointButton_Click(object sender, RoutedEventArgs e)
-        {
-            AddPointWindow apw = new AddPointWindow();
-            apw.ShowDialog();
-        }
-
-        private void AddDriverButton_Click(object sender, RoutedEventArgs e)
-        {
-            AddDriverWindow adw = new AddDriverWindow();
-            adw.ShowDialog();
-        }
-
-        private void UpdateUserButton_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-
-        private void UserSearch_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
-        {
-            //var query = from Dispatcher in cnt.db.Dispatcher
-            //            select new { Dispatcher.IdDispatcher, Dispatcher.Login, Dispatcher.Password };
-            //DataGrid.ItemsSource = query.ToList().Where(item => item.Login == UserSearch.Text);
-        }
-    }
-}

Kusach/Kusach.csproj

@@ -125,9 +125,6 @@
       <DependentUpon>AddUserWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="cnt.cs" />
-    <Compile Include="DataWindow.xaml.cs">
-      <DependentUpon>DataWindow.xaml</DependentUpon>
-    </Compile>
     <Compile Include="DeleteUserWindow.xaml.cs">
       <DependentUpon>DeleteUserWindow.xaml</DependentUpon>
     </Compile>
@@ -170,10 +167,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DataWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="DeleteUserWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Kusach/Pages/RoutesListPage.xaml

@@ -27,7 +27,7 @@
                 Width="120"/>
             <Button
                 Width="120"
-                Content="Добавить"
+                Content="Создать"
                 Click="AddRouteButton_Click"/>
             <Button
                 Width="120"

Kusach/Windows/AddPointWindow.xaml.cs

@@ -46,7 +46,8 @@ namespace Kusach
                         location = LocationBox.Text
                     };
                     cnt.db.Points.Add(newPoint);
-                    if(RouteId != -1)
+                    cnt.db.SaveChanges();
+                    if (RouteId != -1)
                     {
                         PointsList newPointRoute = new PointsList()
                         {

Kusach/Windows/RouteEditWindow.xaml

@@ -95,17 +95,33 @@
                             Orientation="Horizontal"
                             Grid.Row="1">
                             <Button
-                                Content="Добавить"
+                                Content="Обновить"
+                                Width="90"
+                                Height="30"
+                                Margin="0,0,10,0"
+                                Click="UpdatePoints_Click">
+                            </Button>
+                            <Button
+                                Content="Создать"
                                 Width="90"
                                 Height="30"
                                 Margin="0,0,10,0"
                                 Click="AddPoint_Click">
                             </Button>
                             <Button
+                                Content="Добавить"
+                                Width="90"
+                                Height="30"
+                                Margin="0,0,10,0"
+                                Click="AddFromListPoint_Click">
+                            </Button>
+                            <Button
+                                Visibility="Visible"
                                 Content="Удалить"
                                 Grid.Row="1"
                                 Width="90"
-                                Height="30">
+                                Height="30"
+                                Click="RemovePoint_Click">
                             </Button>
                         </StackPanel>
                     </Grid>
@@ -167,16 +183,29 @@
                             Orientation="Horizontal"
                             Grid.Row="1">
                             <Button
-                            Content="Добавить"
-                            Width="90"
-                            Height="30"
-                            Margin="0,0,10,0">
+                                Content="Обновить"
+                                Width="90"
+                                Height="30"
+                                Margin="0,0,10,0">
+                            </Button>
+                            <Button
+                                Content="Создать"
+                                Width="90"
+                                Height="30"
+                                Margin="0,0,10,0">
+                            </Button>
+                            <Button
+                                Content="Добавить"
+                                Width="90"
+                                Height="30"
+                                Margin="0,0,10,0">
                             </Button>
                             <Button
-                            Content="Удалить"
-                            Grid.Row="1"
-                            Width="90"
-                            Height="30">
+                                Visibility="Hidden"
+                                Content="Удалить"
+                                Grid.Row="1"
+                                Width="90"
+                                Height="30">
                             </Button>
                         </StackPanel>
                     </Grid>

Kusach/Windows/RouteEditWindow.xaml.cs

@@ -19,12 +19,14 @@ namespace Kusach.Windows
     /// </summary>
     public partial class RouteEditWindow : Window
     {
+        int RouteId;
         public RouteEditWindow(int id)
         {
-            InitializeComponent(); 
-            RouteNameBox.Text = cnt.db.Routes.Where(item => item.IdRoute == id).Select(item => item.Name).FirstOrDefault();
-            PointsListDataGrid.ItemsSource = cnt.db.PointsList.Where(item => item.IdRoute == id).ToList();
-            DriversListDataGrid.ItemsSource = cnt.db.DriversList.Where(item => item.IdRoute == id).ToList();
+            InitializeComponent();
+            RouteId = id;
+            RouteNameBox.Text = cnt.db.Routes.Where(item => item.IdRoute == RouteId).Select(item => item.Name).FirstOrDefault();
+            PointsListDataGrid.ItemsSource = cnt.db.PointsList.Where(item => item.IdRoute == RouteId).ToList();
+            DriversListDataGrid.ItemsSource = cnt.db.DriversList.Where(item => item.IdRoute == RouteId).ToList();
 
         }
         private void PointsDataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -37,12 +39,35 @@ namespace Kusach.Windows
         }
         private void AddPoint_Click(object sender, RoutedEventArgs e)
         {
-
+            AddPointWindow apw = new AddPointWindow(RouteId);
+            apw.ShowDialog();
+        }
+        private void RemovePoint_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                cnt.db.PointsList.Remove(cnt.db.PointsList.Where(item => item.IdRoute == RouteId && item.IdPoint == ((PointsList)PointsListDataGrid.SelectedItem).IdPoint).FirstOrDefault());
+                cnt.db.SaveChanges();
+            }
+            catch
+            {
+                MessageBox.Show("Ошибка удаления записи.");
+            }
         }
 
         private void ExitButton_Click(object sender, RoutedEventArgs e)
         {
             this.Close();
         }
+
+        private void AddFromListPoint_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void UpdatePoints_Click(object sender, RoutedEventArgs e)
+        {
+            PointsListDataGrid.ItemsSource = cnt.db.PointsList.Where(item => item.IdRoute == RouteId).ToList();
+        }
     }
 }