Replace more Employee with Driver

This commit is contained in:
2013-02-11 14:45:06 -05:00
parent e6d911cb05
commit 36e277a442
8 changed files with 12 additions and 14 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ namespace MileageTraker.Web.Controllers
public ActionResult MonthlyDriverMileage(LogQueryViewModel query)
{
var items = DataService.GetMonthlyEmployeeMileageItems(query);
var items = DataService.GetMonthlyDriverMileageItems(query);
var report = new DriverMileageViewModel(items, query);
+3 -3
View File
@@ -188,7 +188,7 @@ namespace MileageTraker.Web.DAL
});
}
public IEnumerable<EmployeeMileageItem> GetMonthlyEmployeeMileageItems(LogQueryViewModel query)
public IEnumerable<DriverMileageItem> GetMonthlyDriverMileageItems(LogQueryViewModel query)
{
var items =
from l in
@@ -213,9 +213,9 @@ namespace MileageTraker.Web.DAL
LogPairs = logPairs
};
return items.ToList().Select(i => new EmployeeMileageItem
return items.ToList().Select(i => new DriverMileageItem
{
EmployeeName = i.User.FullName,
DriverName = i.User.FullName,
GasPurchased = i.GasPurchased,
Miles = i.Miles,
LogPairs = i.LogPairs.ToList()
@@ -4,9 +4,9 @@ using System.Linq;
namespace MileageTraker.Web.ViewModels
{
public class EmployeeMileageItem
public class DriverMileageItem
{
public string EmployeeName { get; set; }
public string DriverName { get; set; }
public int Miles { get; set; }
public double GasPurchased { get; set; }
public IEnumerable<Tuple<Models.Log, Models.Log>> LogPairs { get; set; }
+2 -2
View File
@@ -6,13 +6,13 @@ namespace MileageTraker.Web.ViewModels
{
public class DriverMileageViewModel
{
public IEnumerable<EmployeeMileageItem> Items { get; set; }
public IEnumerable<DriverMileageItem> Items { get; set; }
public LogQueryViewModel Query { get; set; }
public int TotalMiles { get { return Items.Sum(i => i.Miles); } }
public double TotalGasPurchased { get { return Items.Sum(i => i.GasPurchased); } }
public DriverMileageViewModel(IEnumerable<EmployeeMileageItem> items, LogQueryViewModel query)
public DriverMileageViewModel(IEnumerable<DriverMileageItem> items, LogQueryViewModel query)
{
Items = items;
Query = query;
-2
View File
@@ -19,8 +19,6 @@ namespace MileageTraker.Web.ViewModels.Log
public string CityName { get; set; }
//public string EmployeeName { get; set; }
public virtual Models.User User { get; set; }
public double GasPurchased { get; set; }
+2 -2
View File
@@ -22,8 +22,8 @@ namespace MileageTraker.Web.ViewModels.Log
public string CityName { get; set; }
[Display(Name = "Employee / Driver")]
public string EmployeeName { get; set; }
[Display(Name = "Driver")]
public string UserFullName { get; set; }
[DisplayFormat(DataFormatString = "{0:0.000}", ApplyFormatInEditMode = true)]
public double GasPurchased { get; set; }
+1 -1
View File
@@ -46,7 +46,7 @@
{
<tr>
<td>
@Html.DisplayTextFor(i => item.EmployeeName)
@Html.DisplayTextFor(i => item.DriverName)
</td>
<td>
@Html.DisplayTextFor(i => item.TripCount)
+1 -1
View File
@@ -161,7 +161,7 @@
<Compile Include="ViewModels\Account\NewPasswordViewModel.cs" />
<Compile Include="ViewModels\Account\RegisterModel.cs" />
<Compile Include="ViewModels\CheckBoxViewModel.cs" />
<Compile Include="ViewModels\EmployeeMileageItem.cs" />
<Compile Include="ViewModels\DriverMileageItem.cs" />
<Compile Include="ViewModels\DriverMileageViewModel.cs" />
<Compile Include="ViewModels\Log\LogViewModel.cs" />
<Compile Include="ViewModels\Log\LogIndexViewModel.cs" />