Filter vehicle services

Web/Controllers/FuelLogController.cs

@@ -21,17 +21,13 @@ namespace MileageTraker.Web.Controllers
 				return View("Empty");
 
 			// default parameter processing
-			if (!query.HasParameters())
-			{
-				query.FiscalYear = validLogYearMonths.First().Year;
-				query.Month = validLogYearMonths.First().Month;
-			}
+			query.SetDefaultParameters(validLogYearMonths);
 
 			var fuelLogs = DataService.GetFuelLogs();
 
 			var flvm = from fl in DataService.FilterFuelLogs(fuelLogs, query).ToList()
-						   orderby fl.Date ascending
-					   select new FuelLogIndexViewModel(fl);
+			           orderby fl.Date ascending
+			           select new FuelLogIndexViewModel(fl);
 
 			var viewModel = new FuelLogResultsViewModel(flvm, query, CustomExtensions.YearMonthList(validLogYearMonths));
 
@@ -44,11 +40,7 @@ namespace MileageTraker.Web.Controllers
 			var validLogYearMonths = DataService.GetValidFuelLogMonths();
 
 			// default parameter processing
-			if (!query.HasParameters())
-			{
-				query.FiscalYear = validLogYearMonths.First().Year;
-				query.Month = validLogYearMonths.First().Month;
-			}
+			query.SetDefaultParameters(validLogYearMonths);
 
 			var fuelLogs = DataService.GetFuelLogs();
 			var filteredLogs =

Web/Controllers/VehicleServiceController.cs

@@ -2,6 +2,8 @@
 using System.Linq;
 using System.Web.Mvc;
 using MileageTraker.Web.Attributes;
+using MileageTraker.Web.DAL;
+using MileageTraker.Web.Utility;
 using MileageTraker.Web.ViewModels.VehicleService;
 
 namespace MileageTraker.Web.Controllers
@@ -11,11 +13,21 @@ namespace MileageTraker.Web.Controllers
     {
         public ActionResult Index(VehicleServiceQueryViewModel query)
         {
-	        var vehicleServices = DataService.GetVehicleServices().ToList();
-	        var viewModel = new VehicleServiceResultsViewModel
-		        {
-			        ServiceItems = vehicleServices.Select(s => new VehicleServiceViewModel(s))
-		        };
+			var validVehicleServiceYearMonths = DataService.GetValidVehicleServiceMonths();
+
+			if (!validVehicleServiceYearMonths.Any()) // this means no logs in DB
+				return View("Empty");
+
+			// default parameter processing
+			query.SetDefaultParameters(validVehicleServiceYearMonths);
+
+			var vehicleServices = DataService.FilterVehicleServices(DataService.GetVehicleServices(), query).ToList();
+
+	        var viewModel = new VehicleServiceResultsViewModel(
+				vehicleServices.Select(s => new VehicleServiceViewModel(s)),
+				query,
+				CustomExtensions.YearMonthList(validVehicleServiceYearMonths));
+
 			return View(viewModel);
         }
 
@@ -51,7 +63,6 @@ namespace MileageTraker.Web.Controllers
 			return View(viewModel);
 		}
 
-
 		public ActionResult Edit(int id)
 		{
 			var vehicleService = DataService.GetVehicleService(id);