Browse Source

сделала вывод истории

Алёна Плотникова 3 years ago
parent
commit
1a4140709b
2 changed files with 17 additions and 2 deletions
  1. 10 2
      numbersystem/MainWindow.xaml
  2. 7 0
      numbersystem/MainWindow.xaml.cs

+ 10 - 2
numbersystem/MainWindow.xaml

@@ -103,8 +103,16 @@
                             Content="=" Grid.Row="7" Grid.Column="3" Background="#4040bf"/>
                 </Grid>
             </TabItem>
-            <TabItem Header="История" FontFamily="Montserrat Light">
-                <Grid Background="#d7d7f2"/>
+            <TabItem Header="История" FontFamily="Montserrat Light" Height="19" VerticalAlignment="Top">
+                <Grid Background="#d7d7f2">
+                    <DataGrid x:Name="historyGrid" IsReadOnly="True" AutoGenerateColumns="False">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Запрос" Binding="{Binding inquiry}" Width="Auto"/>
+                            <DataGridTextColumn Header="Результат" Binding="{Binding result}" Width="Auto"/>
+                            <DataGridTextColumn Header="Основание СС" Binding="{Binding notation}" Width="Auto"/>
+                        </DataGrid.Columns>
+                    </DataGrid>
+                </Grid>
             </TabItem>
             <TabItem Header="Диаграмма" FontFamily="Montserrat Light">
                 <Grid Background="#d7d7f2"/>

+ 7 - 0
numbersystem/MainWindow.xaml.cs

@@ -26,6 +26,12 @@ namespace numbersystem
             InitializeComponent();
             _context = new numbersystemContext();
             str.Focus();
+            Load();
+        }
+
+        private void Load()
+        {
+            historyGrid.ItemsSource = _context.history.ToList();
         }
 
         // выбор системы счисления
@@ -188,6 +194,7 @@ namespace numbersystem
                     };
                     _context.history.Add(record);
                     _context.SaveChanges();
+                    Load();
                 }
                 catch (Exception ex)
                 {