Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter vehicle services

Browse Source
This commit is contained in:
poprhythm
2015-10-12 18:07:20 -04:00
parent 22e4089fba
commit e008bc2242
14 changed files with 227 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/ViewModels/DateQueryViewModel.cs
+70
View File
@@ -0,0 +1,70 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace MileageTraker.Web.ViewModels
{
public class DateQueryViewModel
{
public int? Year { get; set; }
public int? Month { get; set; }
public int? MonthRange { get; set; }
public string YearMonthStart
{
get { return string.Format("{0}-{1:00}", Year, Month); }
}
public string YearMonthEnd
{
get
{
var dateTime = new DateTime(Year.Value, Month.Value, 1);
var time = dateTime.AddMonths(MonthRange.Value - 1);
return string.Format("{0}-{1:00}", time.Year, time.Month);
}
}
public override string ToString()
{
var v = new List<string>();
if (Year.HasValue && Month.HasValue)
{
var str = YearMonthStart;
if (MonthRange.HasValue && MonthRange > 1)
str += "to" + YearMonthEnd;
v.Add(str);
}
return String.Join("_", v).Replace(' ', '-');
}
public virtual bool HasParameters()
{
return Year.HasValue;
}
/// <summary>
/// Use the given list of valid dates, set the default options
/// </summary>
/// <param name="validYearMonths"></param>
public virtual void SetDefaultParameters(IList<DateTime> validYearMonths)
{
if (!HasParameters())
{
Year = validYearMonths.First().Year;
Month = validYearMonths.First().Month;
MonthRange = 1;
}
if (Year.HasValue && !Month.HasValue)
{
var validLogMonths = validYearMonths.Where(dt => dt.Year == Year).ToList();
Month = validLogMonths.Min(dt => dt.Month);
MonthRange = validLogMonths.Max(dt => dt.Month) - Month + 1;
}
}
}
}
Web/ViewModels/FuelLog/FuelLogQueryViewModel.cs
+1 -34
View File
@@ -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
+16 -8
View File
@@ -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;
}
}
Web/ViewModels/Log/LogQueryViewModel.cs
-1
View File
@@ -32,7 +32,6 @@ namespace MileageTraker.Web.ViewModels.Log
public override string ToString()
{
var v = new List<string>();
//string.Format("{0}-{1}{2}", Year, Month, LogType.HasValue ? "-" + LogType.Value.GetDisplayShortName() : "");
if (Year.HasValue && Month.HasValue)
{
Web/ViewModels/VehicleService/VehicleServiceQueryViewModel.cs
+1 -34
View File
@@ -1,39 +1,6 @@
using System;
using System.Collections.Generic;
namespace MileageTraker.Web.ViewModels.VehicleService
{
public class VehicleServiceQueryViewModel
public class VehicleServiceQueryViewModel : DateQueryViewModel
{
public int? Year { get; set; }
public int? Month { get; set; }
public string YearMonthStart {get
{
return string.Format("{0}-{1:00}", Year, Month);
}}
public override string ToString()
{
var v = new List<string>();
if (Year.HasValue && Month.HasValue)
{
var str = YearMonthStart;
v.Add(str);
}
else if (Year.HasValue)
{
v.Add(Year.ToString());
}
return String.Join("_", v).Replace(' ', '-');
}
public bool HasParameters()
{
return Year.HasValue;
}
}
}
Web/ViewModels/VehicleService/VehicleServiceResultsViewModel.cs
+28
View File
@@ -1,9 +1,37 @@
using System.Collections.Generic;
using System.Globalization;
namespace MileageTraker.Web.ViewModels.VehicleService
{
public class VehicleServiceResultsViewModel
{
public IEnumerable<VehicleServiceViewModel> ServiceItems { 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 VehicleServiceResultsViewModel(
IEnumerable<VehicleServiceViewModel> serviceItems,
VehicleServiceQueryViewModel query,
Dictionary<string, List<string>> availableYearMonths)
{
ServiceItems = serviceItems;
AvailableYearMonths = availableYearMonths;
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;
}
}
}