Fix right&left check

This commit is contained in:
Lucio Maranta
2018-07-27 10:20:37 +02:00
parent e8c9c9104d
commit 8bac6c2a63
3 changed files with 73 additions and 53 deletions
@@ -43,6 +43,17 @@ namespace Step.Database.Controllers
.ToList();
}
public List<DbNcFamilyModel> FindFamiliesByShankId(int shankId)
{
DbNcShankModel shank = FindShankWithTools(shankId);
// Get only families id
int[] ids = shank.Tools.Select(x => x.FamilyId).ToArray();
return FindFamilies() // Get Families
.Where(x => ids.Contains(x.FamilyId)) // Filter by ids
.ToList();
}
public DbNcToolModel FindTool(int toolId)
{
return dbCtx.Tools
@@ -50,7 +61,7 @@ namespace Step.Database.Controllers
.FirstOrDefault();
}
public DbNcShankModel FindShank(int shankId)
public DbNcShankModel FindShankWithTools(int shankId)
{
return dbCtx.Shanks
.Include("Tools")
@@ -123,7 +134,6 @@ namespace Step.Database.Controllers
return shank;
}
public List<DTONcShankModel> GetShanks()
{
// Get shank from database
@@ -320,7 +330,7 @@ namespace Step.Database.Controllers
public DbNcShankModel UpdateShank(int shankId, DTONewNcShankModel dtoShank)
{
DbNcShankModel ncShank = FindShank(shankId);
DbNcShankModel ncShank = FindShankWithTools(shankId);
return UpdateShank(ncShank, dtoShank);
}
@@ -338,7 +348,7 @@ namespace Step.Database.Controllers
public void DeleteShank(int shankId)
{
DbNcShankModel shank = FindShank(shankId);
DbNcShankModel shank = FindShankWithTools(shankId);
DeleteShank(shank);
}