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

Update Search Previous/Next log logic.

Browse Source
This commit is contained in:
poprhythm
2012-12-14 15:00:33 -05:00
parent dc77c3d84a
commit 62c5f9f829
1 changed files with 12 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
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