gr672_bda 4 år sedan
förälder
incheckning
2b77673c39

+ 1 - 1
ProjectAnalogParus/AthorizationPage.xaml.cs

@@ -49,7 +49,7 @@ namespace ProjectAnalogParus
                 Application.Current.Properties["IdUser"] = idUser;
                 switch (user.Role.IdRole)
                 {
-                    case 1:
+                    case 1: 
                         FramePage.MainFrame.Navigate(new AdminPage());
                         break;
                     case 2:

+ 15 - 7
ProjectAnalogParus/DeleteEncouragementWindow.xaml.cs

@@ -30,13 +30,21 @@ namespace ProjectAnalogParus
 
         private void DeleteClick(object sender, RoutedEventArgs e)
         {
-            gr672_bdaEntities db = new gr672_bdaEntities();
-            int num = Convert.ToInt32(cmbEncouragement.SelectedValue.ToString());
-            var dRow = db.Encouragement.Where(w => w.IdEncouragement == num).FirstOrDefault();
-            var bRow = db.TypeEncouragement.Where(w => w.IdTypeEncouragement == num).FirstOrDefault();
-            db.Encouragement.Remove(dRow);
-            db.TypeEncouragement.Remove(bRow);
-            db.SaveChanges();
+            if (cmbEncouragement != null)
+            {
+                gr672_bdaEntities db = new gr672_bdaEntities();
+                int num = Convert.ToInt32(cmbEncouragement.SelectedValue.ToString());
+                var dRow = db.Encouragement.Where(w => w.IdEncouragement == num).FirstOrDefault();
+                var bRow = db.TypeEncouragement.Where(w => w.IdTypeEncouragement == num).FirstOrDefault();
+                db.Encouragement.Remove(dRow);
+                db.TypeEncouragement.Remove(bRow);
+                db.SaveChanges();
+            }
+            else 
+            {
+                MessageBox.Show("Сначала выберете, для удаления");
+            }
+           
             
         }
 

+ 16 - 8
ProjectAnalogParus/InsertEncouragementWindow.xaml.cs

@@ -27,14 +27,22 @@ namespace ProjectAnalogParus
 
         private void InsertClick(object sender, RoutedEventArgs e)
         {
-            gr672_bdaEntities db = new gr672_bdaEntities();
-            Encouragement encouragement = new Encouragement();  
-            TypeEncouragement NameEncouragement = new TypeEncouragement();
-            encouragement.Amount = Convert.ToDecimal(txtAmount.Text);
-            NameEncouragement.NameTypeEncouragement = txtNameEncouragement.Text;
-            db.TypeEncouragement.Add(NameEncouragement);
-            db.Encouragement.Add(encouragement);
-            db.SaveChanges();           
+            if (txtAmount.Text != "" && txtNameEncouragement.Text != "")
+            {
+                gr672_bdaEntities db = new gr672_bdaEntities();
+                Encouragement encouragement = new Encouragement();
+                TypeEncouragement NameEncouragement = new TypeEncouragement();
+                encouragement.Amount = Convert.ToDecimal(txtAmount.Text);
+                NameEncouragement.NameTypeEncouragement = txtNameEncouragement.Text;
+                db.TypeEncouragement.Add(NameEncouragement);
+                db.Encouragement.Add(encouragement);
+                db.SaveChanges();
+            }
+            else
+            {
+                MessageBox.Show("Не все поля заполнены!");
+            }
+                    
         }
 
         private void CancelClick(object sender, RoutedEventArgs e)

+ 16 - 8
ProjectAnalogParus/InsertUserWindow.xaml.cs

@@ -30,14 +30,22 @@ namespace ProjectAnalogParus
 
         private void InsertClick(object sender, RoutedEventArgs e)
         {
-            gr672_bdaEntities db = new gr672_bdaEntities();
-            User user = new User();
-            user.NameUser = userName.Text;
-            user.FullNameUser = fullName.Text;
-            user.Password = password.Text;
-            user.RoleId = Convert.ToInt32(role.SelectedValue.ToString());
-            db.User.Add(user);
-            db.SaveChanges();          
+            if (userName.Text != "" && fullName.Text != "" && password.Text != "" && role != null)
+            {
+                gr672_bdaEntities db = new gr672_bdaEntities();
+                User user = new User();
+                user.NameUser = userName.Text;
+                user.FullNameUser = fullName.Text;
+                user.Password = password.Text;
+                user.RoleId = Convert.ToInt32(role.SelectedValue.ToString());
+                db.User.Add(user);
+                db.SaveChanges();
+            }
+            else
+            {
+                MessageBox.Show("Не все поля заполнены!");
+            }
+                    
             
         }
 

+ 1 - 1
ProjectAnalogParus/StudentPage.xaml

@@ -11,7 +11,7 @@
     <Grid>
         <Button Content="Список студентов" HorizontalAlignment="Left" Margin="55,44,0,0" VerticalAlignment="Top" Width="114" Height="22" Click="OpenListStudent"/>
         <Button Content="Расчет стипендии" HorizontalAlignment="Left" Margin="212,44,0,0" VerticalAlignment="Top" Width="128" Height="22" Click="SummEncoragementClick"/>
-        <Button Content="Начисление стипендии" HorizontalAlignment="Left" Margin="381,44,0,0" VerticalAlignment="Top" Width="147" Height="22" Click="ReqisitesEncoragementClick"/>
+        <Button Content="Начисление стипендии" HorizontalAlignment="Left" Margin="381,44,0,0" VerticalAlignment="Top" Width="147" Height="22" Click="ReqisitesScholarshipsClick"/>
         <Button Content="Поощрения" HorizontalAlignment="Left" Margin="55,117,0,0" VerticalAlignment="Top" Width="75" Click="OpenEncouragementPage"/>
         <Button Content="Детали" HorizontalAlignment="Left" Margin="587,44,0,0" VerticalAlignment="Top" Width="75" Click="OpenDetailsStudent"/>
 

+ 1 - 0
ProjectAnalogParus/StudentPage.xaml.cs

@@ -49,6 +49,7 @@ namespace ProjectAnalogParus
         {
             FramePage.MainFrame.Navigate(new DetailsStudentPage());
         }
+       
     }
 }