diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index ce754e00..54a976eb 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Database/Controllers/MaintenancesController.cs b/Step.Database/Controllers/MaintenancesController.cs index b86d0df1..b9caa86f 100644 --- a/Step.Database/Controllers/MaintenancesController.cs +++ b/Step.Database/Controllers/MaintenancesController.cs @@ -36,7 +36,9 @@ namespace Step.Database.Controllers where m1.MaintenanceId == maintenances.MaintenanceId select m1.Date ).Max() - select maintenances).ToList(); + select maintenances) + .Include("Maintainer") + .ToList(); return lastMaintenances; } diff --git a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs index 3a1b0890..a3df2284 100644 --- a/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs +++ b/Step.Model/DTOModels/MaintenanceModels/DTOMaintenanceModel.cs @@ -37,5 +37,7 @@ namespace Step.Model.DTOModels.MaintenanceModels public bool CanEdit { get; set; } public bool CanPerform { get; set; } + + public DTOMessageUserModel User { get; set; } } } \ No newline at end of file diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index 2b154b74..534bf903 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -1062,7 +1062,8 @@ namespace Step.NC PlcCounter = counter.Value, CreatedByCms = currMaintenance.UserId == null, CanEdit = canEdit, - CanPerform = canPerform + CanPerform = canPerform, + User = performed?.Maintainer == null ? null : (DTOMessageUserModel)performed.Maintainer }); } } diff --git a/Step/WebApiUnhandledExceptionHandler.cs b/Step/WebApiUnhandledExceptionHandler.cs index c5c54ec0..995a238c 100644 --- a/Step/WebApiUnhandledExceptionHandler.cs +++ b/Step/WebApiUnhandledExceptionHandler.cs @@ -6,8 +6,6 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.ExceptionHandling; -using System.Web.Http.Filters; -using static Step.Utils.ExceptionManager; namespace Step { @@ -45,4 +43,4 @@ namespace Step } } } -} +} \ No newline at end of file