Merge branch 'VehiclePreviousLog' into StyleUpdate

Web/DAL/DataService.cs

@@ -263,11 +263,12 @@ namespace MileageTraker.Web.DAL
 		{
 			return (from pl in _db.Logs
 			        where pl.VehicleId == vehicleId &&
-			              ((pl.Date <= date && pl.EndOdometer < endOdometer)
-			               || (pl.EndOdometer == endOdometer && pl.Created < created)) &&
-			              pl.LogId != excludeLogId
-			        orderby pl.EndOdometer descending, pl.Created descending
-			        select pl).FirstOrDefault();
+			              ((pl.EndOdometer < endOdometer && pl.Date <= date)
+						   || (pl.EndOdometer == endOdometer && pl.Date < date)
+						   || (pl.EndOdometer == endOdometer && pl.Date == date && pl.Created < created))
+			        orderby pl.EndOdometer descending, pl.Date descending, pl.Created descending
+			        select pl)
+					.FirstOrDefault(l => !excludeLogId.HasValue || l.LogId != excludeLogId.Value);
 		}
 
 		public Log SearchNextLog(Log current)
@@ -282,11 +283,12 @@ namespace MileageTraker.Web.DAL
 		{
 			return (from nl in GetLogs()
 			        where nl.VehicleId == vehicleId &&
-			              ((nl.Date >= date && nl.EndOdometer > endOdometer)
-			               || (nl.EndOdometer == endOdometer && nl.Created > created)) &&
-			              nl.LogId != excludeLogId
-			        orderby nl.EndOdometer ascending, nl.Created ascending 
-			        select nl).FirstOrDefault();
+			              ((nl.EndOdometer > endOdometer && nl.Date >= date)
+						   || (nl.EndOdometer == endOdometer && nl.Date > date)
+						   || (nl.EndOdometer == endOdometer && nl.Date >= date && nl.Created > created)) 
+			        orderby nl.EndOdometer ascending, nl.Date ascending, nl.Created ascending 
+			        select nl)
+					.FirstOrDefault(l => !excludeLogId.HasValue || l.LogId != excludeLogId.Value);
 		}
 
 		#endregion

Web/Utility/ExcelWriter.cs

@@ -36,6 +36,7 @@ namespace MileageTraker.Web.Utility
 			var properties =
 				typeof(T).GetProperties()
 					.Where(p => !p.PropertyType.IsCollection())
+					.Where(p => !p.Name.Contains("PreviousLog"))
 					.ToList();
 
 			properties.Zip(