phares3757/mesareportingservices
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with previous week quarterly targets in daily report

Browse Source
This commit is contained in:
Daniel Wathen 2023-07-05 15:31:28 -07:00
parent 32182e8f7c
commit 1633c82323
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReportingServices.API/Controllers/ScrapeDBController.cs
View File

@ -33,7 +33,7 @@ public class ScrapeDBController : ControllerBase
public int GetNumberOfPartChanges(string startDate, string endDate) => _scrapeDBRepository.GetNumberOfPartChanges(startDate, endDate); public int GetNumberOfPartChanges(string startDate, string endDate) => _scrapeDBRepository.GetNumberOfPartChanges(startDate, endDate);
[HttpGet("Targets")] [HttpGet("Targets")]
public QuarterlyTargets GetQuarterlyTargets() => _scrapeDBRepository.GetQuarterlyTargets(); public QuarterlyTargets GetQuarterlyTargets(string startDate) => _scrapeDBRepository.GetQuarterlyTargets(startDate);
[HttpGet("Reactors")] [HttpGet("Reactors")]
public List<Reactor> GetReactors() => _scrapeDBRepository.GetReactors(); public List<Reactor> GetReactors() => _scrapeDBRepository.GetReactors();

4
ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
View File

@ -112,8 +112,8 @@ public static class DailyReportHelper
task2 = ApiCaller.GetApi<YieldInformation>(baseUrlScrapeDb + "ReactorOuts?startDate=" + report.StartDate.AddDays(-7).ToString() + "&endDate=" + report.StartDate.ToString()); task2 = ApiCaller.GetApi<YieldInformation>(baseUrlScrapeDb + "ReactorOuts?startDate=" + report.StartDate.AddDays(-7).ToString() + "&endDate=" + report.StartDate.ToString());
task3 = ApiCaller.GetApi<DateTime>(baseUrlScrapeDb + "GetQuarterStartDate"); task3 = ApiCaller.GetApi<DateTime>(baseUrlScrapeDb + "GetQuarterStartDate");
task12 = ApiCaller.GetApi<DateTime>(baseUrlScrapeDb + "GetPreviousQuarterStartDate"); task12 = ApiCaller.GetApi<DateTime>(baseUrlScrapeDb + "GetPreviousQuarterStartDate");
targets = ApiCaller.GetApi<QuarterlyTargets>(baseUrlScrapeDb + "Targets"); targets = ApiCaller.GetApi<QuarterlyTargets>(baseUrlScrapeDb + "Targets?startDate=" + report.StartDate.ToString());
previousTargets = ApiCaller.GetApi<QuarterlyTargets>(baseUrlScrapeDb + "Targets"); previousTargets = ApiCaller.GetApi<QuarterlyTargets>(baseUrlScrapeDb + "Targets?startDate=" + report.StartDate.AddDays(-7).ToString());
rds = ApiCaller.GetApi<List<RDS>>(baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString()); rds = ApiCaller.GetApi<List<RDS>>(baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString());
task4 = ApiCaller.GetApi<OutsAndScrapTotal>(baseUrlScrapeDb + "GetOutsAndScrapTotals?startDate=" + task3.Result + "&endDate=" + currentDateTime.ToString()); task4 = ApiCaller.GetApi<OutsAndScrapTotal>(baseUrlScrapeDb + "GetOutsAndScrapTotals?startDate=" + task3.Result + "&endDate=" + currentDateTime.ToString());

10
ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs
View File

@ -200,7 +200,7 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
return weeklyPartChanges; return weeklyPartChanges;
} }
public QuarterlyTargets GetQuarterlyTargets() public QuarterlyTargets GetQuarterlyTargets(string startDate)
{ {
Dictionary<string, float> targets = new(); Dictionary<string, float> targets = new();
@ -212,18 +212,16 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
" WHERE THRU_GROUP = 'TOT' " + " WHERE THRU_GROUP = 'TOT' " +
" AND FISCAL_YR = " + " AND FISCAL_YR = " +
" (SELECT FISCAL_YR FROM FISCAL_QTR " + " (SELECT FISCAL_YR FROM FISCAL_QTR " +
" WHERE START_DT < SYSDATETIME() " + " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT) " +
" AND END_DT > SYSDATETIME()) " +
" AND FISCAL_QTR = " + " AND FISCAL_QTR = " +
" (SELECT FISCAL_QTR FROM FISCAL_QTR " + " (SELECT FISCAL_QTR FROM FISCAL_QTR " +
" WHERE START_DT < SYSDATETIME() " + " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT) " +
" AND END_DT > SYSDATETIME()) " +
"UNION " + "UNION " +
"SELECT 'PlanWorkingDays' As THRU_TARGET," + "SELECT 'PlanWorkingDays' As THRU_TARGET," +
" PLAN_WORKING_DAYS AS THRU_QTY," + " PLAN_WORKING_DAYS AS THRU_QTY," +
" NULL AS THRU_PCNT" + " NULL AS THRU_PCNT" +
" FROM FISCAL_QTR " + " FROM FISCAL_QTR " +
" WHERE SYSDATETIME() BETWEEN START_DT AND END_DT"; " WHERE '" + startDate + "' BETWEEN START_DT AND END_DT";
cmd.CommandText = query; cmd.CommandText = query;

2
ReportingServices.Shared/Repositories/Interfaces/IScrapeDatabaseRepository.cs
View File

@ -10,7 +10,7 @@ public interface IScrapeDatabaseRepository
public List<ScrapByDay> GetScrapByDay(List<ReactorOutsByRDS> outs); public List<ScrapByDay> GetScrapByDay(List<ReactorOutsByRDS> outs);
public List<ReactorPSNWORuns> GetReactorPSNWORuns(string startDate, string endDate); public List<ReactorPSNWORuns> GetReactorPSNWORuns(string startDate, string endDate);
public int GetNumberOfPartChanges(string startDate, string endDate); public int GetNumberOfPartChanges(string startDate, string endDate);
public QuarterlyTargets GetQuarterlyTargets(); public QuarterlyTargets GetQuarterlyTargets(string startDate);
public QuarterlyTargets GetPreviousQuarterlyTargets(); public QuarterlyTargets GetPreviousQuarterlyTargets();
public List<Reactor> GetReactors(); public List<Reactor> GetReactors();
public List<RDS> GetRDSForLastDay(string date); public List<RDS> GetRDSForLastDay(string date);

2
ReportingServices.UI/wwwroot/Assets/SLLTools.json
View File

@ -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}] [{"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}]