Ver Fonte

Added also editor columns to columns for staging, hoping that this allows for the direct edit of stagingtreatment.

Kenric Nugteren há 1 ano atrás
pai
commit
fe638c1ebf

+ 1 - 0
prs.desktop/Configuration/DataBaseConfiguration.xaml.cs

@@ -554,6 +554,7 @@ namespace PRSDesktop
             }
             catch (Exception err)
             {
+                Logger.Send(LogType.Error, "", $"No server found: {CoreUtils.FormatException(err)}");
                 Progress.Close();
                 MessageBox.Show("No Server Found!");
             }

+ 1 - 1
prs.desktop/Configuration/ManufacturingTemplateGrid.cs

@@ -33,7 +33,7 @@ namespace PRSDesktop
             base.Reload(criteria, columns, ref sort, action);
         }
 
-        protected override Dictionary<string, object> EditorValueChanged(IDynamicEditorForm editor, ManufacturingTemplate[] items, string name,
+        protected override Dictionary<string, object?> EditorValueChanged(IDynamicEditorForm editor, ManufacturingTemplate[] items, string name,
             object value)
         {
             var result = base.EditorValueChanged(editor, items, name, value);

+ 1 - 1
prs.desktop/Panels/Requisitions/RequisitionPanel.xaml.cs

@@ -38,7 +38,7 @@ namespace PRSDesktop
         //DateTime lastselection = DateTime.MaxValue;
         //DispatcherTimer timer = new DispatcherTimer();
 
-        public event DataModelUpdateEvent OnUpdateDataModel;
+        public event DataModelUpdateEvent? OnUpdateDataModel;
 
         public bool IsReady { get; set; }
 

+ 3 - 3
prs.desktop/Panels/Staging/Manufacturing/StagingManufacturingPacketListItem.xaml.cs

@@ -158,21 +158,21 @@ namespace PRSDesktop
 
             yield return new KeyedQueryDef<StagingManufacturingPacketStage>(
                 new Filter<StagingManufacturingPacketStage>(x => x.Packet.ID).InQuery(packetFilter, x => x.ID),
-                stageColumnsGrid.DataColumns());
+                DynamicGridUtils.LoadEditorColumns(stageColumnsGrid.DataColumns()));
 
             componentColumnsGrid ??= new StagingManufacturingPacketComponentGrid();
             componentColumnsGrid.Refresh(true, false);
 
             yield return new KeyedQueryDef<StagingManufacturingPacketComponent>(
                 new Filter<StagingManufacturingPacketComponent>(x => x.Packet.ID).InQuery(packetFilter, x => x.ID),
-                componentColumnsGrid.DataColumns());
+                DynamicGridUtils.LoadEditorColumns(componentColumnsGrid.DataColumns()));
 
             treatmentColumnsGrid ??= new StagingManufacturingPacketTreatmentGrid();
             treatmentColumnsGrid.Refresh(true, false);
 
             yield return new KeyedQueryDef<StagingManufacturingPacketTreatment>(
                 new Filter<StagingManufacturingPacketTreatment>(x => x.Packet.ID).InQuery(packetFilter, x => x.ID),
-                treatmentColumnsGrid.DataColumns());
+                DynamicGridUtils.LoadEditorColumns(treatmentColumnsGrid.DataColumns()));
         }
 
         private void EditButton_Click(object sender, RoutedEventArgs e)

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

@@ -1,5 +1,4 @@
 using Comal.Classes;
-using Comal.Classes;
 using InABox.Core;
 using System;
 using System.Collections.Generic;
@@ -16,8 +15,6 @@ using System.ComponentModel;
 using InABox.Scripting;
 using System.Reflection;
 using System.Collections.Immutable;
-using FastReport.Data;
-using Microsoft.Xaml.Behaviors.Core;
 using StagingManufacturingPacketComponent = Comal.Classes.StagingManufacturingPacketComponent;
 using System.Threading.Tasks;