|
@@ -7,14 +7,14 @@ using System.Threading.Tasks;
|
|
|
|
|
|
namespace InABox.DynamicGrid
|
|
|
{
|
|
|
- public class DynamicGridFilterGrid : DynamicGrid<DynamicGridFilter>
|
|
|
+ public class DynamicGridFilterGrid : DynamicGrid<CoreFilterDefinition>
|
|
|
{
|
|
|
- public DynamicGridFilters Filters;
|
|
|
+ public CoreFilterDefinitions Filters;
|
|
|
private Type FilterType;
|
|
|
|
|
|
public DynamicGridFilterGrid(Type filterType)
|
|
|
{
|
|
|
- Filters = new DynamicGridFilters();
|
|
|
+ Filters = new CoreFilterDefinitions();
|
|
|
Options.AddRange(DynamicGridOption.RecordCount,
|
|
|
DynamicGridOption.AddRows, DynamicGridOption.EditRows, DynamicGridOption.DeleteRows,
|
|
|
DynamicGridOption.MultiSelect);
|
|
@@ -23,9 +23,9 @@ namespace InABox.DynamicGrid
|
|
|
OnCustomiseEditor += DynamicGridFilterGrid_OnCustomiseEditor;
|
|
|
}
|
|
|
|
|
|
- private void DynamicGridFilterGrid_OnCustomiseEditor(IDynamicEditorForm sender, DynamicGridFilter[]? items, DynamicGridColumn column, BaseEditor editor)
|
|
|
+ private void DynamicGridFilterGrid_OnCustomiseEditor(IDynamicEditorForm sender, CoreFilterDefinition[]? items, DynamicGridColumn column, BaseEditor editor)
|
|
|
{
|
|
|
- if(column.ColumnName == nameof(DynamicGridFilter.Filter) && editor is FilterEditor filterEditor)
|
|
|
+ if(column.ColumnName == nameof(CoreFilterDefinition.Filter) && editor is FilterEditor filterEditor)
|
|
|
{
|
|
|
filterEditor.Type = FilterType;
|
|
|
}
|
|
@@ -37,17 +37,17 @@ namespace InABox.DynamicGrid
|
|
|
Filters.RemoveAt(row.Index);
|
|
|
}
|
|
|
|
|
|
- protected override DynamicGridFilter LoadItem(CoreRow row)
|
|
|
+ protected override CoreFilterDefinition LoadItem(CoreRow row)
|
|
|
{
|
|
|
var index = Data.Rows.IndexOf(row);
|
|
|
return Filters[index];
|
|
|
}
|
|
|
|
|
|
- protected override void Reload(Filters<DynamicGridFilter> criteria, Columns<DynamicGridFilter> columns, ref SortOrder<DynamicGridFilter>? sort, Action<CoreTable?, Exception?> action)
|
|
|
+ protected override void Reload(Filters<CoreFilterDefinition> criteria, Columns<CoreFilterDefinition> columns, ref SortOrder<CoreFilterDefinition>? sort, Action<CoreTable?, Exception?> action)
|
|
|
{
|
|
|
var result = new CoreTable();
|
|
|
if (columns == null || !columns.Items.Any())
|
|
|
- result.LoadColumns(typeof(DynamicGridFilter));
|
|
|
+ result.LoadColumns(typeof(CoreFilterDefinition));
|
|
|
else
|
|
|
foreach (var column in columns.Items)
|
|
|
result.Columns.Add(new CoreColumn { ColumnName = column.ToString(), DataType = column.Expression.Type });
|
|
@@ -55,7 +55,7 @@ namespace InABox.DynamicGrid
|
|
|
action.Invoke(result, null);
|
|
|
}
|
|
|
|
|
|
- public override void SaveItem(DynamicGridFilter item)
|
|
|
+ public override void SaveItem(CoreFilterDefinition item)
|
|
|
{
|
|
|
if (!Filters.Contains(item))
|
|
|
Filters.Add(item);
|