gr672_bda 4 lat temu
rodzic
commit
6db9b4bb49

+ 1 - 1
ProjectAnalogParus/AthorizationPage.xaml.cs

@@ -30,7 +30,7 @@ namespace ProjectAnalogParus
 
         private void AthorizationClick(object sender, RoutedEventArgs e)
         {
-            if (login.Text == string.Empty || password.Password == string.Empty)
+            if (login.Text == string.Empty && password.Password == string.Empty)
             {
                 MessageBox.Show("Ключевые поля не заполнены");               
             }

+ 3 - 2
ProjectAnalogParus/EncouragementSummaPage.xaml

@@ -31,8 +31,9 @@
         <ComboBox Name="cmbEncoragement" HorizontalAlignment="Left" Margin="304,221,0,0" VerticalAlignment="Top" Width="120"/>
         <TextBlock Name="AmoutSumma" HorizontalAlignment="Left" Margin="304,254,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Height="24" Width="120"/>
         <DatePicker Name="datetime" HorizontalAlignment="Left" Margin="302,143,0,0" VerticalAlignment="Top" Height="29" Width="120"/>
-       
-            
+        <Button Content="Начисление стипендии" HorizontalAlignment="Left" Margin="265,355,0,0" VerticalAlignment="Top" Width="147" Height="20" Click="ReqisitesScholarshipsClick"/>
+
+
 
     </Grid>
 </Page>

+ 5 - 0
ProjectAnalogParus/EncouragementSummaPage.xaml.cs

@@ -60,5 +60,10 @@ namespace ProjectAnalogParus
             }
           
         }
+
+        private void ReqisitesScholarshipsClick(object sender, RoutedEventArgs e)
+        {
+            FramePage.MainFrame.Navigate(new ReqisitesSholarshipsPage());
+        }
     }
 }

+ 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="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 - 5
ProjectAnalogParus/StudentPage.xaml.cs

@@ -39,11 +39,7 @@ namespace ProjectAnalogParus
         {
             FramePage.MainFrame.Navigate(new EncouragementSummaPage());
         }
-
-        private void ReqisitesScholarshipsClick(object sender, RoutedEventArgs e)
-        {
-            FramePage.MainFrame.Navigate(new ReqisitesSholarshipsPage());
-        }
+       
 
         private void OpenDetailsStudent(object sender, RoutedEventArgs e)
         {