From ad13d9f5b4fa68a73201e21e2b52facac64d6011 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Fri, 23 Oct 2015 12:39:07 -0400
Subject: [PATCH] Clean up reports

---
 Web/Controllers/LogController.cs              |  4 ++--
 Web/ViewModels/Log/LogQueryViewModel.cs       | 23 +++++++++++++++++++
 ...eage.cshtml => DriverMileageReport.cshtml} |  5 ++--
 Web/Views/Log/Index.cshtml                    |  4 ++--
 ...age.cshtml => VehicleMileageReport.cshtml} |  8 +++----
 Web/Web.csproj                                |  4 ++--
 6 files changed, 36 insertions(+), 12 deletions(-)
 rename Web/Views/Log/{MonthlyDriverMileage.cshtml => DriverMileageReport.cshtml} (91%)
 rename Web/Views/Log/{MonthlyVehicleMileage.cshtml => VehicleMileageReport.cshtml} (86%)

diff --git a/Web/Controllers/LogController.cs b/Web/Controllers/LogController.cs
index 3958757..fab7920 100644
--- a/Web/Controllers/LogController.cs
+++ b/Web/Controllers/LogController.cs
@@ -67,7 +67,7 @@ namespace MileageTraker.Web.Controllers
 			return File(export, "application/ms-excel", name + ".xls");
 		}
 
-		public ViewResult MonthlyVehicleMileage(LogQueryViewModel query)
+		public ViewResult VehicleMileageReport(LogQueryViewModel query)
 		{
 			var items = DataService.GetMonthlyVehicleMileageItems(query);
 
@@ -89,7 +89,7 @@ namespace MileageTraker.Web.Controllers
 			return File(export, "application/ms-excel", name + ".xls");
 		}
 
-		public ActionResult MonthlyDriverMileage(LogQueryViewModel query)
+		public ActionResult DriverMileageReport(LogQueryViewModel query)
 		{
 			var items = DataService.GetMonthlyDriverMileageItems(query);
 			items = items.OrderBy(i => i.DriverName);
diff --git a/Web/ViewModels/Log/LogQueryViewModel.cs b/Web/ViewModels/Log/LogQueryViewModel.cs
index b6c4c10..ab43d74 100644
--- a/Web/ViewModels/Log/LogQueryViewModel.cs
+++ b/Web/ViewModels/Log/LogQueryViewModel.cs
@@ -62,5 +62,28 @@ namespace MileageTraker.Web.ViewModels.Log
 			       !string.IsNullOrEmpty(EmployeeName) ||
 			       !string.IsNullOrEmpty(VehicleId);
 		}
+
+		public LogQueryViewModel Clone()
+		{
+			return new LogQueryViewModel
+				{
+					EmployeeName = EmployeeName,
+					LogType = LogType,
+					Month = Month,
+					MonthRange = MonthRange,
+					VehicleId = VehicleId,
+					Year = Year
+				};
+		}
+
+		public LogQueryViewModel CloneSet(string vehicleId = null, string employeeName = null)
+		{
+			var clone = Clone();
+			if (vehicleId != null)
+				clone.VehicleId = vehicleId;
+			if (employeeName != null)
+				clone.EmployeeName = employeeName;
+			return clone;
+		}
 	}
 }
\ No newline at end of file
diff --git a/Web/Views/Log/MonthlyDriverMileage.cshtml b/Web/Views/Log/DriverMileageReport.cshtml
similarity index 91%
rename from Web/Views/Log/MonthlyDriverMileage.cshtml
rename to Web/Views/Log/DriverMileageReport.cshtml
index 591d959..5a147e6 100644
--- a/Web/Views/Log/MonthlyDriverMileage.cshtml
+++ b/Web/Views/Log/DriverMileageReport.cshtml
@@ -46,8 +46,9 @@
                     @Html.DisplayTextFor(i => vehicleItem.TripCount)
                 </td>
 	            <td>
-                    @Html.DisplayTextFor(i => vehicleItem.Miles)
-                </td>
+		            @Html.DisplayTextFor(i => vehicleItem.Miles)
+		            <small>@Html.ActionLink("Logs", "Index", Model.Query.CloneSet(vehicleItem.VehicleId, item.DriverName), new {@class="no-print"})</small>
+	            </td>
                 <td>
                     @Html.DisplayTextFor(i => vehicleItem.GasPurchased)
                 </td>
diff --git a/Web/Views/Log/Index.cshtml b/Web/Views/Log/Index.cshtml
index 40ff107..8262cc9 100644
--- a/Web/Views/Log/Index.cshtml
+++ b/Web/Views/Log/Index.cshtml
@@ -42,10 +42,10 @@
         <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Report <i class="fa fa-caret-down"></i></a>
         <ul class="dropdown-menu">
             <li>
-                @Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", queryParams)
+                @Html.ActionLink("Vehicle Mileage", "VehicleMileageReport", queryParams)
             </li>
             <li>
-                @Html.ActionLink("Driver Mileage", "MonthlyDriverMileage", queryParams)
+                @Html.ActionLink("Driver Mileage", "DriverMileageReport", queryParams)
             </li>
         </ul>
     </div>
diff --git a/Web/Views/Log/MonthlyVehicleMileage.cshtml b/Web/Views/Log/VehicleMileageReport.cshtml
similarity index 86%
rename from Web/Views/Log/MonthlyVehicleMileage.cshtml
rename to Web/Views/Log/VehicleMileageReport.cshtml
index 84d6b40..7b1230d 100644
--- a/Web/Views/Log/MonthlyVehicleMileage.cshtml
+++ b/Web/Views/Log/VehicleMileageReport.cshtml
@@ -1,7 +1,6 @@
 @model MileageTraker.Web.ViewModels.Vehicle.VehicleMileageViewModel
 @{
     ViewBag.Title = "Vehicle Mileage Report";
-	var queryParams = new { Model.Query.Year, Model.Query.Month, Model.Query.LogType, Model.Query.MonthRange, Model.Query.VehicleId, Model.Query.EmployeeName };
 }
 
 @{ Html.RenderPartial("BackToLogs"); }
@@ -43,9 +42,10 @@
             <td>
                 @Html.DisplayTextFor(i => item.Prog)
             </td>
-            <td>
-                @Html.DisplayTextFor(i => item.Miles)
-            </td>
+	        <td>
+		        @Html.DisplayTextFor(i => item.Miles)
+				<small>@Html.ActionLink("Logs", "Index", Model.Query.CloneSet(item.VehicleId), new {@class="no-print"})</small>
+	        </td>
             <td>
                 @Html.DisplayTextFor(i => item.GasPurchased)
             </td>
diff --git a/Web/Web.csproj b/Web/Web.csproj
index 080a794..b55f6dc 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -552,7 +552,7 @@
     <Content Include="Views\Shared\EditorTemplates\Enum_Select.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Log\MonthlyVehicleMileage.cshtml" />
+    <Content Include="Views\Log\VehicleMileageReport.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Shared\DisplayTemplates\DateTime.cshtml" />
@@ -564,7 +564,7 @@
     <Content Include="Views\Shared\EditorTemplates\LogResultsViewModel.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Views\Log\MonthlyDriverMileage.cshtml" />
+    <Content Include="Views\Log\DriverMileageReport.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Log\LogsSummary.cshtml" />