Added OnCreateItem to LookupDefinition

InABox.Core/Editors/CodePopupEditor.cs

@@ -10,6 +10,8 @@ namespace InABox.Core
 
         public string CodeColumn { get; set; }
 
+        public bool CanAdd { get; set; } = false;
+
         protected override BaseEditor DoClone()
         {
             var result = (CloneDataLookupEditor() as CodePopupEditor)!;

InABox.Core/ILookupDefinition.cs

@@ -45,6 +45,8 @@ namespace InABox.Core
 
     public interface IChildEntityLookup<TParent, TChild, TGenerator>
         where TGenerator : LookupDefinitionGenerator<TChild, TParent>
+        where TParent : class
+        where TChild : class
     { }
 
     public class LookupDefinitionAttribute : Attribute
@@ -66,9 +68,12 @@ namespace InABox.Core
         public IColumns DefineColumns();
         public IFilter? DefineFilter(BaseObject[] items);
         public IColumns DefineFilterColumns();
+        public void OnCreateItem(BaseObject[] parent, BaseObject lookup);
     }
 
     public abstract class LookupDefinitionGenerator<TLookup, TEntity> : ILookupDefinitionGenerator
+        where TEntity: class
+        where TLookup: class
     {
         public virtual Columns<TLookup> DefineColumns() => new Columns<TLookup>();
 
@@ -80,6 +85,17 @@ namespace InABox.Core
         /// <returns></returns>
         public virtual Columns<TEntity> DefineFilterColumns() => new Columns<TEntity>();
 
+        /// <summary>
+        /// Customise an item created by a lookup editor.
+        /// </summary>
+        /// <param name="parent"></param>
+        /// <param name="lookup"></param>
+        public virtual void OnCreateItem(TEntity[] parent, TLookup lookup)
+        {
+        }
+
+        void ILookupDefinitionGenerator.OnCreateItem(BaseObject[] parents, BaseObject lookup) => OnCreateItem(parents as TEntity[], lookup as TLookup);
+
         IColumns ILookupDefinitionGenerator.DefineColumns() => DefineColumns();
 
         IFilter? ILookupDefinitionGenerator.DefineFilter(BaseObject[] items) => DefineFilter(items as TEntity[]);
@@ -98,11 +114,15 @@ namespace InABox.Core
         public static void RegisterLookupGenerator<TEntity, TLookup, TLookupLink, TGenerator>(Expression<Func<TEntity, TLookupLink>> expression)
             where TGenerator : LookupDefinitionGenerator<TLookup, TEntity>
             where TLookupLink : IEntityLink<TLookup>
+            where TLookup: class
+            where TEntity: class
         {
             _lookupGenerators.TryAdd(DatabaseSchema.Property(typeof(TEntity), CoreUtils.GetFullPropertyName(expression, ".") + ".ID")!.Parent!, typeof(TGenerator));
         }
         public static void RegisterChildGenerator<TParent, TChild, TGenerator>()
             where TGenerator : LookupDefinitionGenerator<TChild, TParent>
+            where TChild: class
+            where TParent: class
         {
             _childGenerators.TryAdd(new Tuple<Type, Type>(typeof(TParent), typeof(TChild)), typeof(TGenerator));
         }
@@ -398,6 +418,12 @@ namespace InABox.Core
             return GetDefinition(T)?.DefineSortOrder();
         }
 
+        public static void OnCreateItem(Type TEntity, string column, BaseObject[] items, BaseObject item)
+        {
+            var generator = GetLookupGenerator(TEntity, column);
+            generator?.OnCreateItem(items, item);
+        }
+
         #endregion
 
         #region Generic Wrappers
@@ -438,6 +464,12 @@ namespace InABox.Core
 
         public static string FormatLookup<T>(Dictionary<string, object?> values, IEnumerable<string> exclude) => FormatLookup(typeof(T), values, exclude);
 
+        public static void OnCreateItem<TEntity, TLookup, TLookupLink>(Expression<Func<TEntity, TLookupLink>> column, TEntity[] items, TLookup item)
+            where TLookupLink : IEntityLink<TLookup>
+            where TEntity : BaseObject
+            where TLookup : BaseObject
+            => OnCreateItem(typeof(TEntity), CoreUtils.GetFullPropertyName(column, "."), items, item);
+
         #endregion
     }
 

inabox.wpf/DynamicGrid/DynamicGridCommon.cs

@@ -36,7 +36,7 @@ namespace InABox.DynamicGrid
 
     public delegate bool OnFilterRecord(CoreRow row);
 
-    public delegate void OnCreateItem(object sender, object item);
+    public delegate void OnCreateItem(object sender, BaseObject item);
 
     public delegate T OnCreateItem<T>();
 

inabox.wpf/DynamicGrid/Editors/CodePopupEditor/CodePopupEditorControl.cs

@@ -13,7 +13,6 @@ namespace InABox.DynamicGrid;
 
 public class CodePopupEditorControl : DynamicEditorControl<Guid, CodePopupEditor>, IPopupEditorControl
 {
-    
     static CodePopupEditorControl()
     {
         //DynamicEditorControlFactory.Register<CodePopupEditorControl, CodePopupEditor>();
@@ -192,6 +191,22 @@ public class CodePopupEditorControl : DynamicEditorControl<Guid, CodePopupEditor
 
             list.OnDefineFilter += t => LookupFactory.DefineLookupFilter(Host.GetEditorType(), t, ColumnName, Host.GetItems());
 
+            list.OnCustomiseGrid += grid =>
+            {
+                if (EditorDefinition.CanAdd)
+                {
+                    grid.OnReconfigure += options =>
+                    {
+                        options.AddRange(DynamicGridOption.AddRows, DynamicGridOption.EditRows);
+                    };
+                    grid.OnCreateItem += (_, item) =>
+                    {
+                        LookupFactory.OnCreateItem(Host.GetEditorType(), ColumnName, Host.GetItems(), item);
+                    };
+                    grid.Reconfigure();
+                }
+            };
+
             if (list.ShowDialog() == true)
             {
                 result = true;

inabox.wpf/DynamicGrid/Editors/PopupEditor/PopupList.xaml.cs

@@ -7,156 +7,161 @@ using System.Windows.Input;
 using InABox.Core;
 using InABox.Wpf;
 
-namespace InABox.DynamicGrid
+namespace InABox.DynamicGrid;
+
+public partial class PopupList : ThemableWindow
 {
-    public partial class PopupList : ThemableWindow
+    public delegate void CustomiseGridEvent(IDynamicGrid grid);
+    public event CustomiseGridEvent? OnCustomiseGrid;
+
+    private readonly Dictionary<string, string>? _filters;
+
+    private IDynamicGrid _grid;
+    private readonly string[] _othercolumns = Array.Empty<string>();
+
+    private readonly Type _type;
+    private readonly Type? _gridType;
+
+    public PopupList(Type type, Guid id, string[] OtherColumns, Dictionary<string, string>? Filters = null, Type? gridType = null)
     {
-        private readonly Dictionary<string, string>? _filters;
+        InitializeComponent();
 
-        private IDynamicGrid _grid;
-        private readonly string[] _othercolumns = Array.Empty<string>();
+        OtherValues = new Dictionary<string, object?>();
 
-        private readonly Type _type;
-        private readonly Type? _gridType;
+        _filters = Filters;
+        _othercolumns = OtherColumns;
+        _type = type;
+        _gridType = gridType;
 
-        public PopupList(Type type, Guid id, string[] OtherColumns, Dictionary<string, string>? Filters = null, Type? gridType = null)
-        {
-            InitializeComponent();
+        ID = id;
 
-            OtherValues = new Dictionary<string, object?>();
+        SourceInitialized += PopupList_SourceInitialized;
+    }
 
-            _filters = Filters;
-            _othercolumns = OtherColumns;
-            _type = type;
-            _gridType = gridType;
+    public Guid ID { get; set; }
 
-            ID = id;
+    public Dictionary<string, object?> OtherValues { get; }
 
-            SourceInitialized += PopupList_SourceInitialized;
+    public string AsLookup()
+    {
+        var result = new List<object>();
+        foreach (var key in OtherValues.Keys.ToArray())
+        {
+            var comps = key.Split(new[] { "->" }, StringSplitOptions.None);
+            result.Add(_grid.SelectedRows.First().Get<object>(comps.First()));
         }
 
-        public Guid ID { get; set; }
+        return string.Join(" / ", result.Where(x => x != null && !string.IsNullOrWhiteSpace(x.ToString())));
+    }
 
-        public Dictionary<string, object?> OtherValues { get; }
+    public event OnDefineFilter? OnDefineFilter;
 
-        public string AsLookup()
+    private void PopupList_SourceInitialized(object? sender, EventArgs e)
+    {
+        //_grid = DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), _type);
+        _grid = (Activator.CreateInstance(_gridType ?? typeof(DynamicDataGrid<>).MakeGenericType(_type)) as IDynamicGrid)!;
+        _grid.Margin = new Thickness(5, 5, 5, 0);
+        ((DependencyObject)_grid).SetValue(Grid.ColumnProperty, 0);
+        ((DependencyObject)_grid).SetValue(Grid.ColumnSpanProperty, 3);
+        ((DependencyObject)_grid).SetValue(Grid.RowProperty, 0);
+
+        //_grid.AddHiddenColumn("AsLookup");
+        foreach (var column in _othercolumns)
         {
-            var result = new List<object>();
-            foreach (var key in OtherValues.Keys.ToArray())
-            {
-                var comps = key.Split(new[] { "->" }, StringSplitOptions.None);
-                result.Add(_grid.SelectedRows.First().Get<object>(comps.First()));
-            }
-
-            return string.Join(" / ", result.Where(x => x != null && !string.IsNullOrWhiteSpace(x.ToString())));
+            var comps = column.Split(new[] { "->" }, StringSplitOptions.None);
+            _grid.AddHiddenColumn(comps.First());
+            OtherValues[column] = null;
         }
 
-        public event OnDefineFilter? OnDefineFilter;
+        layoutGrid.Children.Add((UIElement)_grid);
+        
+        _grid.Reconfigure(options =>
+        {
+            options.Clear().AddRange(
+                DynamicGridOption.SelectColumns,
+                DynamicGridOption.FilterRows
+            );
+        });
 
-        private void PopupList_SourceInitialized(object? sender, EventArgs e)
+        if(_grid is IDynamicDataGrid dataGrid)
         {
-            //_grid = DynamicGridUtils.CreateDynamicGrid(typeof(DynamicDataGrid<>), _type);
-            _grid = (Activator.CreateInstance(_gridType ?? typeof(DynamicDataGrid<>).MakeGenericType(_type)) as IDynamicGrid)!;
-            _grid.Margin = new Thickness(5, 5, 5, 0);
-            ((DependencyObject)_grid).SetValue(Grid.ColumnProperty, 0);
-            ((DependencyObject)_grid).SetValue(Grid.ColumnSpanProperty, 3);
-            ((DependencyObject)_grid).SetValue(Grid.RowProperty, 0);
-
-            //_grid.AddHiddenColumn("AsLookup");
-            foreach (var column in _othercolumns)
-            {
-                var comps = column.Split(new[] { "->" }, StringSplitOptions.None);
-                _grid.AddHiddenColumn(comps.First());
-                OtherValues[column] = null;
-            }
+            dataGrid.ColumnsTag ??= "Popup";
+        }
 
-            layoutGrid.Children.Add((UIElement)_grid);
-            
-            _grid.Reconfigure(options =>
-            {
-                options.BeginUpdate().Clear().AddRange(
-                    DynamicGridOption.SelectColumns,
-                    DynamicGridOption.FilterRows
-                ).EndUpdate();
-            });
+        _grid.OnDefineFilter += t => OnDefineFilter?.Invoke(t);
+
+        _grid.Refresh(true, false);
 
-            if(_grid is IDynamicDataGrid dataGrid)
+        if (_filters != null)
+            foreach (var key in _filters.Keys)
             {
-                dataGrid.ColumnsTag ??= "Popup";
+                // TODO: Get this working again
+                _grid.AddVisualFilter(key, _filters[key]);
             }
 
-            _grid.OnDefineFilter += t => OnDefineFilter?.Invoke(t);
-
-            _grid.Refresh(true, false);
-
-            if (_filters != null)
-                foreach (var key in _filters.Keys)
-                {
-                    // TODO: Get this working again
-                    _grid.AddVisualFilter(key, _filters[key]);
-                }
-            _grid.Refresh(false, true);
-
-            var screen = WpfScreen.GetScreenFrom(this);
-            var maxwidth = (int)screen.WorkingArea.Width - 200;
-
-            var DesiredWidth = _grid.DesiredWidth();
-            if (DesiredWidth > maxwidth)
-                DesiredWidth = maxwidth;
-            if (DesiredWidth > Width)
-                Width = DesiredWidth;
-
-            var maxheight = (int)screen.WorkingArea.Height - 200;
-            var DesiredHeight = (int)(Width * 0.6);
-            if (DesiredHeight > maxheight)
-                DesiredHeight = maxheight;
-            if (DesiredHeight > Height)
-                Height = DesiredHeight;
-
-            _grid.SelectedRows = _grid.Data.Rows.Where(r => r.Get<Guid>("ID").Equals(ID)).ToArray();
-
-            _grid.OnDoubleClick += Grid_OnDoubleClick;
-            
-            //Left = screen.DeviceBounds.Left + ((screen.DeviceBounds.Width - Width) / 2.0F);
-            //Top = screen.DeviceBounds.Top + ((screen.DeviceBounds.Height - Height) / 2.0F);
-            //WpfScreen.CenterWindowOnScreen(this);
-        }
+        OnCustomiseGrid?.Invoke(_grid);
 
-        private void Grid_OnDoubleClick(object sender, System.ComponentModel.HandledEventArgs args)
-        {
-            if (_grid.SelectedRows.Any())
-                CheckSelectedAndClose();
-        }
+        _grid.Refresh(false, true);
 
-        private void OKButton_Click(object sender, RoutedEventArgs e)
-        {
-            if (_grid.SelectedRows.Any())
-                CheckSelectedAndClose();
-            else
-                MessageBox.Show("Please select an Item first");
+        var screen = WpfScreen.GetScreenFrom(this);
+        var maxwidth = (int)screen.WorkingArea.Width - 200;
 
-        }
+        var DesiredWidth = _grid.DesiredWidth();
+        if (DesiredWidth > maxwidth)
+            DesiredWidth = maxwidth;
+        if (DesiredWidth > Width)
+            Width = DesiredWidth;
 
-        private void CheckSelectedAndClose()
-        {
-            ID = _grid.SelectedRows.First().Get<Guid>("ID");
+        var maxheight = (int)screen.WorkingArea.Height - 200;
+        var DesiredHeight = (int)(Width * 0.6);
+        if (DesiredHeight > maxheight)
+            DesiredHeight = maxheight;
+        if (DesiredHeight > Height)
+            Height = DesiredHeight;
 
-            //AsLookup = _grid.SelectedRows.First().Get<String>("AsLookup");
+        _grid.SelectedRows = _grid.Data.Rows.Where(r => r.Get<Guid>("ID").Equals(ID)).ToArray();
 
-            foreach (var key in OtherValues.Keys.ToArray())
-            {
-                var comps = key.Split(new[] { "->" }, StringSplitOptions.None);
-                OtherValues[key] = _grid.SelectedRows.First().Get<object>(comps.First());
-            }
+        _grid.OnDoubleClick += Grid_OnDoubleClick;
+        
+        //Left = screen.DeviceBounds.Left + ((screen.DeviceBounds.Width - Width) / 2.0F);
+        //Top = screen.DeviceBounds.Top + ((screen.DeviceBounds.Height - Height) / 2.0F);
+        //WpfScreen.CenterWindowOnScreen(this);
+    }
 
-            DialogResult = true;
-            Close();
-        }
+    private void Grid_OnDoubleClick(object sender, System.ComponentModel.HandledEventArgs args)
+    {
+        if (_grid.SelectedRows.Any())
+            CheckSelectedAndClose();
+    }
 
-        private void CancelButton_Click(object sender, RoutedEventArgs e)
+    private void OKButton_Click(object sender, RoutedEventArgs e)
+    {
+        if (_grid.SelectedRows.Any())
+            CheckSelectedAndClose();
+        else
+            MessageBox.Show("Please select an Item first");
+
+    }
+
+    private void CheckSelectedAndClose()
+    {
+        ID = _grid.SelectedRows.First().Get<Guid>("ID");
+
+        //AsLookup = _grid.SelectedRows.First().Get<String>("AsLookup");
+
+        foreach (var key in OtherValues.Keys.ToArray())
         {
-            DialogResult = false;
-            Close();
+            var comps = key.Split(new[] { "->" }, StringSplitOptions.None);
+            OtherValues[key] = _grid.SelectedRows.First().Get<object>(comps.First());
         }
+
+        DialogResult = true;
+        Close();
+    }
+
+    private void CancelButton_Click(object sender, RoutedEventArgs e)
+    {
+        DialogResult = false;
+        Close();
     }
 }