Added 8 bit status
Added update tool status & life thread/signalR
This commit is contained in:
@@ -228,13 +228,7 @@ namespace Step.Database.Controllers
|
||||
|
||||
// Update db model
|
||||
SupportFunctions.CopyProperties(dtoTool, tool);
|
||||
//tool.FamilyId = dtoTool.FamilyId;
|
||||
//tool.OffsetLength = dtoTool.OffsetLength;
|
||||
//tool.ResidualLife = dtoTool.ResidualLife;
|
||||
//tool.ResidualRevive = dtoTool.ResidualRevive;
|
||||
//tool.OffsetId1 = dtoTool.OffsetId1;
|
||||
//tool.OffsetId2 = dtoTool.OffsetId2;
|
||||
//tool.OffsetId3 = dtoTool.OffsetId3;
|
||||
|
||||
// Save
|
||||
dbCtx.SaveChanges();
|
||||
|
||||
@@ -258,21 +252,20 @@ namespace Step.Database.Controllers
|
||||
{
|
||||
DbNcFamilyModel dbFamily = (DbNcFamilyModel)family;
|
||||
dbCtx.Families.Add(dbFamily);
|
||||
|
||||
|
||||
dbCtx.SaveChanges();
|
||||
dbCtx.Families.Attach(dbFamily);
|
||||
|
||||
|
||||
return dbFamily;
|
||||
}
|
||||
|
||||
public DbNcFamilyModel UpdateFamily(int familyId, DTONewNcFamilyModel family)
|
||||
{
|
||||
DbNcFamilyModel dbFamily = FindFamily(familyId);
|
||||
|
||||
// Copy data from NewModel to DbModel
|
||||
SupportFunctions.CopyProperties(family, dbFamily);
|
||||
|
||||
dbCtx.SaveChanges();
|
||||
|
||||
// Connect tools data
|
||||
dbCtx.Entry(dbFamily).Collection(x => x.Tools).Load();
|
||||
|
||||
return dbFamily;
|
||||
@@ -390,5 +383,16 @@ namespace Step.Database.Controllers
|
||||
dbCtx.MagazinePositions.AddRange(config);
|
||||
dbCtx.SaveChanges();
|
||||
}
|
||||
|
||||
public void UpdateToolsData(List<DbNcToolModel> tools)
|
||||
{
|
||||
foreach (var tool in tools)
|
||||
{
|
||||
DbNcToolModel tmpTool = dbCtx.Tools.Where(x => x.ToolId == tool.ToolId).FirstOrDefault();
|
||||
tmpTool = tool;
|
||||
}
|
||||
|
||||
dbCtx.SaveChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user