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

WIP Alarm

Browse Source
This commit is contained in:
Lucio Maranta
2018-10-11 17:41:56 +02:00
parent 3d544a4a35
commit 23c173a82e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/AlarmsController.cs
+2 -2
View File
@@ -42,7 +42,7 @@ namespace Step.Database.Controllers
}
public List<DTOAlarmHistoryModel> GetPaginatedWithFilter(int page, int pageSize, DateTime startDate, DateTime endDate, List<int> userIds)
public List<DTOAlarmHistoricModel> GetPaginatedWithFilter(int page, int pageSize, DateTime startDate, DateTime endDate, List<int> userIds)
{
var occurrences = dbCtx.AlarmOccurrences.Include("AlarmDescription").OrderBy(x => x.AlarmOccurrenceId)
.Where(x =>
@@ -56,7 +56,7 @@ namespace Step.Database.Controllers
//var ids = occurrences.Select(x => x.Id).ToList();
//var users = dbCtx.AlarmUsers.Where(x => ids.Contains(x.AlarmOccurrenceId) && userIds.Contains(x.UserId)).ToList();
return occurrences.Select(x => (DTOAlarmHistoryModel)x).ToList();
return occurrences.Select(x => (DTOAlarmHistoricModel)x).ToList();
}
public void InsertList(List<AlarmOccurrencesModel> alarms)