From 36e277a442fa595ed33dc136cec4ddbff846ba50 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Mon, 11 Feb 2013 14:45:06 -0500
Subject: [PATCH] Replace more Employee with Driver

---
 Web/Controllers/LogController.cs                            | 2 +-
 Web/DAL/DataService.cs                                      | 6 +++---
 .../{EmployeeMileageItem.cs => DriverMileageItem.cs}        | 4 ++--
 Web/ViewModels/DriverMileageViewModel.cs                    | 4 ++--
 Web/ViewModels/Log/LogIndexViewModel.cs                     | 2 --
 Web/ViewModels/Log/LogPartialDetails.cs                     | 4 ++--
 Web/Views/Log/MonthlyDriverMileage.cshtml                   | 2 +-
 Web/Web.csproj                                              | 2 +-
 8 files changed, 12 insertions(+), 14 deletions(-)
 rename Web/ViewModels/{EmployeeMileageItem.cs => DriverMileageItem.cs} (80%)

diff --git a/Web/Controllers/LogController.cs b/Web/Controllers/LogController.cs
index e01cfe9..a8615ab 100644
--- a/Web/Controllers/LogController.cs
+++ b/Web/Controllers/LogController.cs
@@ -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);
 
diff --git a/Web/DAL/DataService.cs b/Web/DAL/DataService.cs
index 6c955c2..73acd92 100644
--- a/Web/DAL/DataService.cs
+++ b/Web/DAL/DataService.cs
@@ -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()
diff --git a/Web/ViewModels/EmployeeMileageItem.cs b/Web/ViewModels/DriverMileageItem.cs
similarity index 80%
rename from Web/ViewModels/EmployeeMileageItem.cs
rename to Web/ViewModels/DriverMileageItem.cs
index 5c7810d..a60b036 100644
--- a/Web/ViewModels/EmployeeMileageItem.cs
+++ b/Web/ViewModels/DriverMileageItem.cs
@@ -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; }
diff --git a/Web/ViewModels/DriverMileageViewModel.cs b/Web/ViewModels/DriverMileageViewModel.cs
index 3cb59ad..4852201 100644
--- a/Web/ViewModels/DriverMileageViewModel.cs
+++ b/Web/ViewModels/DriverMileageViewModel.cs
@@ -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;
diff --git a/Web/ViewModels/Log/LogIndexViewModel.cs b/Web/ViewModels/Log/LogIndexViewModel.cs
index f786f30..2ee1cc0 100644
--- a/Web/ViewModels/Log/LogIndexViewModel.cs
+++ b/Web/ViewModels/Log/LogIndexViewModel.cs
@@ -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; }
diff --git a/Web/ViewModels/Log/LogPartialDetails.cs b/Web/ViewModels/Log/LogPartialDetails.cs
index 6f044ad..c7b4236 100644
--- a/Web/ViewModels/Log/LogPartialDetails.cs
+++ b/Web/ViewModels/Log/LogPartialDetails.cs
@@ -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; }
diff --git a/Web/Views/Log/MonthlyDriverMileage.cshtml b/Web/Views/Log/MonthlyDriverMileage.cshtml
index 4433d5c..254dc9a 100644
--- a/Web/Views/Log/MonthlyDriverMileage.cshtml
+++ b/Web/Views/Log/MonthlyDriverMileage.cshtml
@@ -46,7 +46,7 @@
     {
         <tr>
 			<td>
-				@Html.DisplayTextFor(i => item.EmployeeName)
+				@Html.DisplayTextFor(i => item.DriverName)
 			</td>
             <td>
                 @Html.DisplayTextFor(i => item.TripCount)
diff --git a/Web/Web.csproj b/Web/Web.csproj
index d0ace1d..e06328f 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -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" />