Przeglądaj źródła

Merge remote-tracking branch 'origin/kenric' into frank

frogsoftware 1 rok temu
rodzic
commit
cd79e8f5de

+ 1 - 1
prs.desktop/Components/Calendar/Calendar.xaml.cs

@@ -944,7 +944,7 @@ namespace PRSDesktop
                     var table = new CoreTable();
                     table.LoadColumns(typeof(TEntity));
                     var row = table.NewRow();
-                    table.LoadRow(row, entity);
+                    table.FillRow(row, entity);
                     var model = (Activator.CreateInstance(typeof(TModel),row) as TModel)!;
                     collection.Add(model);
                     refresh(model);

+ 2 - 6
prs.desktop/Forms/DeliveryBuilderGrid.cs

@@ -93,9 +93,7 @@ namespace PRSDesktop
                         item.JobLink.ID = dataRow.Get<PurchaseOrderItem, Guid>(c => c.Packet.SetoutLink.JobLink.ID);
                         item.Type = DeliveryItemType.TreatmentItem;
                         new Client<DeliveryItem>().Save(item, "Scanned By DeliveryBuilder");
-                        var newrow = DeliveryItems.NewRow();
-                        DeliveryItems.LoadRow(newrow, item);
-                        DeliveryItems.Rows.Add(newrow);
+                        DeliveryItems.LoadRow(item);
                     }
                     else
                     {
@@ -147,9 +145,7 @@ namespace PRSDesktop
                 item.JobLink.ID = ordrow.Get<PurchaseOrderItem, Guid>(c => c.Packet.SetoutLink.JobLink.ID);
                 item.Type = DeliveryItemType.TreatmentItem;
                 new Client<DeliveryItem>().Save(item, "Scanned By DeliveryBuilder");
-                var newrow = DeliveryItems.NewRow();
-                DeliveryItems.LoadRow(newrow, item);
-                DeliveryItems.Rows.Add(newrow);
+                DeliveryItems.LoadRow(item);
                 return true;
             }
             else

+ 1 - 3
prs.desktop/Forms/EmailInterfaceForm.xaml.cs

@@ -180,9 +180,7 @@ namespace PRSDesktop
                                 intf.Date = message.Date;
                                 intf.Customer.ID = Guid.Empty; // validemails[email];
                                 intf.Subject = subject;
-                                var row = result.NewRow();
-                                result.LoadRow(row, intf);
-                                result.Rows.Add(row);
+                                result.LoadRow(intf);
                             }
                         }
                 }

+ 2 - 2
prs.desktop/Panels/Factory/FactoryPanel.xaml.cs

@@ -1797,7 +1797,7 @@ namespace PRSDesktop
                     {
                         var pktrow = Packets.Rows.FirstOrDefault(r => r.Get<ManufacturingPacket, Guid>(c => c.ID).Equals(update.Parent.ID));
                         var stagerow = Stages.Rows.FirstOrDefault(r => r.Get<ManufacturingPacketStage, Guid>(x => x.ID).Equals(update.ID));
-                        Stages.LoadRow(stagerow, update);
+                        Stages.FillRow(stagerow, update);
                         var kanban = Kanbans.FirstOrDefault(x => x.ID.Equals(update.Parent.ID.ToString()));
                         LoadModel(kanban, pktrow, stagerow, true);
                     }
@@ -1827,7 +1827,7 @@ namespace PRSDesktop
                     {
                         var pktrow = Packets.Rows.FirstOrDefault(r => r.Get<ManufacturingPacket, Guid>(c => c.ID).Equals(update.Parent.ID));
                         var stagerow = Stages.Rows.FirstOrDefault(r => r.Get<ManufacturingPacketStage, Guid>(x => x.ID).Equals(update.ID));
-                        Stages.LoadRow(stagerow, update);
+                        Stages.FillRow(stagerow, update);
                         var kanban = Kanbans.FirstOrDefault(x => x.ID.Equals(update.Parent.ID.ToString()));
                         LoadModel(kanban, pktrow, stagerow, true);
                     }

+ 1 - 3
prs.desktop/Panels/Jobs/Stages/JobStagesPanel.xaml.cs

@@ -623,9 +623,7 @@ namespace PRSDesktop
                         : GanttRelationshipType.StartToStart;
             new Client<JobStageRelationship>().Save(relationship, "", (o, e) =>
             {
-                var row = _relationships.NewRow();
-                _relationships.LoadRow(row, relationship);
-                _relationships.Rows.Add(row);
+                _relationships.LoadRow(relationship);
             });
         }
 

+ 2 - 2
prs.desktop/Panels/Meeting/MeetingPanel.xaml.cs

@@ -153,7 +153,7 @@ public partial class MeetingPanel : UserControl, IPanel<Meeting>
             if (MeetingGrid.SelectedRows.Any())
             {
                 var row = MeetingGrid.SelectedRows[0];
-                MeetingGrid.Data.LoadRow(row, meeting);
+                MeetingGrid.Data.FillRow(row, meeting);
                 MeetingGrid.InvalidateRow(row);
             }
 
@@ -207,7 +207,7 @@ public partial class MeetingPanel : UserControl, IPanel<Meeting>
             Client.Save(meetingitem, "");
 
             var row = MeetingItems.Data.Rows.FirstOrDefault(r => r.Get<MeetingItem, Guid>(c => c.ID) == meetingitem.ID);
-            MeetingItems.Data.LoadRow(row, meetingitem);
+            MeetingItems.Data.FillRow(row, meetingitem);
             MeetingItems.InvalidateRow(row);
         }
         return new Dictionary<string, object?>();

+ 1 - 4
prs.desktop/Panels/Security/Global/GlobalTokenGrid.cs

@@ -279,10 +279,7 @@ namespace PRSDesktop
                             };
 
                             _descriptors.Add(_descriptor);
-                            var row = _table.NewRow();
-                            _table.LoadRow(row, _descriptor);
-                            _table.Rows.Add(row);
-
+                            _table.LoadRow(_descriptor);
                         }
                     }
                     

+ 3 - 5
prs.desktop/Panels/Tasks/TaskPlannerControl.xaml.cs

@@ -433,9 +433,7 @@ namespace PRSDesktop
                         : GanttRelationshipType.StartToStart;
             new Client<KanbanRelationship>().Save(relationship, "", (o, e) =>
             {
-                var row = _relationships.NewRow();
-                _relationships.LoadRow(row, relationship);
-                _relationships.Rows.Add(row);
+                _relationships.LoadRow(relationship);
             });
         }
 
@@ -490,7 +488,7 @@ namespace PRSDesktop
                 var bOK = new TaskGrid().EditItems(new[] { kanban });
                 if (bOK)
                 {
-                    _kanbans.LoadRow(row, kanban);
+                    _kanbans.FillRow(row, kanban);
                     LoadTask(row, task);
                 }
             }
@@ -505,7 +503,7 @@ namespace PRSDesktop
             if (bOK)
             {
                 var row = _kanbans.NewRow();
-                _kanbans.LoadRow(row, kanban);
+                _kanbans.FillRow(row, kanban);
                 var task = new GanttTask();
                 LoadTask(row, task);
                 _tasks.Add(task);

+ 1 - 3
prs.server/Forms/ServerGrid.cs

@@ -327,9 +327,7 @@ public class ServerGrid : DynamicGrid<Server>
         {
             var server = section.Value.CreateServer(section.Key);
             var service = _services.FirstOrDefault(x => string.Equals(x.ServiceName, section.Key));
-            var row = table.NewRow();
-            table.LoadRow(row, server);
-            table.Rows.Add(row);
+            table.LoadRow(server);
         }
         
         action(table, null);