From 1633c82323f98396c3f683c8077456f64086bc6d Mon Sep 17 00:00:00 2001 From: Daniel Wathen Date: Wed, 5 Jul 2023 15:31:28 -0700 Subject: [PATCH] Fixed issue with previous week quarterly targets in daily report --- .../Controllers/ScrapeDBController.cs | 2 +- .../HelperClasses/DailyReportHelper.cs | 4 ++-- .../Implementations/ScrapeDatabaseRepository.cs | 10 ++++------ .../Interfaces/IScrapeDatabaseRepository.cs | 2 +- ReportingServices.UI/wwwroot/Assets/SLLTools.json | 2 +- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/ReportingServices.API/Controllers/ScrapeDBController.cs b/ReportingServices.API/Controllers/ScrapeDBController.cs index 0a4bac0..9e6b6fb 100644 --- a/ReportingServices.API/Controllers/ScrapeDBController.cs +++ b/ReportingServices.API/Controllers/ScrapeDBController.cs @@ -33,7 +33,7 @@ public class ScrapeDBController : ControllerBase public int GetNumberOfPartChanges(string startDate, string endDate) => _scrapeDBRepository.GetNumberOfPartChanges(startDate, endDate); [HttpGet("Targets")] - public QuarterlyTargets GetQuarterlyTargets() => _scrapeDBRepository.GetQuarterlyTargets(); + public QuarterlyTargets GetQuarterlyTargets(string startDate) => _scrapeDBRepository.GetQuarterlyTargets(startDate); [HttpGet("Reactors")] public List GetReactors() => _scrapeDBRepository.GetReactors(); diff --git a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs index fbb7130..9fc0562 100644 --- a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs +++ b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs @@ -112,8 +112,8 @@ public static class DailyReportHelper task2 = ApiCaller.GetApi(baseUrlScrapeDb + "ReactorOuts?startDate=" + report.StartDate.AddDays(-7).ToString() + "&endDate=" + report.StartDate.ToString()); task3 = ApiCaller.GetApi(baseUrlScrapeDb + "GetQuarterStartDate"); task12 = ApiCaller.GetApi(baseUrlScrapeDb + "GetPreviousQuarterStartDate"); - targets = ApiCaller.GetApi(baseUrlScrapeDb + "Targets"); - previousTargets = ApiCaller.GetApi(baseUrlScrapeDb + "Targets"); + targets = ApiCaller.GetApi(baseUrlScrapeDb + "Targets?startDate=" + report.StartDate.ToString()); + previousTargets = ApiCaller.GetApi(baseUrlScrapeDb + "Targets?startDate=" + report.StartDate.AddDays(-7).ToString()); rds = ApiCaller.GetApi>(baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString()); task4 = ApiCaller.GetApi(baseUrlScrapeDb + "GetOutsAndScrapTotals?startDate=" + task3.Result + "&endDate=" + currentDateTime.ToString()); diff --git a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs index 1fdab6a..7451b4d 100644 --- a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs +++ b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs @@ -200,7 +200,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository return weeklyPartChanges; } - public QuarterlyTargets GetQuarterlyTargets() + public QuarterlyTargets GetQuarterlyTargets(string startDate) { Dictionary targets = new(); @@ -212,18 +212,16 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository " WHERE THRU_GROUP = 'TOT' " + " AND FISCAL_YR = " + " (SELECT FISCAL_YR FROM FISCAL_QTR " + - " WHERE START_DT < SYSDATETIME() " + - " AND END_DT > SYSDATETIME()) " + + " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT) " + " AND FISCAL_QTR = " + " (SELECT FISCAL_QTR FROM FISCAL_QTR " + - " WHERE START_DT < SYSDATETIME() " + - " AND END_DT > SYSDATETIME()) " + + " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT) " + "UNION " + "SELECT 'PlanWorkingDays' As THRU_TARGET," + " PLAN_WORKING_DAYS AS THRU_QTY," + " NULL AS THRU_PCNT" + " FROM FISCAL_QTR " + - " WHERE SYSDATETIME() BETWEEN START_DT AND END_DT"; + " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT"; cmd.CommandText = query; diff --git a/ReportingServices.Shared/Repositories/Interfaces/IScrapeDatabaseRepository.cs b/ReportingServices.Shared/Repositories/Interfaces/IScrapeDatabaseRepository.cs index 6ba8ce0..feba44d 100644 --- a/ReportingServices.Shared/Repositories/Interfaces/IScrapeDatabaseRepository.cs +++ b/ReportingServices.Shared/Repositories/Interfaces/IScrapeDatabaseRepository.cs @@ -10,7 +10,7 @@ public interface IScrapeDatabaseRepository public List GetScrapByDay(List outs); public List GetReactorPSNWORuns(string startDate, string endDate); public int GetNumberOfPartChanges(string startDate, string endDate); - public QuarterlyTargets GetQuarterlyTargets(); + public QuarterlyTargets GetQuarterlyTargets(string startDate); public QuarterlyTargets GetPreviousQuarterlyTargets(); public List GetReactors(); public List GetRDSForLastDay(string date); diff --git a/ReportingServices.UI/wwwroot/Assets/SLLTools.json b/ReportingServices.UI/wwwroot/Assets/SLLTools.json index 6da9b6e..229218c 100644 --- a/ReportingServices.UI/wwwroot/Assets/SLLTools.json +++ b/ReportingServices.UI/wwwroot/Assets/SLLTools.json @@ -1 +1 @@ -[{"Date":"2023-01-23T00:00:00-07:00","ASM":7,"HTR":16},{"Date":"2023-01-24T00:00:00-07:00","ASM":7,"HTR":15},{"Date":"2023-01-26T00:00:00-07:00","ASM":7,"HTR":14},{"Date":"2023-02-20T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-01T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-03T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-04-03T00:00:00-07:00","ASM":2,"HTR":6},{"Date":"2023-05-25T00:00:00-07:00","ASM":2,"HTR":8},{"Date":"2023-06-12T00:00:00-07:00","ASM":2,"HTR":7}] \ No newline at end of file +[{"Date":"2023-01-23T00:00:00-07:00","ASM":7,"HTR":16},{"Date":"2023-01-24T00:00:00-07:00","ASM":7,"HTR":15},{"Date":"2023-01-26T00:00:00-07:00","ASM":7,"HTR":14},{"Date":"2023-02-20T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-01T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-03-03T00:00:00-07:00","ASM":3,"HTR":8},{"Date":"2023-04-03T00:00:00-07:00","ASM":2,"HTR":6},{"Date":"2023-05-25T00:00:00-07:00","ASM":2,"HTR":8},{"Date":"2023-06-12T00:00:00-07:00","ASM":2,"HTR":7},{"Date":"2023-07-05T00:00:00-07:00","ASM":0,"HTR":8}] \ No newline at end of file