Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'VehiclePreviousLog' into StyleUpdate

Browse Source
This commit is contained in:
poprhythm
2012-12-16 13:46:03 -05:00
parent ac978234b8 62c5f9f829
commit 7f7ae6d3c2
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/DAL/DataService.cs
+12 -10
View File
@@ -263,11 +263,12 @@ namespace MileageTraker.Web.DAL
{ {
return (from pl in _db.Logs return (from pl in _db.Logs
where pl.VehicleId == vehicleId && where pl.VehicleId == vehicleId &&
((pl.Date <= date && pl.EndOdometer < endOdometer) ((pl.EndOdometer < endOdometer && pl.Date <= date)
|| (pl.EndOdometer == endOdometer && pl.Created < created)) && || (pl.EndOdometer == endOdometer && pl.Date < date)
pl.LogId != excludeLogId || (pl.EndOdometer == endOdometer && pl.Date == date && pl.Created < created))
orderby pl.EndOdometer descending, pl.Created descending orderby pl.EndOdometer descending, pl.Date descending, pl.Created descending
select pl).FirstOrDefault(); select pl)
.FirstOrDefault(l => !excludeLogId.HasValue || l.LogId != excludeLogId.Value);
} }
public Log SearchNextLog(Log current) public Log SearchNextLog(Log current)
@@ -282,11 +283,12 @@ namespace MileageTraker.Web.DAL
{ {
return (from nl in GetLogs() return (from nl in GetLogs()
where nl.VehicleId == vehicleId && where nl.VehicleId == vehicleId &&
((nl.Date >= date && nl.EndOdometer > endOdometer) ((nl.EndOdometer > endOdometer && nl.Date >= date)
|| (nl.EndOdometer == endOdometer && nl.Created > created)) && || (nl.EndOdometer == endOdometer && nl.Date > date)
nl.LogId != excludeLogId || (nl.EndOdometer == endOdometer && nl.Date >= date && nl.Created > created))
orderby nl.EndOdometer ascending, nl.Created ascending orderby nl.EndOdometer ascending, nl.Date ascending, nl.Created ascending
select nl).FirstOrDefault(); select nl)
.FirstOrDefault(l => !excludeLogId.HasValue || l.LogId != excludeLogId.Value);
} }
#endregion #endregion
Web/Utility/ExcelWriter.cs
+1
View File
@@ -36,6 +36,7 @@ namespace MileageTraker.Web.Utility
var properties = var properties =
typeof(T).GetProperties() typeof(T).GetProperties()
.Where(p => !p.PropertyType.IsCollection()) .Where(p => !p.PropertyType.IsCollection())
.Where(p => !p.Name.Contains("PreviousLog"))
.ToList(); .ToList();
properties.Zip( properties.Zip(