فهرست منبع

Fixed Logikal Import "Create Gaskets", "Create Glass" and "Create Labour" functionality
Fixed "Distribute" button on Design Management Panel
Setout Drawing name now reflect the name of Logikal Elevation it comes from

frogsoftware 5 روز پیش
والد
کامیت
c507a7f62b

+ 6 - 6
prs.desktop/Integrations/Common/AWGMappingWindowViewModel.cs

@@ -1126,12 +1126,12 @@ public class AWGMappingWindowViewModel : DependencyObject
         }
     );
 
-    private void PopulateGasket(Product argsEntity, ProductIntegrationSource argsMapping)
+    private void PopulateGasket(Product argsEntity, ProductIntegrationSource mapping)
     {
-        argsEntity.Code = argsMapping.Entity.Code ?? "";
-        argsEntity.Name = argsMapping.Description ?? "";
+        argsEntity.Code = mapping.Code ?? "";
+        argsEntity.Name = mapping.Description ?? "";
         argsEntity.UnitOfMeasure.ID = _settings.GasketUom.ID;
-        var _group = GroupMappings?.FirstOrDefault(x => Equals(x.Code, argsMapping.Group));
+        var _group = GroupMappings?.FirstOrDefault(x => Equals(x.Code, mapping.Group));
         if (_group != null)
             argsEntity.Group.ID = _group.Entity.ID;
     }
@@ -1170,7 +1170,7 @@ public class AWGMappingWindowViewModel : DependencyObject
 
     private void PopulateGlass(Product entity, ProductIntegrationSource mapping)
     {
-        entity.Code = mapping.Entity.Code ?? "";
+        entity.Code = mapping.Code ?? "";
         entity.Name = mapping.Description ?? "";
         entity.UnitOfMeasure.ID = _settings.GlassUom.ID;
         var _group = GroupMappings?.FirstOrDefault(x => Equals(x.Code, mapping.Group));
@@ -1192,7 +1192,7 @@ public class AWGMappingWindowViewModel : DependencyObject
 
     private void PopulateActivity(Activity entity, ActivityIntegrationSource mapping)
     {
-        entity.Code = mapping.Entity.Code ?? "";
+        entity.Code = mapping.Code ?? "";
         entity.Description = mapping.Description ?? "";
     }
 

+ 1 - 1
prs.desktop/Panels/Staging/Setouts/StagingSetoutGrid.cs

@@ -1011,7 +1011,7 @@ public class StagingSetoutGrid : DynamicDataGrid<Setout>
                             var doc = new Document();
                             doc.Data = elevation.Drawing;
                             
-                            doc.FileName = $"{elevation.ID}.pdf";
+                            doc.FileName = $"{elevation.Name ?? "unnamed"}.pdf";
                             doc.CRC = CoreUtils.CalculateCRC(doc.Data);
                             Client.Save(doc, "Imported From Logikal");
 

+ 1 - 0
prs.desktop/Panels/Staging/StagingPanel.xaml.cs

@@ -1166,6 +1166,7 @@ public partial class StagingPanel : UserControl, IPanel<Setout>
                     if (packet != null)
                     {
                         component.Packet.ID = packet.ID;
+                        updates.Add(component);
                     }
                 }
             }