From c832b63f2f53e2d408120b79bf59d455bc8c1bca Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Wed, 27 Jul 2022 12:30:27 -0700 Subject: [PATCH] json Bugs from Newtonsoft.Json to System.Text.Json --- Archive/Repositories/MetrologyRepo.cs | 24 ++++++++++++------- Archive/Views/Pages/RunInfo.cshtml | 3 +-- .../ApiControllers/AwaitingDispoController.cs | 3 ++- Viewer/ApiControllers/ToolTypesController.cs | 5 ++-- Viewer/Repositories/MetrologyRepo.cs | 23 +++++++++++------- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/Archive/Repositories/MetrologyRepo.cs b/Archive/Repositories/MetrologyRepo.cs index f47bb4c..27046c8 100644 --- a/Archive/Repositories/MetrologyRepo.cs +++ b/Archive/Repositories/MetrologyRepo.cs @@ -273,6 +273,8 @@ public class MetrologyRepo : IMetrologyRepo public DataTable ExportData(string spName, DateTime startTime, DateTime endTime) { DataTable dt = new(); + DateTime endTimeLocal = endTime.ToLocalTime(); + DateTime startTimeLocal = startTime.ToLocalTime(); using (DbConnection conn = GetDbConnection()) { DbProviderFactory factory = GetDbProviderFactory(conn); @@ -281,9 +283,8 @@ public class MetrologyRepo : IMetrologyRepo cmd.Connection = conn; cmd.CommandText = spName; cmd.CommandType = CommandType.StoredProcedure; - cmd.CommandTimeout = 600; - AddParameter(cmd, "@StartTime", startTime); - AddParameter(cmd, "@EndTime", endTime); + AddParameter(cmd, "@StartTime", startTimeLocal); + AddParameter(cmd, "@EndTime", endTimeLocal); DbDataAdapter da = factory.CreateDataAdapter(); da.SelectCommand = cmd; @@ -357,17 +358,22 @@ public class MetrologyRepo : IMetrologyRepo if (startTime.HasValue) { whereClause = "[Date] >= @StartTime "; - - AddParameter(cmd, "@StartTime", startTime.Value); + DateTime startTimeLocal = startTime.Value.ToLocalTime(); + AddParameter(cmd, "@StartTime", startTimeLocal); } if (endTime.HasValue) { - if (whereClause.Length > 0) - whereClause += "AND "; - whereClause += "[Date] <= @EndTime "; + DateTime endTimeLocal = endTime.Value.ToLocalTime(); + TimeSpan timeSpan = new(DateTime.Now.Ticks - endTimeLocal.Ticks); + if (timeSpan.TotalMinutes > 5) + { + if (whereClause.Length > 0) + whereClause += "AND "; + whereClause += "[Date] <= @EndTime "; - AddParameter(cmd, "@EndTime", endTime.Value); + AddParameter(cmd, "@EndTime", endTimeLocal); + } } } diff --git a/Archive/Views/Pages/RunInfo.cshtml b/Archive/Views/Pages/RunInfo.cshtml index 725d8a4..4dd2fd6 100644 --- a/Archive/Views/Pages/RunInfo.cshtml +++ b/Archive/Views/Pages/RunInfo.cshtml @@ -4,7 +4,7 @@ } @@ -96,7 +96,6 @@ else { toolType = r.Results.ToolType; toolTypeMetaData = r.Results.Metadata; - RequestHeaderData(); } }, diff --git a/Viewer/ApiControllers/AwaitingDispoController.cs b/Viewer/ApiControllers/AwaitingDispoController.cs index 7d22bdc..eb2e5ba 100644 --- a/Viewer/ApiControllers/AwaitingDispoController.cs +++ b/Viewer/ApiControllers/AwaitingDispoController.cs @@ -3,6 +3,7 @@ namespace OI.Metrology.Viewer.ApiContollers; using OI.Metrology.Shared.Repositories; +using System.Text.Json; // this controller is for the Awaiting Dispo functionality @@ -23,7 +24,7 @@ public class AwaitingDispoController : Controller { Results = _Repo.GetAwaitingDispo() }; - return Json(r); + return Json(r, new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true }); } // this endpoint is used to set the ReviewDate column, causing the header to no longer show in Awaiting Dispo diff --git a/Viewer/ApiControllers/ToolTypesController.cs b/Viewer/ApiControllers/ToolTypesController.cs index d324fc5..6f26e22 100644 --- a/Viewer/ApiControllers/ToolTypesController.cs +++ b/Viewer/ApiControllers/ToolTypesController.cs @@ -11,6 +11,7 @@ using OI.Metrology.Shared.Repositories; using OI.Metrology.Shared.Services; using OI.Metrology.Viewer.Models; using System.Collections.Generic; +using System.Text.Json; // using System.Data.Common; @@ -39,7 +40,7 @@ public class ToolTypesController : Controller { Results = _Repo.GetToolTypes().Select(tt => new { tt.ToolTypeName, tt.ID }) }; - return Json(r); + return Json(r, new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true }); } // Gets the metadata for a tooltype, accepts a parameter which sorts the results @@ -63,7 +64,7 @@ public class ToolTypesController : Controller Metadata = md } }; - return Json(r); + return Json(r, new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true }); } // Gets headers, request/response format is to allow paging with igniteUI diff --git a/Viewer/Repositories/MetrologyRepo.cs b/Viewer/Repositories/MetrologyRepo.cs index 830fff6..6fc706e 100644 --- a/Viewer/Repositories/MetrologyRepo.cs +++ b/Viewer/Repositories/MetrologyRepo.cs @@ -276,6 +276,8 @@ public class MetrologyRepo : IMetrologyRepo public DataTable ExportData(string spName, DateTime startTime, DateTime endTime) { DataTable dt = new(); + DateTime endTimeLocal = endTime.ToLocalTime(); + DateTime startTimeLocal = startTime.ToLocalTime(); using (DbConnection conn = GetDbConnection()) { DbProviderFactory factory = GetDbProviderFactory(conn); @@ -284,8 +286,8 @@ public class MetrologyRepo : IMetrologyRepo cmd.Connection = conn; cmd.CommandText = spName; cmd.CommandType = CommandType.StoredProcedure; - AddParameter(cmd, "@StartTime", startTime); - AddParameter(cmd, "@EndTime", endTime); + AddParameter(cmd, "@StartTime", startTimeLocal); + AddParameter(cmd, "@EndTime", endTimeLocal); DbDataAdapter da = factory.CreateDataAdapter(); da.SelectCommand = cmd; @@ -357,17 +359,22 @@ public class MetrologyRepo : IMetrologyRepo if (startTime.HasValue) { whereClause = "[Date] >= @StartTime "; - - AddParameter(cmd, "@StartTime", startTime.Value); + DateTime startTimeLocal = startTime.Value.ToLocalTime(); + AddParameter(cmd, "@StartTime", startTimeLocal); } if (endTime.HasValue) { - if (whereClause.Length > 0) - whereClause += "AND "; - whereClause += "[Date] <= @EndTime "; + DateTime endTimeLocal = endTime.Value.ToLocalTime(); + TimeSpan timeSpan = new(DateTime.Now.Ticks - endTimeLocal.Ticks); + if (timeSpan.TotalMinutes > 5) + { + if (whereClause.Length > 0) + whereClause += "AND "; + whereClause += "[Date] <= @EndTime "; - AddParameter(cmd, "@EndTime", endTime.Value); + AddParameter(cmd, "@EndTime", endTimeLocal); + } } }