Merge

2013-02-17 14:30:25 -05:00
parent 07a7577d2d
commit 84e460bb51
7 changed files with 57 additions and 28 deletions
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using MileageTraker.Web.ViewModels.Vehicle;
@@ -8,10 +7,21 @@ namespace MileageTraker.Web.ViewModels
 	public class DriverMileageItem
 	{
 		public string DriverName { get; set; }
-		public int Miles { get; set; }
-		public double GasPurchased { get; set; }
-		public IEnumerable<Tuple<Models.Log, Models.Log>> LogPairs { get; set; }
 		public IEnumerable<VehicleMileageItem> VehicleMileageItems { get; set; }
-		public int TripCount { get { return LogPairs.Count(); } }
+
+		public int Miles
+		{
+			get { return VehicleMileageItems.Sum(i => i.Miles); }
+		}
+
+		public double GasPurchased
+		{
+			get { return VehicleMileageItems.Sum(i => i.GasPurchased); }
+		}
+
+		public int TripCount
+		{
+			get { return VehicleMileageItems.Sum(i => i.LogPairs.Count()); }
+		}
 	}
 }