Filter vehicle services

Web/ViewModels/FuelLog/FuelLogQueryViewModel.cs

@@ -1,40 +1,7 @@
-using System;
-using System.Collections.Generic;
-
 namespace MileageTraker.Web.ViewModels.FuelLog
 {
-	public class FuelLogQueryViewModel
+	public class FuelLogQueryViewModel : DateQueryViewModel
 	{
-		public int? FiscalYear { get; set; }
-		public int? Month { get; set; }
 		public bool Unmatched { get; set; }
-
-		public string YearMonthStart {get
-		{
-			return string.Format("{0}-{1:00}", FiscalYear, Month);
-		}}
-
-		public override string ToString()
-		{
-			var v = new List<string>();
-
-			if (FiscalYear.HasValue && Month.HasValue)
-			{
-				var str = YearMonthStart;
-
-				v.Add(str);
-			}
-			else if (FiscalYear.HasValue)
-			{
-				v.Add(FiscalYear.ToString());
-			}
-			
-			return String.Join("_", v).Replace(' ', '-');
-		}
-
-		public bool HasParameters()
-		{
-			return FiscalYear.HasValue;
-		}
 	}
 }

Web/ViewModels/FuelLog/FuelLogResultsViewModel.cs

@@ -7,24 +7,32 @@ namespace MileageTraker.Web.ViewModels.FuelLog
 	{
 		public IEnumerable<FuelLogIndexViewModel> FuelLogs { get; set; }
 		public Dictionary<string, List<string>> AvailableYearMonths { get; set; }
-		public IEnumerable<string> SelectedYearMonths{get
+		public IEnumerable<string> SelectedYearMonths
 		{
-			if (!string.IsNullOrEmpty(FiscalYear))
-				return AvailableYearMonths[FiscalYear];
-			return new List<string>();
-		}}
+			get
+			{
+				if (!string.IsNullOrEmpty(Year))
+					return AvailableYearMonths[Year];
+				return new List<string>();
+			}
+		}
 
 		// filter parameters
-		public string FiscalYear { get; set; }
+		public string Year { get; set; }
 		public string Month { get; set; }
+		public string MonthRange { get; set; }
 		public bool Unmatched { get; set; }
 
-		public FuelLogResultsViewModel(IEnumerable<FuelLogIndexViewModel> fuelLogs, FuelLogQueryViewModel query, Dictionary<string, List<string>> availableYearMonths)
+		public FuelLogResultsViewModel(
+			IEnumerable<FuelLogIndexViewModel> fuelLogs, 
+			FuelLogQueryViewModel query,
+			Dictionary<string, List<string>> availableYearMonths)
 		{
 			FuelLogs = fuelLogs;
 			AvailableYearMonths = availableYearMonths;
-			FiscalYear = query.FiscalYear.HasValue ? query.FiscalYear.Value.ToString(CultureInfo.InvariantCulture) : string.Empty;
+			Year = query.Year.HasValue ? query.Year.Value.ToString(CultureInfo.InvariantCulture) : string.Empty;
 			Month = query.Month.HasValue ? query.Month.Value.ToString(CultureInfo.InvariantCulture) : string.Empty;
+			MonthRange = query.MonthRange.HasValue ? query.MonthRange.Value.ToString(CultureInfo.InvariantCulture) : string.Empty;
 			Unmatched = query.Unmatched;
 		}
 	}