Filter vehicle services

2015-10-12 18:07:20 -04:00
parent 22e4089fba
commit e008bc2242
14 changed files with 227 additions and 119 deletions
@@ -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;
 		}
 	}