Improved filtering implemented.

Web/ViewModels/Log/LogResultsViewModel.cs

@@ -1,14 +1,50 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.Mvc;
+using MiscUtil.Collections;
 
 namespace MileageTraker.Web.ViewModels.Log
 {
 	public class LogResultsViewModel
 	{
-		public IEnumerable<int> Years { get; set; }
-		public IEnumerable<int> Months { get; set; }
 		public IEnumerable<LogIndexViewModel> Logs { get; set; }
-		public int SelectedYear { get; set; }
-		public int SelectedMonth { get; set; }
-		public string SelectedLogType { get; set; }
+		public Dictionary<string, List<string>> AvailableYearMonths { get; set; }
+		public IEnumerable<string> SelectedYearMonths{get
+		{
+			if (!string.IsNullOrEmpty(Year))
+				return AvailableYearMonths[Year];
+			return new List<string>();
+		}}
+
+		// filter parameters
+		public string Year { get; set; }
+		public string Month { get; set; }
+		public string MonthRange { get; set; }
+		public string LogType { get; set; }
+		public string VehicleId { get; set; }
+		public string EmployeeName { get; set; }
+
+		public LogResultsViewModel(IEnumerable<LogIndexViewModel> logs, LogQueryViewModel query, Dictionary<string, List<string>> availableYearMonths)
+		{
+			Logs = logs;
+			AvailableYearMonths = availableYearMonths;
+			Year = query.Year.HasValue ? query.Year.Value.ToString() : string.Empty;
+			Month = query.Month.HasValue ? query.Month.Value.ToString() : string.Empty;
+			MonthRange = query.MonthRange.HasValue ? query.MonthRange.Value.ToString() : string.Empty;
+			LogType = query.LogType.ToString();
+			EmployeeName = query.EmployeeName;
+			VehicleId = query.VehicleId;
+		}
+
+		public bool SecondRowSet
+		{
+			get
+			{
+				return !string.IsNullOrEmpty(LogType) ||
+				       !string.IsNullOrEmpty(VehicleId) ||
+				       !string.IsNullOrEmpty(EmployeeName);
+			}
+		}
 	}
 }