Bladeren bron

REmoved FindDocument, LoadDocument and SaveDocument callbacks

Kenric Nugteren 1 jaar geleden
bovenliggende
commit
2df4269403

+ 0 - 18
inabox.wpf/DigitalForms/Designer/DynamicFormControlGrid.cs

@@ -42,23 +42,5 @@ namespace InABox.DynamicGrid
             if (!Items.Contains(item))
                 Items.Add(item);
         }
-
-        protected override Document LoadDocument(Guid id)
-        {
-            Document? doc = null;
-            if (id != Guid.Empty)
-                doc = new Client<Document>().Load(new Filter<Document>(x => x.ID).IsEqualTo(id)).FirstOrDefault();
-            return doc ?? new Document();
-        }
-
-        protected override Document FindDocument(string filename)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.FileName).IsEqualTo(filename)).FirstOrDefault();
-        }
-
-        protected override void SaveDocument(Document document)
-        {
-            new Client<Document>().Save(document, "");
-        }
     }
 }

+ 0 - 15
inabox.wpf/DynamicGrid/DynamicDataGrid.cs

@@ -575,21 +575,6 @@ namespace InABox.DynamicGrid
             }
         }
 
-        protected override Document? LoadDocument(Guid id)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.ID).IsEqualTo(id)).FirstOrDefault();
-        }
-
-        protected override Document? FindDocument(string filename)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.FileName).IsEqualTo(filename)).FirstOrDefault();
-        }
-
-        protected override void SaveDocument(Document document)
-        {
-            new Client<Document>().Save(document, "Updated by Editor");
-        }
-
         protected bool Duplicate(
             CoreRow row,
             Expression<Func<TEntity, object?>> codefield,

+ 0 - 3
inabox.wpf/DynamicGrid/DynamicEditorForm/DynamicEditorForm.xaml.cs

@@ -87,9 +87,6 @@ namespace InABox.DynamicGrid
         public event OnAfterEditorValueChanged? OnAfterEditorValueChanged { add => Form.OnAfterEditorValueChanged += value; remove => Form.OnAfterEditorValueChanged -= value; }
         public event EditorValueChangedHandler? OnEditorValueChanged { add => Form.OnEditorValueChanged += value; remove => Form.OnEditorValueChanged -= value; }
 
-        public IDynamicEditorForm.GetDocumentEvent? OnGetDocument { get => Form.OnGetDocument; set { Form.OnGetDocument = value; } }
-        public IDynamicEditorForm.FindDocumentEvent? OnFindDocument { get => Form.OnFindDocument; set { Form.OnFindDocument = value; } }
-        public IDynamicEditorForm.SaveDocumentEvent? OnSaveDocument { get => Form.OnSaveDocument; set { Form.OnSaveDocument = value; } }
 
         public event OnSelectPage? OnSelectPage { add => Form.OnSelectPage += value; remove => Form.OnSelectPage -= value; }
 

+ 0 - 1
inabox.wpf/DynamicGrid/DynamicEditorForm/EmbeddedDynamicEditorForm.xaml

@@ -33,7 +33,6 @@
                                  OnGetSequence="Editor_OnGetSequence"
                                  OnEditorValueChanged="EditorValueChanged"
                                  OnDefineLookups="Editor_OnDefineLookups"
-                                 OnGetDocument="Editor_OnGetDocument" OnFindDocument="Editor_OnFindDocument" OnSaveDocument="Editor_OnSaveDocument"
                                  GetItems="Editor_GetItems"
                                  OnGetEditor="Editor_OnGetEditor"
                                  OnGetPropertyValue="Editor_OnGetPropertyValue"

+ 0 - 19
inabox.wpf/DynamicGrid/DynamicEditorForm/EmbeddedDynamicEditorForm.xaml.cs

@@ -117,10 +117,6 @@ namespace InABox.DynamicGrid
 
         public event EditorValueChangedHandler? OnEditorValueChanged;
         public event OnAfterEditorValueChanged? OnAfterEditorValueChanged;
-
-        public IDynamicEditorForm.GetDocumentEvent? OnGetDocument { get; set; }
-        public IDynamicEditorForm.FindDocumentEvent? OnFindDocument { get; set; }
-        public IDynamicEditorForm.SaveDocumentEvent? OnSaveDocument { get; set; }
         
         public event OnSelectPage? OnSelectPage;
 
@@ -344,21 +340,6 @@ namespace InABox.DynamicGrid
             OnDefineLookups?.Invoke(editor);
         }
 
-        private Document? Editor_OnGetDocument(Guid id)
-        {
-            return OnGetDocument?.Invoke(id);
-        }
-
-        private Document? Editor_OnFindDocument(string file)
-        {
-            return OnFindDocument?.Invoke(file);
-        }
-
-        private void Editor_OnSaveDocument(Document document)
-        {
-            OnSaveDocument?.Invoke(document);
-        }
-
         private object?[] Editor_GetItems()
         {
             return _items;

+ 0 - 8
inabox.wpf/DynamicGrid/DynamicEditorForm/IDynamicEditorForm.cs

@@ -6,10 +6,6 @@ namespace InABox.DynamicGrid
     public interface IDynamicEditorForm
     {
         
-        public delegate Document? FindDocumentEvent(string FileName);
-        public delegate Document? GetDocumentEvent(Guid id);
-        public delegate void SaveDocumentEvent(Document document);
-        
         event OnBeforeLoad OnBeforeLoad; 
         void BeforeLoad();
         
@@ -30,10 +26,6 @@ namespace InABox.DynamicGrid
         event OnAfterEditorValueChanged? OnAfterEditorValueChanged;
         event EditorValueChangedHandler? OnEditorValueChanged;
 
-        GetDocumentEvent? OnGetDocument { set; }
-        FindDocumentEvent? OnFindDocument { set; }
-        SaveDocumentEvent? OnSaveDocument { set; }
-
         event OnSelectPage? OnSelectPage;
         DynamicGridSaveEvent? OnSaveItem { set; }
 

+ 0 - 16
inabox.wpf/DynamicGrid/DynamicEditorGrid.xaml.cs

@@ -23,14 +23,8 @@ namespace InABox.DynamicGrid
     {
         public delegate void EditorCreatedHandler(object sender, double height, double width);
 
-        public delegate Document? FindDocumentEvent(string FileName);
-
-        public delegate Document? GetDocumentEvent(Guid id);
-
         public delegate object? GetPropertyValueHandler(object sender, string name);
 
-        public delegate void SaveDocumentEvent(Document document);
-
         public delegate void SetPropertyValueHandler(object sender, string name, object value);
 
         public delegate object?[] GetItemsEvent();
@@ -124,10 +118,6 @@ namespace InABox.DynamicGrid
 
         public event OnDefineLookup? OnDefineLookups;
 
-        public event GetDocumentEvent? OnGetDocument;
-        public event FindDocumentEvent? OnFindDocument;
-        public event SaveDocumentEvent? OnSaveDocument;
-
         public event GetItemsEvent? GetItems;
 
         private void DynamicEditorGrid_Loaded(object sender, RoutedEventArgs e)
@@ -163,12 +153,6 @@ namespace InABox.DynamicGrid
             OnDefineLookups?.Invoke(editor);
         }
 
-        public Document? FindDocument(string filename) => OnFindDocument?.Invoke(filename);
-
-        public Document? GetDocument(Guid id) => OnGetDocument?.Invoke(id);
-
-        public void SaveDocument(Document document) => OnSaveDocument?.Invoke(document);
-
         object?[] IDynamicEditorHost.GetItems() => GetItems?.Invoke() ?? Array.Empty<object?>();
 
         public BaseEditor? GetEditor(DynamicGridColumn column) => OnGetEditor?.Invoke(column);

+ 0 - 18
inabox.wpf/DynamicGrid/DynamicGrid.cs

@@ -2630,10 +2630,6 @@ namespace InABox.DynamicGrid
 
             editor.OnSelectPage += SelectPage;
 
-            editor.OnGetDocument = LoadDocument;
-            editor.OnFindDocument = FindDocument;
-            editor.OnSaveDocument = SaveDocument;
-
             editor.OnSaveItem = (o, e) =>
             {
                 try
@@ -2820,20 +2816,6 @@ namespace InABox.DynamicGrid
             return CoreUtils.GetPropertyValue(item, name);
         }
 
-        protected virtual Document? LoadDocument(Guid id)
-        {
-            return null;
-        }
-
-        protected virtual Document? FindDocument(string filename)
-        {
-            return null;
-        }
-
-        protected virtual void SaveDocument(Document document)
-        {
-        }
-
         protected virtual bool CanCreateItems()
         {
             return true;

+ 0 - 15
inabox.wpf/DynamicGrid/DynamicManyToManyGrid.cs

@@ -322,21 +322,6 @@ namespace InABox.DynamicGrid
             return base.GetEditor(item, column);
         }
 
-        protected override Document LoadDocument(Guid id)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.ID).IsEqualTo(id)).FirstOrDefault();
-        }
-
-        protected override Document FindDocument(string filename)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.FileName).IsEqualTo(filename)).FirstOrDefault();
-        }
-
-        protected override void SaveDocument(Document document)
-        {
-            new Client<Document>().Save(document, "Updated by Editor");
-        }
-
         public override void LoadEditorButtons(TManyToMany item, DynamicEditorButtons buttons)
         {
             base.LoadEditorButtons(item, buttons);

+ 12 - 21
inabox.wpf/DynamicGrid/IDynamicEditorHost.cs

@@ -56,7 +56,10 @@ namespace InABox.DynamicGrid
         /// </remarks>
         /// <param name="filename">The filename of the document.</param>
         /// <returns>The document with the right filename, or <see langword="null"/> if not found.</returns>
-        Document? FindDocument(string filename);
+        Document? FindDocument(string filename)
+        {
+            return new Client<Document>().Load(new Filter<Document>(x => x.FileName).IsEqualTo(filename)).FirstOrDefault();
+        }
 
         /// <summary>
         /// Get a document for a given ID.
@@ -66,7 +69,10 @@ namespace InABox.DynamicGrid
         /// </remarks>
         /// <param name="id">The ID of the document.</param>
         /// <returns>The document, or <see langword="null"/> if not found.</returns>
-        Document? GetDocument(Guid id);
+        Document? GetDocument(Guid id)
+        {
+            return new Client<Document>().Load(new Filter<Document>(x => x.ID).IsEqualTo(id)).FirstOrDefault();
+        }
 
         /// <summary>
         /// Saves a document.
@@ -75,7 +81,10 @@ namespace InABox.DynamicGrid
         /// The usual implementation will go through the <see cref="Client{TEntity}"/> interface.
         /// </remarks>
         /// <param name="document">The document to save.</param>
-        void SaveDocument(Document document);
+        void SaveDocument(Document document)
+        {
+            new Client<Document>().Save(document, "Updated by Editor");
+        }
 
         /// <summary>
         /// Returns a list of the currently edited items; may be an empty array.
@@ -105,24 +114,6 @@ namespace InABox.DynamicGrid
 
         public virtual IFilter? DefineFilter(Type type) => LookupFactory.DefineFilter(Items ?? Enumerable.Empty<object?>(), type);
 
-        public Document? FindDocument(string filename)
-        {
-            return new Client<Document>().Load(new Filter<Document>(x => x.FileName).IsEqualTo(filename)).FirstOrDefault();
-        }
-
-        public Document? GetDocument(Guid id)
-        {
-            Document? doc = null;
-            if (id != Guid.Empty)
-                doc = new Client<Document>().Load(new Filter<Document>(x => x.ID).IsEqualTo(id)).FirstOrDefault();
-            return doc;
-        }
-
-        public void SaveDocument(Document document)
-        {
-            new Client<Document>().Save(document, "");
-        }
-
         public BaseEditor? GetEditor(DynamicGridColumn column) => column.Editor.CloneEditor();
 
         public object?[] GetItems() => Items ?? Array.Empty<object?>();