Преглед изворни кода

Fixed an error with ExcelFileReader
Fixed a problem with invalid format strings in grids

frogsoftware пре 1 година
родитељ
комит
7acbc41bb3

+ 1 - 1
inabox.scripting/FileReader/ExcelFileReader.cs

@@ -109,7 +109,7 @@ namespace InABox.Scripting
         {
             if (!EndOfData)
             {
-                EndOfData = rows.MoveNext();
+                EndOfData = !rows.MoveNext();
                 if (!EndOfData)
                 {
                     _row = rows.Current;

+ 12 - 5
inabox.wpf/DynamicGrid/Columns/EditorColumns/DynamicGridNumericColumn.cs

@@ -27,11 +27,18 @@ public abstract class DynamicGridNumericColumn<TEntity, TEditor, TColumn> : Dyna
         int digits = editor.Digits;
         if (!string.IsNullOrWhiteSpace(Definition?.Format))
         {
-            var formatted = 0.ToString(Definition.Format);
-            var separator = formatted.IndexOf(".", StringComparison.InvariantCulture);
-            digits = separator == -1
-                ? 0
-                : formatted.Length - (separator + 1);
+            try
+            {
+                var formatted = 0.ToString(Definition.Format);
+                var separator = formatted.IndexOf(".", StringComparison.InvariantCulture);
+                digits = separator == -1
+                    ? 0
+                    : formatted.Length - (separator + 1);
+            }
+            catch (Exception e)
+            {
+                Logger.Send(LogType.Error,"","{0} is not a valid format specifier",Definition.Format);
+            }
         }
         return digits;
     }

+ 3 - 3
inabox.wpf/DynamicGrid/DynamicTreeView.cs

@@ -166,9 +166,9 @@ namespace InABox.DynamicGrid
             ExpandMode = DynamicTreeGridExpandMode.All;
 
             _menu = new ContextMenu();
-            var additem = new MenuItem() { Header = "Add Child Folder" };
-            additem.Click += (o, e) => { DoAddItem((_tree.SelectedItem as CoreTreeNode)!.ID, true); };
-            _menu.Items.Add(additem);
+            //var additem = new MenuItem() { Header = "Add Child Folder" };
+            //additem.Click += (o, e) => { DoAddItem((_tree.SelectedItem as CoreTreeNode)!.ID, true); };
+            //_menu.Items.Add(additem);
 
             _tree.ContextMenuOpening += _tree_ContextMenuOpening;
             _tree.ContextMenu = _menu;