From 643bfafef588e3a4346bcbe1bd0d67fe7a3a72a5 Mon Sep 17 00:00:00 2001
From: VladM7 <mvlad2005@outlook.com>
Date: Sat, 2 May 2026 14:27:05 +0200
Subject: [PATCH 1/2] added datagrids for pallets, layers and solutions

---
 Stack-Solver.csproj                | 16 ++++----
 Views/Pages/PalletBuilderPage.xaml | 62 +++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/Stack-Solver.csproj b/Stack-Solver.csproj
index 3891054..addd451 100644
--- a/Stack-Solver.csproj
+++ b/Stack-Solver.csproj
@@ -33,17 +33,17 @@
     <PackageReference Include="FluentValidation" Version="12.1.1" />
     <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
     <PackageReference Include="Google.OrTools" Version="9.15.6755" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="10.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="WPF-UI" Version="4.2.0" />
-    <PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0 " />
+    <PackageReference Include="WPF-UI" Version="4.2.1" />
+    <PackageReference Include="WPF-UI.DependencyInjection" Version="4.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="10.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="10.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
diff --git a/Views/Pages/PalletBuilderPage.xaml b/Views/Pages/PalletBuilderPage.xaml
index 983fe97..a777a7b 100644
--- a/Views/Pages/PalletBuilderPage.xaml
+++ b/Views/Pages/PalletBuilderPage.xaml
@@ -251,7 +251,8 @@
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="2*"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
@@ -261,15 +262,58 @@
                     <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,5,0,0">
                         <ui:Button Content="Save Report" Icon="{ui:SymbolIcon Save24}" Height="38" IsEnabled="False" />
                     </StackPanel>
-                    <ui:TextBlock Grid.Column="0" Grid.Row="1" Text="{Binding ViewModel.PalletAnalyzer.OutputText}" FontFamily="Cascadia Code" FontSize="14" TextWrapping="Wrap" Margin="0,10,10,10"/>
-                    <GridSplitter Grid.Row="1" Grid.Column="0" Width="3" HorizontalAlignment="Right" Height="200"/>
-                    <StackPanel Orientation="Vertical" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2">
-                        <ui:DataGrid AutoGenerateColumns="False" FontSize="12" ItemsSource="{Binding ViewModel.PalletAnalyzer.CandidateLayers}">
+                    <Border Grid.Row="1" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="6" Margin="0,7,10,7">
+                        <StackPanel>
+                            <TextBlock Text="Pallet Details" FontWeight="SemiBold" Margin="0,0,0,6"/>
+                            <ui:TextBlock Text="{Binding ViewModel.PalletAnalyzer.OutputText}" FontFamily="Cascadia Code" FontSize="14" TextWrapping="Wrap" Margin="0,10,0,10"/>
+                        </StackPanel>
+                    </Border>
+                    <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Vertical" Margin="0,7,10,7">
+                        <Border BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Margin="0,0,0,6">
+                            <ui:DataGrid AutoGenerateColumns="False"
+                                         CanUserAddRows="False"
+                                         CanUserDeleteRows="False"
+                                         IsReadOnly="True"
+                                         HeadersVisibility="Column"
+                                         ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                         BorderThickness="0">
+                                <ui:DataGrid.Columns>
+                                    <DataGridTextColumn Header="Pallet"/>
+                                    <DataGridTextColumn Header="Times Used"/>
+                                    <DataGridTextColumn Header="# Boxes"/>
+                                    <DataGridTextColumn Header="# Layers"/>
+                                    <DataGridTextColumn Header="Eff"/>
+                                </ui:DataGrid.Columns>
+                            </ui:DataGrid>
+                        </Border>
+                        <Border BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4">
+                            <ui:DataGrid AutoGenerateColumns="False"
+                                         CanUserAddRows="False"
+                                         CanUserDeleteRows="False"
+                                         IsReadOnly="True"
+                                         HeadersVisibility="Column"
+                                         ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                         BorderThickness="0">
+                                <ui:DataGrid.Columns>
+                                    <DataGridTextColumn Header="Layer"/>
+                                    <DataGridTextColumn Header="Times Used"/>
+                                    <DataGridTextColumn Header="Contents"/>
+                                    <DataGridTextColumn Header="Eff"/>
+                                </ui:DataGrid.Columns>
+                            </ui:DataGrid>
+                        </Border>
+                    </StackPanel>
+                    <GridSplitter Grid.Row="1" Grid.RowSpan="2" Grid.Column="0" Width="3" HorizontalAlignment="Right" Height="200"/>
+                    <GridSplitter Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Height="3" VerticalAlignment="Top" HorizontalAlignment="Center" Width="200" ResizeDirection="Rows"/>
+                    <StackPanel Orientation="Vertical" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,7,0,0">
+                        <ui:DataGrid AutoGenerateColumns="False" FontSize="14">
                             <ui:DataGrid.Columns>
-                                <DataGridTextColumn Header="#" Binding="{Binding Name}"/>
-                                <DataGridTextColumn Header="Area Eff" Binding="{Binding Metadata.Utilization}"/>
-                                <DataGridTextColumn Header="H" Binding="{Binding Metadata.Height}"/>
-                                <DataGridTextColumn Header="Items/Layer" Binding="{Binding Items.Count}"/>
+                                <DataGridTextColumn Header="Sol. #" />
+                                <DataGridTextColumn Header="# Pallets" />
+                                <DataGridTextColumn Header="# Pallet Types" />
+                                <DataGridTextColumn Header="Total Items Packed" />
+                                <DataGridTextColumn Header="Eff" />
+                                <DataGridCheckBoxColumn/>
                             </ui:DataGrid.Columns>
                         </ui:DataGrid>
                     </StackPanel>

From 64216d4a1e7f65b63b45488ea114382dc9a1a42b Mon Sep 17 00:00:00 2001
From: VladM7 <mvlad2005@outlook.com>
Date: Sat, 2 May 2026 21:52:14 +0200
Subject: [PATCH 2/2] slight layout change

---
 Views/Pages/PalletBuilderPage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Views/Pages/PalletBuilderPage.xaml b/Views/Pages/PalletBuilderPage.xaml
index a777a7b..9edacc7 100644
--- a/Views/Pages/PalletBuilderPage.xaml
+++ b/Views/Pages/PalletBuilderPage.xaml
@@ -262,13 +262,13 @@
                     <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,5,0,0">
                         <ui:Button Content="Save Report" Icon="{ui:SymbolIcon Save24}" Height="38" IsEnabled="False" />
                     </StackPanel>
-                    <Border Grid.Row="1" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="6" Margin="0,7,10,7">
+                    <Border Grid.Row="2" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Padding="6" Margin="0,7,10,7">
                         <StackPanel>
                             <TextBlock Text="Pallet Details" FontWeight="SemiBold" Margin="0,0,0,6"/>
                             <ui:TextBlock Text="{Binding ViewModel.PalletAnalyzer.OutputText}" FontFamily="Cascadia Code" FontSize="14" TextWrapping="Wrap" Margin="0,10,0,10"/>
                         </StackPanel>
                     </Border>
-                    <StackPanel Grid.Row="2" Grid.Column="0" Orientation="Vertical" Margin="0,7,10,7">
+                    <StackPanel Grid.Row="1" Grid.Column="0" Orientation="Vertical" Margin="0,7,10,7">
                         <Border BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}" BorderThickness="1" CornerRadius="4" Margin="0,0,0,6">
                             <ui:DataGrid AutoGenerateColumns="False"
                                          CanUserAddRows="False"