/

Kusach/Pages/ProfilePage.xaml

@@ -94,7 +94,5 @@
             BorderBrush="Black" 
             BorderThickness="1"/>
         </Grid>
-
-
     </Grid>
 </Page>

Kusach/Pages/RoutesListPage.xaml.cs

@@ -19,11 +19,8 @@ namespace Kusach.Pages
         }
         private void DataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            if (profile.Permission == 0)
-            {
-                Windows.RouteEditWindow rew = new Windows.RouteEditWindow(((Routes)RoutesList.SelectedItem).IdRoute);
+            Windows.RouteEditWindow rew = new Windows.RouteEditWindow(((Routes)RoutesList.SelectedItem).IdRoute);
                 rew.Show();
-            }
         }
 
         #region Поиск

Kusach/Windows/AddDriverToRouteWindow.xaml

@@ -57,13 +57,26 @@
                     IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        <Button 
+        <StackPanel 
             Grid.Row="1"
+            Orientation="Horizontal"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center">
+            <Button 
             Content="Отмена"
             Width="90"
             Height="35"
             HorizontalAlignment="Center"
-            Click="BackButton_Click"/>
+            Click="BackButton_Click"
+            Margin="0,0,10,0"/>
+            <Button 
+            Name="CreateButton"
+            Content="Создать"
+            Width="90"
+            Height="35"
+            HorizontalAlignment="Center"
+            Click="CreateButton_Click"/>
+        </StackPanel>
         <Border 
             Grid.RowSpan="2"
             BorderBrush="Black" 

Kusach/Windows/AddDriverToRouteWindow.xaml.cs

@@ -9,10 +9,11 @@ namespace Kusach.Windows
     /// </summary>
     public partial class AddDriverToRouteWindow : Window
     {
-        public int driverId = -1;
+        public int driverId = -1; int routeId;
         public AddDriverToRouteWindow(int id)
         {
             InitializeComponent();
+            routeId = id;
             DriversListDataGrid.ItemsSource = cnt.db.Drivers.ToList();
         }
         private void PointsDataGridRow_MouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -25,5 +26,11 @@ namespace Kusach.Windows
         {
             this.Close();
         }
+        private void CreateButton_Click(object sender, RoutedEventArgs e)
+        {
+            AddDriverWindow adw = new AddDriverWindow(routeId);
+            adw.ShowDialog();
+            this.Close();
+        }
     }
 }

Kusach/Windows/AddPointToRouteWindow.xaml

@@ -47,13 +47,26 @@
                     IsReadOnly="True"/>
             </DataGrid.Columns>
         </DataGrid>
-        <Button 
+        <StackPanel 
             Grid.Row="1"
+            Orientation="Horizontal"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center">
+            <Button 
             Content="Отмена"
             Width="90"
             Height="35"
             HorizontalAlignment="Center"
-            Click="BackButton_Click"/>
+            Click="BackButton_Click"
+            Margin="0,0,10,0"/>
+            <Button 
+            Name="CreateButton"
+            Content="Создать"
+            Width="90"
+            Height="35"
+            HorizontalAlignment="Center"
+            Click="CreateButton_Click"/>
+        </StackPanel>
         <Border 
             Grid.RowSpan="2"
             BorderBrush="Black" 

Kusach/Windows/AddPointToRouteWindow.xaml.cs

@@ -9,9 +9,11 @@ namespace Kusach.Windows
     /// </summary>
     public partial class AddPointToRouteWindow : Window
     {
-        public AddPointToRouteWindow()
+        int routeId;
+        public AddPointToRouteWindow(int id)
         {
             InitializeComponent();
+            routeId = id;
             PointsListDataGrid.ItemsSource = cnt.db.Points.ToList();
         }
         public int pointId = -1;
@@ -20,6 +22,12 @@ namespace Kusach.Windows
             pointId = ((Points)PointsListDataGrid.SelectedItem).IdPoint;
             this.Close();
         }
+        private void CreateButton_Click(object sender, RoutedEventArgs e)
+        {
+            AddPointWindow apw = new AddPointWindow(routeId);
+            apw.ShowDialog();
+            this.Close();
+        }
 
         private void BackButton_Click(object sender, RoutedEventArgs e)
         {

Kusach/Windows/RegWindow.xaml.cs

@@ -25,9 +25,15 @@ namespace Kusach
                 else
                 {
                     if (!Functions.IsValidPhoneNumber(PhoneBox.Text))
+                    {
                         MessageBox.Show("Номер телефона введен неверно.");
+                        return;
+                    }
                     if (!Functions.IsValidEmail(EmailBox.Text))
+                    {
                         MessageBox.Show("email введен неверно.");
+                        return;
+                    }
                     Dispatcher newUser = new Dispatcher()
                     {
                         IdDispatcher = cnt.db.Dispatcher.Select(p => p.IdDispatcher).DefaultIfEmpty(0).Max() + 1,
@@ -39,8 +45,11 @@ namespace Kusach
                         Birthday = Convert.ToDateTime(BirthdayBox.Text),
                         PhoneNumber = PhoneBox.Text,
                         Email = EmailBox.Text,
-                        Permission = 1
                     };
+                    if (cnt.db.Dispatcher.Count() == 0)
+                        newUser.Permission = 0;
+                    else
+                        newUser.Permission = 1;
                     cnt.db.Dispatcher.Add(newUser);
                     cnt.db.SaveChanges();
                     profile.DispatcherId = cnt.db.Dispatcher.First(item => item.Login == logbox.Text).IdDispatcher;

Kusach/Windows/RouteEditWindow.xaml

@@ -89,14 +89,6 @@
                                 Click="Update_Click">
                             </Button>
                             <Button
-                                Name="CreateButton"
-                                Content="Создать"
-                                Width="90"
-                                Height="30"
-                                Margin="0,0,10,0"
-                                Click="AddPoint_Click">
-                            </Button>
-                            <Button
                                 Name="AddButton"
                                 Content="Добавить"
                                 Width="90"
@@ -181,6 +173,7 @@
                             </Button>
                             <Button
                                 Name="CreateButtonDrivers"
+                                Visibility="Collapsed"
                                 Content="Создать"
                                 Width="90"
                                 Height="30"
@@ -196,11 +189,12 @@
                                 Click="AddFromListDriver_Click">
                             </Button>
                             <Button
-                                Visibility="Hidden"
+                                Name="RemoveDriver"
                                 Content="Удалить"
                                 Grid.Row="1"
                                 Width="90"
-                                Height="30">
+                                Height="30"
+                                Click="RemoveDriver_Click">
                             </Button>
                         </StackPanel>
                     </Grid>

Kusach/Windows/RouteEditWindow.xaml.cs

@@ -19,10 +19,10 @@ namespace Kusach.Windows
             {
                 RouteNameBox.IsEnabled = false;
                 AddButton.Visibility = Visibility.Collapsed;
-                CreateButton.Visibility = Visibility.Collapsed;
                 RemoveButton.Visibility = Visibility.Collapsed;
                 AddButtonDrivers.Visibility = Visibility.Collapsed;
                 CreateButtonDrivers.Visibility = Visibility.Collapsed;
+                RemoveDriver.Visibility = Visibility.Collapsed;
             }
             Update();
         }
@@ -42,11 +42,6 @@ namespace Kusach.Windows
                 dew.ShowDialog();
             }
         }
-        private void AddPoint_Click(object sender, RoutedEventArgs e)
-        {
-            AddPointWindow apw = new AddPointWindow(routeId);
-            apw.ShowDialog();
-        }
         private void AddDriver_Click(object sender, RoutedEventArgs e)
         {
             AddDriverWindow adw = new AddDriverWindow(routeId);
@@ -76,7 +71,7 @@ namespace Kusach.Windows
 
         private void AddFromListPoint_Click(object sender, RoutedEventArgs e)
         {
-            AddPointToRouteWindow aptrw = new AddPointToRouteWindow();
+            AddPointToRouteWindow aptrw = new AddPointToRouteWindow(routeId);
             aptrw.ShowDialog();
             int pointId = aptrw.pointId;
             if (pointId != -1)
@@ -99,6 +94,7 @@ namespace Kusach.Windows
                     MessageBox.Show("Ошибка добавления записи");
                 }
             }
+            Update();
         }
 
         private void AddFromListDriver_Click(object sender, RoutedEventArgs e)
@@ -126,6 +122,7 @@ namespace Kusach.Windows
                     MessageBox.Show("Ошибка добавления записи");
                 }
             }
+            Update();
         }
 
         void Update()
@@ -137,5 +134,19 @@ namespace Kusach.Windows
         {
             Update();
         }
+
+        private void RemoveDriver_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                cnt.db.DriversList.Remove(cnt.db.DriversList.Where(item => item.IdRoute == routeId && item.IdDriver == ((DriversList)DriversListDataGrid.SelectedItem).IdDriver).FirstOrDefault());
+                cnt.db.SaveChanges();
+                Update();
+            }
+            catch
+            {
+                MessageBox.Show("Ошибка удаления записи.");
+            }
+        }
     }
 }