Fixed Digital Forms Icons and Renamed Forms to Forms Dashboard

Improved Delivery Rack and Requi List handling

prs.desktop/MainWindow.xaml

@@ -753,10 +753,10 @@
                                    Click="DailyReport_Checked" MinWidth="60" />
                     <syncfusion:RibbonSeparator x:Name="DigitalFormsTaskSeparator" />
                     <fluent:Button x:Name="DigitalFormsFormsLibraryButton" Header="Forms Library"
-                                   LargeIcon="pack://application:,,,/Resources/checklist.png"
+                                   LargeIcon="pack://application:,,,/Resources/formslibrary.png"
                                    Click="DigitalFormsFormsLibraryButton_Click" MinWidth="60" />
-                    <fluent:Button x:Name="DigitalFormsCompletedFormsButton" Header="Forms"
-                                   LargeIcon="pack://application:,,,/Resources/checklist.png"
+                    <fluent:Button x:Name="DigitalFormsCompletedFormsButton" Header="Forms Dashboard"
+                                   LargeIcon="pack://application:,,,/Resources/forminstance.png"
                                    Click="DigitalFormsCompletedFormsButton_Click" MinWidth="60" />
                 </fluent:RibbonGroupBox>
 

prs.desktop/PRSDesktop.csproj

@@ -748,6 +748,14 @@
         <Resource Include="Resources\post.png">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Resource>
+        <None Remove="Resources\formslibrary.png" />
+        <Resource Include="Resources\formslibrary.png">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Resource>
+        <None Remove="Resources\forminstance.png" />
+        <Resource Include="Resources\forminstance.png">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Resource>
     </ItemGroup>
 
     <ItemGroup>

prs.desktop/Panels/Delivery/DeliveryRackList.cs

@@ -119,7 +119,9 @@ internal class DeliveryRackList : DynamicDataGrid<Shipment>, IMasterDetailContro
         foreach (var row in rows)
         {
             var rackid = row.Get<Shipment, Guid>(x => x.ID);
-            items = new Client<DeliveryItem>().Load(new Filter<DeliveryItem>(x => x.ShipmentLink.ID).IsEqualTo(rackid));
+            items = new Client<DeliveryItem>().Query(
+                new Filter<DeliveryItem>(x => x.ShipmentLink.ID).IsEqualTo(rackid),
+                new Columns<DeliveryItem>(x => x.Delivery.ID).Add(x => x.ID)).ToArray<DeliveryItem>();
             var shipment = new Client<Shipment>().Load(new Filter<Shipment>(x => x.ID).IsEqualTo(rackid)).FirstOrDefault();
             if (shipment != null)
             {

prs.desktop/Panels/Delivery/DeliveryRequiList.cs

@@ -75,7 +75,11 @@ namespace PRSDesktop
                     requi.Delivery.ID = Master.ID;
                 }
 
-                var items = new Client<DeliveryItem>().Load(filter);
+                var items = new Client<DeliveryItem>().Query(
+                    filter,
+                    new Columns<DeliveryItem>(x => x.Delivery.ID).Add(x => x.ID)
+                ).ToArray<DeliveryItem>();
+                
                 foreach (var item in items)
                 {
                     item.Delivery.ID = Master.ID;
@@ -112,7 +116,10 @@ namespace PRSDesktop
             foreach (var row in rows)
             {
                 var reqid = row.Get<Requisition, Guid>(x => x.ID);
-                items = new Client<DeliveryItem>().Load(new Filter<DeliveryItem>(x => x.RequisitionLink.ID).IsEqualTo(reqid));
+                items = new Client<DeliveryItem>().Query(
+                    new Filter<DeliveryItem>(x => x.RequisitionLink.ID).IsEqualTo(reqid),
+                    new Columns<DeliveryItem>(x => x.Delivery.ID).Add(x => x.ID)
+                ).ToArray<DeliveryItem>();
                 var requisition = new Client<Requisition>().Load(new Filter<Requisition>(x => x.ID).IsEqualTo(reqid)).FirstOrDefault();
                 if (requisition != null)
                 {

prs.desktop/prsdesktop.iss

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

prs.licensing/PRSLicensing.iss

@@ -5,7 +5,7 @@
 #pragma verboselevel 9
 
 #define MyAppName "PRS Licensing"
-#define MyAppVersion "7.65a"
+#define MyAppVersion "7.65b"
 #define MyAppPublisher "PRS Digital"
 #define MyAppURL "https://www.prs-software.com.au"
 #define MyAppExeName "PRSLicensing.exe"

prs.server/PRSServer.iss

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

prs.stores/RequisitionItemStore.cs

@@ -9,6 +9,9 @@ namespace Comal.Stores
     {
         private void UpdateTrackingKanban(RequisitionItem entity)
         {
+            if (entity.RequisitionLink.ID == Guid.Empty)
+                return;
+            
             var requi = new Requisition
                 { ID = entity.RequisitionLink.ID, Filled = entity.RequisitionLink.Filled, Archived = entity.RequisitionLink.Archived };