Просмотр исходного кода

Fixed unnecessary warning message when exiting Data Entry Panel
Moved PurchaseOrderItem Digital Forms Menu to right hand side of screen

frogsoftware 2 лет назад
Родитель
Сommit
f41d872770

+ 6 - 4
prs.desktop/Panels/DataEntry/DataEntryPanel.xaml.cs

@@ -176,9 +176,8 @@ namespace PRSDesktop
         }
 
         private bool EditorChanged = false;
-
-
-        private bool bChanged = true;
+        
+        private bool bChanged = false;
         
         private IDynamicDataGrid UpdateEditor(Type TEntity, BaseObject[]? items)
         {
@@ -197,6 +196,8 @@ namespace PRSDesktop
 
             Editor.OnAfterEditorValueChanged += (sender, column) =>
             {
+                bChanged = true;
+                ScanPanel.ScanGrid.IsEnabled = false;
                 EditorChanged = true;
                 return null;
             };
@@ -209,7 +210,8 @@ namespace PRSDesktop
                 {
                     ClearEditor(TEntity);
                     bChanged = false;
-                    ScanPanel.ScanGrid.IsEnabled = true;                }
+                    ScanPanel.ScanGrid.IsEnabled = true;                
+                }
             };
             Editor.OnCancel += () =>
             {

+ 2 - 2
prs.desktop/Panels/Suppliers/PurchaseOrders/SupplierPurchaseOrderItemOneToMany.cs

@@ -56,7 +56,7 @@ namespace PRSDesktop
 
             HiddenColumns.Add(x => x.FormCount);
             HiddenColumns.Add(x => x.OpenForms);
-            ActionColumns.Add(new DynamicMenuColumn(BuildMenu) { Position = DynamicActionColumnPosition.Start });
+            ActionColumns.Add(new DynamicMenuColumn(BuildFormsMenu) { Position = DynamicActionColumnPosition.End });
             ActionColumns.Add(new DynamicImageColumn(FormsImage) { Position = DynamicActionColumnPosition.Start, ToolTip = FormsToolTip });
         }
 
@@ -109,7 +109,7 @@ namespace PRSDesktop
             });
         }
 
-        private void BuildMenu(DynamicMenuColumn column, CoreRow? row)
+        private void BuildFormsMenu(DynamicMenuColumn column, CoreRow? row)
         {
             if (row == null) return;
             var formsItem = column.AddItem("Digital Forms", PRSDesktop.Resources.kanban, null);