Replace Log.EmployeeName with Log.User, drop from database

Web/DAL/DataService.cs

@@ -186,7 +186,7 @@ namespace MileageTraker.Web.DAL
 					from log in FilterLogs(_db.Logs, query)
 					let previousLog = log.VehiclePreviousLog
 					select new { log, previousLog, miles = (previousLog != null ? log.EndOdometer - previousLog.EndOdometer : 0) }
-				group l by l.log.EmployeeName
+				group l by l.log.User
 				into g
 				let miles = g.Sum(l => l.miles)
 				let gasPurchased = g.Sum(l => l.log.GasPurchased)
@@ -198,7 +198,7 @@ namespace MileageTraker.Web.DAL
 				select
 					new
 					{
-						EmployeeName = g.Key,
+						User = g.Key,
 						GasPurchased = gasPurchased,
 						Miles = miles,
 						LogPairs = logPairs
@@ -206,7 +206,7 @@ namespace MileageTraker.Web.DAL
 
 			return items.ToList().Select(i => new EmployeeMileageItem
 			{
-				EmployeeName = i.EmployeeName,
+				EmployeeName = i.User.FullName,
 				GasPurchased = i.GasPurchased,
 				Miles = i.Miles,
 				LogPairs = i.LogPairs.ToList()
@@ -251,7 +251,7 @@ namespace MileageTraker.Web.DAL
 		{
 			return
 				(from l in _db.Logs
-				 where l.EmployeeName == employeeName
+				 where l.User.FullName == employeeName
 				 orderby l.Created descending
 				 select l)
 					.Take(3)
@@ -355,7 +355,7 @@ namespace MileageTraker.Web.DAL
 					String.Format(
 						"Odometer of {0} miles on {1:d} conflicts with other logs for vehicle {2}" +
 						", including an odometer log of {3} miles on {4:d} reported by {5}.",
-						odometer, date, vehicleId, conflictingLog.EndOdometer, conflictingLog.Date, conflictingLog.EmployeeName));
+						odometer, date, vehicleId, conflictingLog.EndOdometer, conflictingLog.Date, conflictingLog.User.FullName));
 			}
 		}
 
@@ -406,8 +406,8 @@ namespace MileageTraker.Web.DAL
 		{
 			var names = _db.Vehicles.Select(v => v.Assigned).Where(n => !String.IsNullOrEmpty(n) && n != "to be sold");
 			var logNames = 
-				(from l in _db.Logs
-				select l.EmployeeName);
+				(from l in _db.Users
+				select l.FullName);
 			return names.Union(logNames).Distinct();
 		}
 

Web/DAL/MileageTrakerInitializer.cs

@@ -42,7 +42,8 @@ namespace MileageTraker.Web.DAL
 			{
 				context.Cities.Add(city);
 			}
-			
+
+			/* // make some random logs
 			var random = new Random(10);
 			foreach (var vehicle in vehicles.Where(v => v.Assigned != null))
 			{
@@ -71,19 +72,18 @@ namespace MileageTraker.Web.DAL
 						city = cities.OrderBy(c => Guid.NewGuid()).First();
 
 					var log = new Log
-					          	{
+								{
 									CityName = city.Name,
-					          		Date = date,
-									EmployeeName = driver,
-					          		EndOdometer = odom,
-					          		GasPurchased = gas,
+									Date = date,
+									EndOdometer = odom,
+									GasPurchased = gas,
 									LogType = logType,
-					          		VehicleId = vehicle.VehicleId,
-					          		Source = "Autogenerated",
-					          		UserAgent = "IE",
-					          		UserHostAddress = "127.0.0.1",
+									VehicleId = vehicle.VehicleId,
+									Source = "Autogenerated",
+									UserAgent = "IE",
+									UserHostAddress = "127.0.0.1",
 									Created = date
-					          	};
+								};
 					context.Logs.Add(log);
 
 					date += new TimeSpan(random.Next(15), 0, 0, 0);
@@ -92,7 +92,7 @@ namespace MileageTraker.Web.DAL
 					odom += random.Next(25) + 25;
 				}
 			}
-			context.SaveChanges();
-		}
+			context.SaveChanges(); */
+		} 
 	}
 }