Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix alarms

Browse Source
This commit is contained in:
Lucio Maranta
2019-02-12 12:50:55 +01:00
parent bc81d9fe25
commit 8db492a0df
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/AlarmsController.cs
+4 -3
View File
@@ -46,7 +46,8 @@ namespace Step.Database.Controllers
// Get Plc messages ids
List<int> plcAlarmDescIds =
plcMessages
.Where(x => x.Value.Contains(title))
.Where(x => x.Value.IndexOf(title, StringComparison.OrdinalIgnoreCase) >= 0)
//.Where(x => x.Value.Contains(title))
.Select(x => x.Key)
.ToList();
@@ -62,9 +63,9 @@ namespace Step.Database.Controllers
&&
((x.Source == ALARM_SOURCE.NC && ncAlarmDescIds.Contains(x.AlarmDescriptionId.Value)) // Check if message is contained in NC messages
|| (x.Source == ALARM_SOURCE.PLC && plcAlarmDescIds.Contains(x.AlarmId))) // Check if message is contained in PLC messages
).OrderByDescending(t => t.TimeStamp);
).OrderByDescending(t => t.AlarmOccurrenceId);
double tmpPages = occurrencesQuery.Count() / pageSize;
double tmpPages = (double)occurrencesQuery.Count() / (double)pageSize;
pages = (int)Math.Ceiling(tmpPages);
var paginatedQuery = occurrencesQuery