Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Stack-Solver.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
62 changes: 53 additions & 9 deletions Views/Pages/PalletBuilderPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
Expand All @@ -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="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="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"
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>
Expand Down
Loading