All but DataTable Deserialize

Shared/DataModels/AwaitingDisposition.cs

@@ -1,6 +1,6 @@
 namespace OI.Metrology.Shared.DataModels;
 
-public class AwaitingDispo
+public class AwaitingDisposition
 {
     public string? PK { get; set; }
     public string? Title { get; set; }

Shared/DataModels/ColumnValue.cs

@@ -0,0 +1,9 @@
+namespace OI.Metrology.Shared.DataModels;
+
+public class ColumnValue
+{
+
+    public string? Column { get; set; }
+    public string? Value { get; set; }
+
+}

Shared/DataModels/Result.cs

@@ -0,0 +1,7 @@
+namespace OI.Metrology.Shared.DataModels;
+
+public class Result<T>
+{
+    public T? Results { get; set; }
+    public long TotalRows { get; set; }
+}

Shared/DataModels/ToolTypeMetadataResult.cs

@@ -0,0 +1,18 @@
+namespace OI.Metrology.Shared.DataModels;
+
+public class ToolTypeMetadataResult
+{
+
+    public ToolType? ToolType { get; set; }
+    public ToolTypeMetadata[]? Metadata { get; set; }
+
+    public ToolTypeMetadataResult()
+    { }
+
+    public ToolTypeMetadataResult(ToolType? toolType, ToolTypeMetadata[]? metadata)
+    {
+        ToolType = toolType;
+        Metadata = metadata;
+    }
+
+}

Shared/DataModels/ToolTypeNameId.cs

@@ -0,0 +1,9 @@
+namespace OI.Metrology.Shared.DataModels;
+
+public class ToolTypeNameId
+{
+
+    public string? ToolTypeName { get; set; }
+    public int ID { get; set; }
+
+}

Shared/Models/Stateless/IAwaitingDispoController.cs

@@ -0,0 +1,18 @@
+namespace OI.Metrology.Shared.Models.Stateless;
+
+public interface IAwaitingDispoController<T>
+{
+
+    enum Action : int
+    {
+        Index = 0,
+        MarkAsReviewed = 1,
+        MarkAsAwaiting = 2
+    }
+
+    static string GetRouteName() => nameof(IAwaitingDispoController<T>)[1..^10];
+    T Index();
+    T MarkAsReviewed(long headerid, int tooltypeid);
+    T MarkAsAwaiting(long headerid, int tooltypeid);
+
+}

Shared/Models/Stateless/IMetrologyRepository.cs

@@ -44,7 +44,7 @@ public interface IMetrologyRepository
 
     IEnumerable<KeyValuePair<string, string>> GetHeaderFields(int toolTypeId, long headerid);
 
-    IEnumerable<AwaitingDispo> GetAwaitingDispo();
+    IEnumerable<AwaitingDisposition> GetAwaitingDisposition();
 
     int UpdateReviewDate(int toolTypeId, long headerId, bool clearDate);
 

Shared/Models/Stateless/IToolTypesRepository.cs

@@ -1,16 +1,18 @@
+using OI.Metrology.Shared.DataModels;
 using OI.Metrology.Shared.Services;
+using System.Data;
 
 namespace OI.Metrology.Shared.Models.Stateless;
 
 public interface IToolTypesRepository
 {
 
-    object Index(IMetrologyRepository metrologyRepository);
-    object GetToolTypeMetadata(IMetrologyRepository metrologyRepository, int id, string sortby = "");
-    string GetHeaders(IMetrologyRepository metrologyRepository, int id, DateTime? datebegin, DateTime? dateend, int? page, int? pagesize, long? headerid);
-    string GetHeaderTitles(IMetrologyRepository metrologyRepository, int id, int? page, int? pagesize);
-    string GetHeaderFields(IMetrologyRepository metrologyRepository, int id, long headerid);
-    string GetData(IMetrologyRepository metrologyRepository, int id, long headerid);
+    Result<ToolTypeNameId[]> Index(IMetrologyRepository metrologyRepository);
+    Result<ToolTypeMetadataResult> GetToolTypeMetadata(IMetrologyRepository metrologyRepository, int id, string sortby = "");
+    Result<DataTable> GetHeaders(IMetrologyRepository metrologyRepository, int id, DateTime? datebegin, DateTime? dateend, int? page, int? pagesize, long? headerid);
+    Result<HeaderCommon[]> GetHeaderTitles(IMetrologyRepository metrologyRepository, int id, int? page, int? pagesize);
+    Result<ColumnValue[]> GetHeaderFields(IMetrologyRepository metrologyRepository, int id, long headerid);
+    Result<DataTable> GetData(IMetrologyRepository metrologyRepository, int id, long headerid);
     (string?, string?, Stream?) GetAttachment(IMetrologyRepository metrologyRepository, IAttachmentsService attachmentsService, int toolTypeId, string tabletype, string attachmentId, string filename);
     Exception? OIExport(IMetrologyRepository metrologyRepository, string oiExportPath, int toolTypeId, long headerid);