Users { get; set; }
}
diff --git a/Web/ViewModels/Log/LogIndexViewModel.cs b/Web/ViewModels/Log/LogIndexViewModel.cs
index c68198a..f786f30 100644
--- a/Web/ViewModels/Log/LogIndexViewModel.cs
+++ b/Web/ViewModels/Log/LogIndexViewModel.cs
@@ -19,7 +19,9 @@ namespace MileageTraker.Web.ViewModels.Log
public string CityName { get; set; }
- public string EmployeeName { get; set; }
+ //public string EmployeeName { get; set; }
+
+ public virtual Models.User User { get; set; }
public double GasPurchased { get; set; }
diff --git a/Web/Views/Log/Index.cshtml b/Web/Views/Log/Index.cshtml
index 0c83779..6d0d069 100644
--- a/Web/Views/Log/Index.cshtml
+++ b/Web/Views/Log/Index.cshtml
@@ -56,7 +56,7 @@
grid.Column("GasPurchased", "Gas", item => item.GasPurchased > 0 ? String.Format("{0:0.000}", item.GasPurchased) : string.Empty),
grid.Column("Date", format: item => item.Date.ToString("d")),
grid.Column("CityName", "City Name"),
- grid.Column("EmployeeName", "Employee Name"),
+ grid.Column("EmployeeName", "Employee Name", item => item.User != null ? item.User.FullName : ""),
grid.Column(format:
@
@Html.ActionLink("Edit", "Edit", new { id = item.LogId }, new { @class = "btn btn-mini" })
diff --git a/Web/Web.csproj b/Web/Web.csproj
index c22d45f..640f8c2 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -139,6 +139,10 @@
201212261822498_AddMembership.cs
+
+
+ 201301031939259_AddLogUser.cs
+