From 23c173a82e0f35320b1bfd876c326eedbc4f29ce Mon Sep 17 00:00:00 2001
From: Lucio Maranta <lucio.maranta@cms.it>
Date: Thu, 11 Oct 2018 17:41:56 +0200
Subject: [PATCH] WIP Alarm

---
 Step.Database/Controllers/AlarmsController.cs | 4 ++--
 Step.Model/Step.Model.csproj                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Step.Database/Controllers/AlarmsController.cs b/Step.Database/Controllers/AlarmsController.cs
index 4bebe270..00b5f591 100644
--- a/Step.Database/Controllers/AlarmsController.cs
+++ b/Step.Database/Controllers/AlarmsController.cs
@@ -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)
diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Step.Model.csproj
index e06beed2..87a7f014 100644
--- a/Step.Model/Step.Model.csproj
+++ b/Step.Model/Step.Model.csproj
@@ -94,7 +94,7 @@
     <Compile Include="DatabaseModels\MachineUserModel.cs" />
     <Compile Include="DatabaseModels\SessionModel.cs" />
     <Compile Include="DTOModels\DTOActiveProgramInfoModel.cs" />
-    <Compile Include="DTOModels\DTOAlarmHistoryModel.cs" />
+    <Compile Include="DTOModels\DTOAlarmHistoricModel.cs" />
     <Compile Include="DTOModels\DTOAlarmsModel.cs" />
     <Compile Include="DTOModels\DTOAxesModel.cs" />
     <Compile Include="DTOModels\DTOAxisNameModel.cs" />