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

Refactor

Browse Source
This commit is contained in:
Lucio Maranta
2018-02-20 17:03:03 +01:00
parent a1b66231a3
commit 76b51ea3c5
21 changed files with 84 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Database/Controllers/MachinesController.cs
-1
View File
@@ -42,7 +42,6 @@ namespace Step.Database.Controllers
// Create database machine model
MachineModel machine = new MachineModel()
{
MachineId = 1,
Model = NcConfig.NcName,
UniqueId = uniqueId
};
Step.Database/Controllers/MachinesUsersController.cs
+2 -1
View File
@@ -44,7 +44,8 @@ namespace Step.Database.Controllers
public MachineUserModel Create(int machineId, int userId, int roleId)
{
// Create database model
MachineUserModel machine = new MachineUserModel() {
MachineUserModel machine = new MachineUserModel()
{
MachineId = machineId,
UserId = userId,
RoleId = roleId
Step.Database/Controllers/MaintenancesController.cs
+5 -8
View File
@@ -1,6 +1,4 @@
using Step.Model.ConfigModels;
using Step.Model.DatabaseModels;
using Step.Model.DTOModels;
using Step.Model.DatabaseModels;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -29,7 +27,7 @@ namespace Step.Database.Controllers
List<PerformedMaintenanceModel> lastMaintenances = new List<PerformedMaintenanceModel>();
// Find last performed maintenance
lastMaintenances = (from maintenances in dbCtx.PerformedMaintenances
where maintenances.Date == (from m1 in dbCtx.PerformedMaintenances // Select max data of performed maintenance
where maintenances.Date == (from m1 in dbCtx.PerformedMaintenances // Select max data of performed maintenance
where m1.MaintenanceId == maintenances.MaintenanceId
select m1.Date
).Max()
@@ -58,7 +56,7 @@ namespace Step.Database.Controllers
.Maintenances
.ToList();
// Find database rows that
// Find database rows that
List<MaintenanceModel> toDeleteMaint = dbMaintenances.Where(x =>
!MaintenancesConfig.Select(y => y.Id).Contains(x.MaintenanceId)
).ToList();
@@ -68,7 +66,7 @@ namespace Step.Database.Controllers
dbCtx.Maintenances.Remove(item);
dbCtx.SaveChanges();
// Find common data from
// Find common data from
List<MaintenanceModel> toUpdateMaint = dbMaintenances.Where(x =>
MaintenancesConfig.Select(y => y.Id).Contains(x.MaintenanceId)
)
@@ -90,7 +88,6 @@ namespace Step.Database.Controllers
old.Type = x.Type;
old.CounterId = x.CouterId;
return old;
}).FirstOrDefault();
}
@@ -130,4 +127,4 @@ namespace Step.Database.Controllers
}
}
}
}
}