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

Changed reactor event query to only use REACT_EVENT table

Browse Source
This commit is contained in:
Daniel Wathen 2023-03-01 16:45:47 -07:00
parent 57ef8d8d25
commit 7ca02958dc
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,8 @@ public static class DailyReportHelper
"HGCV1", "HGCV1",
"HGCV2", "HGCV2",
"HGCV3", "HGCV3",
"SRP" "SRP",
"TENCOR3"
}; };
List<Reactor> reactors = new(); List<Reactor> reactors = new();

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

@ -373,10 +373,10 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
SqlCommand cmd = _connection.CreateCommand(); SqlCommand cmd = _connection.CreateCommand();
string query = "SELECT " + string query = "SELECT " +
" revnt.REACT_NO, " + " REACT_NO, " +
" EVENT_DTM, " + " START_DTM, " +
" COMMENT AS REASON, " + " START_NOTE AS REASON, " +
" REACT_MODE, " + " MODE, " +
" (SELECT TOP 1 NOTES " + " (SELECT TOP 1 NOTES " +
" FROM REACTOR_LOG_NOTES rnote " + " FROM REACTOR_LOG_NOTES rnote " +
" WHERE rmode.START_RL_ID = rnote.SEQ " + " WHERE rmode.START_RL_ID = rnote.SEQ " +
@ -386,21 +386,17 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
" WHERE rmode.REACT_NO = srv.REACT_NO " + " WHERE rmode.REACT_NO = srv.REACT_NO " +
" AND rmode.START_DTM = srv.START_DTM " + " AND rmode.START_DTM = srv.START_DTM " +
" ORDER BY MV_NO DESC) AS CATEGORY " + " ORDER BY MV_NO DESC) AS CATEGORY " +
" FROM REACT_EVENT revnt, REACT_MODE rmode " + " FROM REACT_MODE rmode " +
" WHERE EVENT_DTM > @startDate " + " WHERE START_DTM > @startDate " +
" AND EVENT_DTM < @endDate " + " AND START_DTM < @endDate" +
" AND revnt.REACT_NO = @reactorNumber " + " AND REACT_NO = @reactorNumber " +
" AND EVENT_DTM = START_DTM " +
" AND revnt.REACT_NO = rmode.REACT_NO " +
" AND LOGGED_BY = START_USER " +
" AND REACT_MODE = MODE " +
"UNION ALL " + "UNION ALL " +
"SELECT * " + "SELECT * " +
" FROM " + " FROM " +
" (SELECT TOP 1 " + " (SELECT TOP 1 " +
" revnt.REACT_NO, " + " REACT_NO, " +
" EVENT_DTM, COMMENT AS REASON, " + " START_DTM, START_NOTE AS REASON, " +
" REACT_MODE, " + " MODE, " +
" (SELECT TOP 1 NOTES " + " (SELECT TOP 1 NOTES " +
" FROM REACTOR_LOG_NOTES rnote " + " FROM REACTOR_LOG_NOTES rnote " +
" WHERE rmode.START_RL_ID = rnote.SEQ " + " WHERE rmode.START_RL_ID = rnote.SEQ " +
@ -410,14 +406,11 @@ public class ScrapeDatabaseRepository : IScrapeDatabaseRepository
" WHERE rmode.REACT_NO = srv.REACT_NO " + " WHERE rmode.REACT_NO = srv.REACT_NO " +
" AND rmode.START_DTM = srv.START_DTM " + " AND rmode.START_DTM = srv.START_DTM " +
" ORDER BY MV_NO DESC) AS CATEGORY " + " ORDER BY MV_NO DESC) AS CATEGORY " +
" FROM REACT_EVENT revnt, REACT_MODE rmode " + " FROM REACT_MODE rmode " +
" WHERE EVENT_DTM < @startDate " + " WHERE START_DTM < @startDate" +
" AND revnt.REACT_NO = @reactorNumber " + " AND REACT_NO = @reactorNumber " +
" AND EVENT_DTM = START_DTM " + " ORDER BY START_DTM DESC) AS tbl1 " +
" AND revnt.REACT_NO = rmode.REACT_NO " + "ORDER BY START_DTM ASC";
" AND LOGGED_BY = START_USER " +
" AND REACT_MODE = MODE ORDER BY EVENT_DTM DESC) AS tbl1 " +
"ORDER BY EVENT_DTM ASC";
cmd.CommandText = query; cmd.CommandText = query;
_ = cmd.Parameters.AddWithValue("@startDate", startDate); _ = cmd.Parameters.AddWithValue("@startDate", startDate);

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-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}]