gr672_bda 4 years ago
parent
commit
6da63c77d3

+ 1 - 17
ProjectAnalogParus/AccrualsPage.xaml.cs

@@ -32,23 +32,7 @@ namespace ProjectAnalogParus
         public AccrualsPage()
         {
             InitializeComponent();
-
-            AppDomain.CurrentDomain.FirstChanceException += (source, e) =>
-            {
-                Debug.WriteLine("FirstChanceException event raised in {0}: {1}",
-                    AppDomain.CurrentDomain.FriendlyName, e.Exception.Message);
-            };
-
-            DataContext = new ModelClass();
-
-        }
-        
-        private void DataGrid_LoadingRow(object sender, DataGridRowEventArgs e)
-        {
-            var index = e.Row.GetIndex() + 1;
-            e.Row.Header = $"{index}";
-        }
-
+        }      
 
         private void ExcelClick(object sender, RoutedEventArgs e)
         {          

+ 5 - 1
ProjectAnalogParus/AthorizationPage.xaml

@@ -10,8 +10,12 @@
 
     <Grid>
         <TextBox Name="login" HorizontalAlignment="Left" Height="23" Margin="399,190,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
-        <Button Content="Войти" HorizontalAlignment="Left" Margin="363,280,0,0" VerticalAlignment="Top" Width="75" Click="AthorizationClick"/>
+        <Button Content="Войти" HorizontalAlignment="Left" Margin="421,281,0,0" VerticalAlignment="Top" Width="98" Click="AthorizationClick" Height="32" RenderTransformOrigin="0.509,0.453"/>
         <PasswordBox Name="password" HorizontalAlignment="Left" Margin="399,230,0,0" VerticalAlignment="Top" Height="24" Width="120"/>
+        <TextBlock HorizontalAlignment="Left" Margin="292,190,0,0" TextWrapping="Wrap" Text="Логин" VerticalAlignment="Top" Height="23" Width="69"/>
+        <TextBlock HorizontalAlignment="Left" Margin="292,231,0,0" TextWrapping="Wrap" Text="Пароль" VerticalAlignment="Top" Height="23" Width="69"/>
+        
+        <CheckBox Content="Запомнить" Name="SaveUser" VerticalContentAlignment="Center" HorizontalAlignment="Left" Margin="292,281,0,0" VerticalAlignment="Top" Height="32" Width="97"/>
 
     </Grid>
 </Page>

+ 22 - 1
ProjectAnalogParus/AthorizationPage.xaml.cs

@@ -21,13 +21,19 @@ namespace ProjectAnalogParus
     /// </summary>
     public partial class AthorizationPage : Page
     {
+        gr672_bdaEntities db = new gr672_bdaEntities();
         public AthorizationPage()
         {
             InitializeComponent();
-            gr672_bdaEntities db = new gr672_bdaEntities();   
+            
+            login.Text = Settings.Default.SaveLogin;
+            password.Password = Settings.Default.SavePassword;
+            SaveUser.IsChecked = Settings.Default.IsSaveUser;
 
         }
 
+       
+
         private void AthorizationClick(object sender, RoutedEventArgs e)
         {
             if (login.Text == string.Empty && password.Password == string.Empty)
@@ -44,15 +50,30 @@ namespace ProjectAnalogParus
                     MessageBox.Show("Пользователь с таким именем не найден!");                    
                 }
 
+                if (SaveUser.IsChecked == true)
+                {
+                    Settings.Default.SaveLogin = login.Text;
+                    Settings.Default.SavePassword = password.Password;
+                    Settings.Default.IsSaveUser = true;
+                }
+                else
+                {
+                    Settings.Default.SaveLogin = string.Empty;
+                    Settings.Default.SavePassword = string.Empty;
+                    Settings.Default.IsSaveUser = false;
+                }
+
                 int idUser = user.IdUser;
                 Application.Current.Properties["IdUser"] = idUser;
                 switch (user.Role.IdRole)
                 {
                     case 1: 
                         FramePage.MainFrame.Navigate(new AdminPage());
+                        Settings.Default.Save();
                         break;
                     case 2:
                         FramePage.MainFrame.Navigate(new BookerPage());
+                        Settings.Default.Save();
                         break;                    
                 }          
 

+ 5 - 4
ProjectAnalogParus/DeleteEncouragementWindow.xaml

@@ -5,11 +5,12 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ProjectAnalogParus"
         mc:Ignorable="d"
-        Title="DeleteEncouragementWindow" Height="450" Width="800">
+        Title="Удаление поощрения" Height="313.897" Width="451.771" ResizeMode="NoResize" ShowInTaskbar="False" WindowStartupLocation="CenterScreen">
     <Grid>
-        <ComboBox Name="cmbEncouragement" HorizontalAlignment="Left" Margin="357,126,0,0" VerticalAlignment="Top" Width="120"/>
-        <Button Content="Удалить" HorizontalAlignment="Left" Margin="134,229,0,0" VerticalAlignment="Top" Width="75" Click="DeleteClick"/>
-        <Button Content="Отмена" HorizontalAlignment="Left" Margin="308,229,0,0" VerticalAlignment="Top" Width="75" Click="CancelClick"/>
+        <ComboBox Name="cmbEncouragement" HorizontalAlignment="Left" Margin="230,65,0,0" VerticalAlignment="Top" Width="120"/>
+        <Button Content="Удалить" HorizontalAlignment="Left" Margin="85,160,0,0" VerticalAlignment="Top" Width="120" Click="DeleteClick" Height="31"/>
+        <Button Content="Отмена" HorizontalAlignment="Left" Margin="230,160,0,0" VerticalAlignment="Top" Width="120" Click="CancelClick" RenderTransformOrigin="0.418,2.711" Height="31"/>
+        <TextBlock HorizontalAlignment="Left" Margin="85,65,0,0" TextWrapping="Wrap" Text="Выбор поощрения" VerticalAlignment="Top" Height="22" Width="120"/>
 
     </Grid>
 </Window>

+ 11 - 5
ProjectAnalogParus/FullInformationStudentPage.xaml

@@ -15,11 +15,17 @@
         <ComboBox Name="cmbSpecialty" HorizontalAlignment="Left" Height="23" Margin="200,179,0,0"  VerticalAlignment="Top" Width="120"/>
         <TextBox Name="txtNumberGroup" HorizontalAlignment="Left" Height="23" Margin="200,221,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
         <TextBox Name="txtCourse" HorizontalAlignment="Left" Height="23" Margin="200,259,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="120"/>
-        <Button Name="SaveInfo" Content="Сохранить" HorizontalAlignment="Left" Margin="82,352,0,0" VerticalAlignment="Top" Width="75" Click="EditInformationStudent_Click"/>
-        <Button Name="AddInfo" Content="Добавить" HorizontalAlignment="Left" Margin="82,352,0,0" VerticalAlignment="Top" Width="75" Click="AddInformationStudent_Click"/>
-        <Button  Content="Выход" HorizontalAlignment="Left" Margin="200,352,0,0" VerticalAlignment="Top" Width="75" Click="Cancel_Click"/>
-        <Button Content="Добавить фотографию" HorizontalAlignment="Left" Margin="33,221,0,0" VerticalAlignment="Top" Width="140" Height="23" Click="PhotoInsert_Click"/>
-        <Image Name="PhotoOfClent" HorizontalAlignment="Left" Height="149" Margin="33,53,0,0" VerticalAlignment="Top" Width="140"/>
+        <Button Name="SaveInfo" Content="Сохранить" HorizontalAlignment="Left" Margin="108,338,0,0" VerticalAlignment="Top" Width="97" Click="EditInformationStudent_Click" Height="34"/>
+        <Button Name="AddInfo" Content="Добавить" HorizontalAlignment="Left" Margin="108,338,0,0" VerticalAlignment="Top" Width="97" Click="AddInformationStudent_Click" Height="34"/>
+        <Button  Content="Выход" HorizontalAlignment="Left" Margin="234,338,0,0" VerticalAlignment="Top" Width="86" Click="Cancel_Click" Height="34"/>
+        <Button Content="Добавить фотографию" HorizontalAlignment="Left" Margin="359,221,0,0" VerticalAlignment="Top" Width="140" Height="23" Click="PhotoInsert_Click"/>
+        <Image Name="PhotoOfClent" HorizontalAlignment="Left" Height="149" Margin="359,53,0,0" VerticalAlignment="Top" Width="140"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,53,0,0" TextWrapping="Wrap" Text="Фамилия" VerticalAlignment="Top" Height="23" Width="87"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,95,0,0" TextWrapping="Wrap" Text="Имя" VerticalAlignment="Top" Height="23" Width="87"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,138,0,0" TextWrapping="Wrap" Text="Отчество" VerticalAlignment="Top" Height="23" Width="87"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,179,0,0" TextWrapping="Wrap" Text="Специальность" VerticalAlignment="Top" Height="23" Width="87"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,221,0,0" TextWrapping="Wrap" Text="Номер группы" VerticalAlignment="Top" Height="23" Width="87"/>
+        <TextBlock HorizontalAlignment="Left" Margin="108,259,0,0" TextWrapping="Wrap" Text="Курс" VerticalAlignment="Top" Height="23" Width="87"/>
 
     </Grid>
 </Page>

+ 10 - 10
ProjectAnalogParus/FullInformationStudentPage.xaml.cs

@@ -122,19 +122,19 @@ namespace ProjectAnalogParus
         }
 
 
-            private void PhotoInsert_Click(object sender, RoutedEventArgs e)
-            {
-                OpenFileDialog ofdPicture = new OpenFileDialog();
-                ofdPicture.Filter =
-                    "Image files|*.bmp;*.jpg;*.gif;*.png;*.tif|All files|*.*";
-                ofdPicture.FilterIndex = 1;
+        private void PhotoInsert_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog ofdPicture = new OpenFileDialog();
+            ofdPicture.Filter =
+                "Image files|*.bmp;*.jpg;*.gif;*.png;*.tif|All files|*.*";
+            ofdPicture.FilterIndex = 1;
 
-                if (ofdPicture.ShowDialog() == true)
-                  PhotoOfClent.Source =
-                        new BitmapImage(new Uri(ofdPicture.FileName));
+            if (ofdPicture.ShowDialog() == true)
+                PhotoOfClent.Source =
+                    new BitmapImage(new Uri(ofdPicture.FileName));
 
 
-            }
+        }
         
 
     }

+ 10 - 6
ProjectAnalogParus/InsertUserWindow.xaml

@@ -5,14 +5,18 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ProjectAnalogParus"
         mc:Ignorable="d"
-        Title="InsertUserWindow" Height="450" Width="800">
+        Title="Регистрация пользователя" Height="390.984" Width="524.59">
     <Grid>
-        <Button Content="Добавить" HorizontalAlignment="Left" Margin="121,290,0,0" VerticalAlignment="Top" Width="75" Click="InsertClick"/>
-        <Button Content="Отмена" HorizontalAlignment="Left" Margin="241,290,0,0" VerticalAlignment="Top" Width="75" Click="CancelClick"/>
-        <TextBox Name="userName" HorizontalAlignment="Left" Height="23" Margin="241,110,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
-        <TextBox Name="fullName" HorizontalAlignment="Left" Height="23" Margin="241,151,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
-        <TextBox Name="password" HorizontalAlignment="Left" Height="23" Margin="241,179,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
+        <Button Content="Зарегистрировать" HorizontalAlignment="Left" Margin="129,279,0,0" VerticalAlignment="Top" Width="112" Click="InsertClick" Height="31"/>
+        <Button Content="Отмена" HorizontalAlignment="Left" Margin="268,279,0,0" VerticalAlignment="Top" Width="93" Click="CancelClick" RenderTransformOrigin="0.717,0.441" Height="31"/>
+        <TextBox Name="userName" HorizontalAlignment="Left" Height="23" Margin="241,123,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
+        <TextBox Name="fullName" HorizontalAlignment="Left" Height="23" Margin="241,179,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
+        <TextBox Name="password" HorizontalAlignment="Left" Height="23" Margin="241,151,0,0" TextWrapping="Wrap"  VerticalAlignment="Top" Width="120"/>
         <ComboBox Name="role" HorizontalAlignment="Left" Margin="241,207,0,0" VerticalAlignment="Top" Width="120"/>
+        <TextBlock HorizontalAlignment="Left" Margin="129,123,0,0" TextWrapping="Wrap" Text="Логин" VerticalAlignment="Top" Height="23" Width="112"/>
+        <TextBlock HorizontalAlignment="Left" Margin="129,179,0,0" TextWrapping="Wrap" Text="Имя пользователя" VerticalAlignment="Top" Height="23" Width="112"/>
+        <TextBlock HorizontalAlignment="Left" Margin="129,151,0,0" TextWrapping="Wrap" Text="Пароль" VerticalAlignment="Top" Height="23" Width="112"/>
+        <TextBlock HorizontalAlignment="Left" Margin="129,207,0,0" TextWrapping="Wrap" Text="Роль пользователя" VerticalAlignment="Top" Height="22" Width="112"/>
 
     </Grid>
 </Window>

+ 1 - 0
ProjectAnalogParus/ListStudentPage.xaml

@@ -22,6 +22,7 @@
         </DataGrid>
         <Button Content="Дополнительная информация" HorizontalAlignment="Left" Margin="10,199,0,0" VerticalAlignment="Top" Width="191" Click="FullInformation_Click" Height="27"/>
         <Button Content="Добавить студента" HorizontalAlignment="Left" Margin="235,199,0,0" VerticalAlignment="Top" Width="124" Height="27" Click="insertStudent_Click"/>
+        <Button Content="Удалить студента" HorizontalAlignment="Left" Margin="406,199,0,0" VerticalAlignment="Top" Width="111" Height="27" Click="DeleteStudent_Click"/>
 
     </Grid>
 </Page>

+ 5 - 0
ProjectAnalogParus/ListStudentPage.xaml.cs

@@ -48,5 +48,10 @@ namespace ProjectAnalogParus
         {
             FramePage.MainFrame.Navigate(new FullInformationStudentPage(null));
         }
+
+        private void DeleteStudent_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 }

+ 4 - 2
ProjectAnalogParus/MainWindow.xaml

@@ -5,9 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:ProjectAnalogParus"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        Title="Бухгалтерский учет" Height="450" Width="800" WindowStartupLocation="CenterScreen" ResizeMode="NoResize">
     <Grid>
-        <Frame x:Name="Frame" HorizontalAlignment="Left" Height="399" Margin="10,10,0,0" VerticalAlignment="Top" Width="772"/>
+        <Frame x:Name="Frame" NavigationUIVisibility="Hidden" HorizontalAlignment="Left" Height="399" Margin="11,5,0,0" ContentRendered="MainFrame_inf" VerticalAlignment="Top" Width="772">
+        </Frame>
+        <Button Content="Назад" Name="BtnBack" Click="ButtonBack" HorizontalAlignment="Left" Margin="707,10,0,0" VerticalAlignment="Top" Width="75" RenderTransformOrigin="1.806,-1.045"/>
 
     </Grid>
 </Window>

+ 11 - 0
ProjectAnalogParus/MainWindow.xaml.cs

@@ -26,7 +26,18 @@ namespace ProjectAnalogParus
 
             FramePage.MainFrame = this.Frame;      
             FramePage.MainFrame.Navigate(new AthorizationPage());
+            //Background = "LemonChiffon"
 
         }
+
+        private void MainFrame_inf(object sender, EventArgs e)
+        {
+            BtnBack.Visibility = Frame.CanGoBack ? Visibility.Visible : Visibility.Hidden;
+        }
+
+        private void ButtonBack(object sender, RoutedEventArgs e)
+        {
+            Frame.GoBack();
+        }
     }
 }

+ 45 - 0
ProjectAnalogParus/Properties/Settings.Designer.cs

@@ -26,5 +26,50 @@ namespace ProjectAnalogParus.Properties
                 return defaultInstance;
             }
         }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string SaveLogin
+        {
+            get
+            {
+                return ((string)(this["SaveLogin"]));
+            }
+            set
+            {
+                this["SaveLogin"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string SavePassword
+        {
+            get
+            {
+                return ((string)(this["SavePassword"]));
+            }
+            set
+            {
+                this["SavePassword"] = value;
+            }
+        }
+
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool IsSaveUser
+        {
+            get
+            {
+                return ((bool)(this["IsSaveUser"]));
+            }
+            set
+            {
+                this["IsSaveUser"] = value;
+            }
+        }
     }
 }