From 9d97d3b43a8e13337983221820380094ff49ba72 Mon Sep 17 00:00:00 2001 From: Lucio Maranta Date: Fri, 25 Jan 2019 12:48:54 +0100 Subject: [PATCH] Fix --- .../Controllers/NcToolManagerController.cs | 13 ++----------- Step/Controllers/WebApi/ApiAlarmController.cs | 3 +-- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs index c6cb4dc7..468bca95 100644 --- a/Step.Database/Controllers/NcToolManagerController.cs +++ b/Step.Database/Controllers/NcToolManagerController.cs @@ -255,19 +255,10 @@ namespace Step.Database.Controllers return tools; } - - public List GetAvailableShanks() - { - List dtoShanks = GetShanksWithSpace() - .Where(x => x.MagazineId == null) - .ToList(); - - return dtoShanks; - } - + public List GetAvailableShanksWithChilds() { - List dtoShanks = GetShanks() + List dtoShanks = GetShanksWithSpace() .Where(x => x.MagazineId == null && x.ChildsTools.Count > 0) .ToList(); diff --git a/Step/Controllers/WebApi/ApiAlarmController.cs b/Step/Controllers/WebApi/ApiAlarmController.cs index 85d13764..11866315 100644 --- a/Step/Controllers/WebApi/ApiAlarmController.cs +++ b/Step/Controllers/WebApi/ApiAlarmController.cs @@ -39,8 +39,7 @@ namespace Step.Controllers.WebApi { Alarms = alarms, Pages = pages - } - ); + }); } }