added maintainer data to closed maintenances

This commit is contained in:
Lucio Maranta
2018-12-17 16:11:46 +01:00
parent 2a32268fb2
commit 79bcf7d2fa
5 changed files with 8 additions and 5 deletions
Binary file not shown.
@@ -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;
}
@@ -37,5 +37,7 @@ namespace Step.Model.DTOModels.MaintenanceModels
public bool CanEdit { get; set; }
public bool CanPerform { get; set; }
public DTOMessageUserModel User { get; set; }
}
}
+2 -1
View File
@@ -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
});
}
}
+1 -3
View File
@@ -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
}
}
}
}
}