Fixed StagingPanel & Standard Leave Grid

prs.desktop/Panels/Staging/Manufacturing/ManufacturingPacketApprovalControl.xaml.cs

@@ -55,7 +55,8 @@ namespace PRSDesktop
 
         private void PacketGrid_OnSelectItem(object sender, InABox.DynamicGrid.DynamicGridSelectionEventArgs e)
         {
-            componentsGrid.StagingPacket = packetGrid.SelectedRows.FirstOrDefault().ToObject<StagingManufacturingPacket>();
+            if ( packetGrid.SelectedRows.Any())
+                componentsGrid.StagingPacket = packetGrid.SelectedRows.First().ToObject<StagingManufacturingPacket>();
         }
 
         private void CreatePacketButton_Click(object sender, RoutedEventArgs e)

prs.desktop/Panels/Staging/Manufacturing/StagingManufacturingPacketGrid.cs

@@ -10,7 +10,7 @@ namespace PRSDesktop.Panels.Staging
 {
     public class StagingManufacturingPacketGrid : DynamicDataGrid<StagingManufacturingPacket>
     {
-        private StagingSetout stagingsetout;
+        private StagingSetout stagingsetout = new StagingSetout();
 
         public StagingSetout StagingSetout
         {

prs.desktop/Panels/Staging/StagingPanel.xaml

@@ -8,51 +8,57 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 
-    <dynamicgrid:DynamicSplitPanel x:Name="mainPanel" View="Combined" MasterCaption="Setouts Folder" AnchorWidth="500">
+    <dynamicgrid:DynamicSplitPanel x:Name="mainPanel" View="Combined" AllowableViews="Combined,Detail" MasterCaption="Staged Documents" AnchorWidth="500" Anchor="Master">
 
+        <dynamicgrid:DynamicSplitPanel.Header>
+            <Border BorderBrush="Gray" BorderThickness="0.75">
+                <Label Content="Staged Documents"  FontWeight="DemiBold" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" />
+            </Border>
+        </dynamicgrid:DynamicSplitPanel.Header>
+        
         <dynamicgrid:DynamicSplitPanel.Master>
             <Grid x:Name="masterGrid">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="2*"/>
-                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="0"/>
                 </Grid.RowDefinitions>
-                <local:StagingSetoutGrid Grid.Row="0" x:Name="stagingSetoutGrid" Margin="2.5"/>
-                <local:StagingMaterialListGrid Grid.Row="1" x:Name="stagingMaterialListGrid" Margin="2.5"/>
+                <local:StagingSetoutGrid Grid.Row="0" x:Name="stagingSetoutGrid"/>
+                <local:StagingMaterialListGrid Grid.Row="1" x:Name="stagingMaterialListGrid"/>
             </Grid>
         </dynamicgrid:DynamicSplitPanel.Master>
-            
+        
         <dynamicgrid:DynamicSplitPanel.Detail>
-            <dynamicgrid:DynamicSplitPanel x:Name="nestedPanel" View="Combined" AnchorWidth="1000" MasterCaption="PDF">
+        
+            <dynamicgrid:DynamicSplitPanel x:Name="nestedPanel" View="Master" AllowableViews="Master,Combined" AnchorWidth="500" Anchor="Detail" MasterCaption="Document Viewer" DetailCaption="Manufacturing Packets">
+                
+                <dynamicgrid:DynamicSplitPanel.Header>
+                    <Border BorderBrush="Gray" BorderThickness="0.75">
+                        <Label Content="Document Viewer" HorizontalAlignment="Center" FontWeight="DemiBold" VerticalContentAlignment="Center"/>
+                    </Border>
+                </dynamicgrid:DynamicSplitPanel.Header>
+                
                 <dynamicgrid:DynamicSplitPanel.Master>
-                    <Border Grid.Row="0" BorderBrush="Gray" BorderThickness="0.5">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Border Grid.Row="0" BorderBrush="Gray" BorderThickness="0.5">
-                                <Label Content="Document Viewer" HorizontalAlignment="Center" FontWeight="DemiBold"/>
-                            </Border>
-                            <wpf:DocumentApprovalControl x:Name="documentPreviewer" Width="1000" Grid.Row="1"/>
-                        </Grid>
+                    <Border BorderBrush="Gray" BorderThickness="0.75">
+                        <wpf:DocumentApprovalControl x:Name="documentPreviewer" />
                     </Border>
                 </dynamicgrid:DynamicSplitPanel.Master>
-
+                
+                <dynamicgrid:DynamicSplitPanel.DetailHeader>
+                    <Border BorderBrush="Gray" BorderThickness="0.75">
+                        <Label Content="Manufacturing Packets" HorizontalAlignment="Center" FontWeight="DemiBold" VerticalContentAlignment="Center"/>
+                    </Border>
+                </dynamicgrid:DynamicSplitPanel.DetailHeader>
+                
                 <dynamicgrid:DynamicSplitPanel.Detail>
-                    <Border BorderBrush="Gray" BorderThickness="0.5">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="auto"/>
-                                <RowDefinition Height="*"/>
-                            </Grid.RowDefinitions>
-                            <Label Grid.Row="0" Content="Manufacturing Packets" FontWeight="DemiBold" HorizontalAlignment="Center" Visibility="Hidden"/>
-                            <local:ManufacturingPacketApprovalControl Grid.Row="1" x:Name="manufacturingControl" Visibility="Hidden"/>
-                        </Grid>
+                    <Border BorderBrush="Gray" BorderThickness="0.75">
+                        <local:ManufacturingPacketApprovalControl x:Name="manufacturingControl" Visibility="Hidden"/>
                     </Border>
                 </dynamicgrid:DynamicSplitPanel.Detail>
 
             </dynamicgrid:DynamicSplitPanel>
+            
         </dynamicgrid:DynamicSplitPanel.Detail>
+        
     </dynamicgrid:DynamicSplitPanel>
 
 </UserControl>

prs.desktop/Panels/Timesheets/TimeSheetStandardLeaveGrid.cs

@@ -11,12 +11,11 @@ using PRS.Shared;
 
 namespace PRSDesktop
 {
-    public class TimeSheetStandardLeaveGrid : DynamicDataGrid<StandardLeave>
+    public class TimeSheetStandardLeaveGrid : DynamicDataGrid<StandardLeave>, ISpecificGrid
     {
         public DateTime From { get; set; }
         public DateTime To { get; set; }
         
-
         public TimeSheetStandardLeaveGrid() : base()
         {
             ColumnsTag = "TimeSheetStandardLeave";

prs.desktop/prsdesktop.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Desktop"
-#define MyAppVersion "7.29"
+#define MyAppVersion "7.31"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSDesktop.exe"

prs.server/PRSServer.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Server"
-#define MyAppVersion "7.29"
+#define MyAppVersion "7.31"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSServer.exe"