From dc77c3d84a450c8918113f0f7722ee81a0dc65d9 Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Fri, 7 Dec 2012 21:38:21 -0500 Subject: [PATCH 1/2] Fix Excel export for Log with the new VehiclePreviousLog property --- Web/Utility/ExcelWriter.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Web/Utility/ExcelWriter.cs b/Web/Utility/ExcelWriter.cs index 2f21dd0..d2526d3 100644 --- a/Web/Utility/ExcelWriter.cs +++ b/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( From 62c5f9f82928a26d52d31679c0670d4ff37d5b1a Mon Sep 17 00:00:00 2001 From: James Kolpack Date: Fri, 14 Dec 2012 15:00:33 -0500 Subject: [PATCH 2/2] Update Search Previous/Next log logic. --- Web/DAL/DataService.cs | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Web/DAL/DataService.cs b/Web/DAL/DataService.cs index ad0c143..78ca4a9 100644 --- a/Web/DAL/DataService.cs +++ b/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