Merge

Web/DAL/DataService.cs

@@ -196,13 +196,6 @@ namespace MileageTraker.Web.DAL
 					let previousLog = log.VehiclePreviousLog
 					select new { log, previousLog, miles = (previousLog != null ? log.EndOdometer - previousLog.EndOdometer : 0) }
 				group l by l.log.User into g
-				let miles = g.Sum(l => l.miles)
-				let gasPurchased = g.Sum(l => l.log.GasPurchased)
-				where miles > 0 || gasPurchased > 0
-				let logPairs =
-					from i in g
-					orderby i.log.Date descending, i.log.EndOdometer descending
-					select new { PreviousLog = i.previousLog, Log = i.log }
 				let vehicleLogs =
 					from i in g
 					group i by i.log.VehicleId into v
@@ -211,7 +204,7 @@ namespace MileageTraker.Web.DAL
 					let vehicleProg = vehicle.Prog
 					let vehicleMiles = v.Sum(l => l.miles)
 					let vehicleGasPurchased = v.Sum(l => l.log.GasPurchased)
-					where miles > 0 || gasPurchased > 0
+					where vehicleMiles > 0 || vehicleGasPurchased > 0
 					let vehicleLogPairs =
 						from i in v
 						orderby i.log.Date descending, i.log.EndOdometer descending
@@ -228,19 +221,12 @@ namespace MileageTraker.Web.DAL
 					new
 					{
 						User = g.Key,
-						GasPurchased = gasPurchased,
-						Miles = miles,
-						LogPairs = logPairs,
 						VehicleLogs = vehicleLogs
 					};
 
 			return items.ToList().Select(i => new DriverMileageItem
 			{
 				DriverName = i.User.FullName,
-				GasPurchased = i.GasPurchased,
-				Miles = i.Miles,
-				LogPairs = i.LogPairs.ToList()
-					.Select(lp => new Tuple<Log, Log>(lp.PreviousLog, lp.Log)),
 				VehicleMileageItems = i.VehicleLogs.ToList().Select(v => new VehicleMileageItem
 					{
 						VehicleId = v.VehicleId,