diff --git a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs index 1294cfb..acb0371 100644 --- a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs +++ b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs @@ -58,7 +58,8 @@ public static class DailyReportHelper "HGCV1", "HGCV2", "HGCV3", - "SRP" + "SRP", + "TENCOR3" }; List reactors = new(); diff --git a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs index fb85e4f..951afa6 100644 --- a/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs +++ b/ReportingServices.Shared/Repositories/Implementations/ScrapeDatabaseRepository.cs @@ -373,10 +373,10 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository SqlCommand cmd = _connection.CreateCommand(); string query = "SELECT " + - " revnt.REACT_NO, " + - " EVENT_DTM, " + - " COMMENT AS REASON, " + - " REACT_MODE, " + + " REACT_NO, " + + " START_DTM, " + + " START_NOTE AS REASON, " + + " MODE, " + " (SELECT TOP 1 NOTES " + " FROM REACTOR_LOG_NOTES rnote " + " WHERE rmode.START_RL_ID = rnote.SEQ " + @@ -386,21 +386,17 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository " WHERE rmode.REACT_NO = srv.REACT_NO " + " AND rmode.START_DTM = srv.START_DTM " + " ORDER BY MV_NO DESC) AS CATEGORY " + - " FROM REACT_EVENT revnt, REACT_MODE rmode " + - " WHERE EVENT_DTM > @startDate " + - " AND EVENT_DTM < @endDate " + - " AND revnt.REACT_NO = @reactorNumber " + - " AND EVENT_DTM = START_DTM " + - " AND revnt.REACT_NO = rmode.REACT_NO " + - " AND LOGGED_BY = START_USER " + - " AND REACT_MODE = MODE " + + " FROM REACT_MODE rmode " + + " WHERE START_DTM > @startDate " + + " AND START_DTM < @endDate" + + " AND REACT_NO = @reactorNumber " + "UNION ALL " + "SELECT * " + " FROM " + " (SELECT TOP 1 " + - " revnt.REACT_NO, " + - " EVENT_DTM, COMMENT AS REASON, " + - " REACT_MODE, " + + " REACT_NO, " + + " START_DTM, START_NOTE AS REASON, " + + " MODE, " + " (SELECT TOP 1 NOTES " + " FROM REACTOR_LOG_NOTES rnote " + " WHERE rmode.START_RL_ID = rnote.SEQ " + @@ -410,14 +406,11 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository " WHERE rmode.REACT_NO = srv.REACT_NO " + " AND rmode.START_DTM = srv.START_DTM " + " ORDER BY MV_NO DESC) AS CATEGORY " + - " FROM REACT_EVENT revnt, REACT_MODE rmode " + - " WHERE EVENT_DTM < @startDate " + - " AND revnt.REACT_NO = @reactorNumber " + - " AND EVENT_DTM = START_DTM " + - " AND revnt.REACT_NO = rmode.REACT_NO " + - " AND LOGGED_BY = START_USER " + - " AND REACT_MODE = MODE ORDER BY EVENT_DTM DESC) AS tbl1 " + - "ORDER BY EVENT_DTM ASC"; + " FROM REACT_MODE rmode " + + " WHERE START_DTM < @startDate" + + " AND REACT_NO = @reactorNumber " + + " ORDER BY START_DTM DESC) AS tbl1 " + + "ORDER BY START_DTM ASC"; cmd.CommandText = query; _ = cmd.Parameters.AddWithValue("@startDate", startDate); diff --git a/ReportingServices.UI/wwwroot/Assets/SLLTools.json b/ReportingServices.UI/wwwroot/Assets/SLLTools.json index 61d6446..2ec55aa 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}] \ 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}] \ No newline at end of file