From 750450f1f9f6e037a42997db54aa120a5c93b5f9 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Wed, 21 May 2014 10:55:24 -0400
Subject: [PATCH] Correct reports not having all query parameters Other small
 corrections

---
 Web/Scripts/Shared/Site.js                    |  3 +-
 Web/Views/City/Index.cshtml                   |  4 +-
 Web/Views/Log/Index.cshtml                    |  7 ++--
 Web/Views/Log/MonthlyDriverMileage.cshtml     | 18 +--------
 Web/Views/Log/MonthlyVehicleMileage.cshtml    | 18 +--------
 Web/Views/Purpose/Index.cshtml                |  2 +
 Web/Views/{Log => Shared}/BackToLogs.cshtml   |  0
 .../DisplayTemplates/LogQueryViewModel.cshtml | 37 +++++++++++++++++++
 .../LogResultsViewModel.cshtml                |  5 +--
 Web/Web.csproj                                |  3 +-
 10 files changed, 54 insertions(+), 43 deletions(-)
 rename Web/Views/{Log => Shared}/BackToLogs.cshtml (100%)
 create mode 100644 Web/Views/Shared/DisplayTemplates/LogQueryViewModel.cshtml

diff --git a/Web/Scripts/Shared/Site.js b/Web/Scripts/Shared/Site.js
index 67d4577..a298ddc 100644
--- a/Web/Scripts/Shared/Site.js
+++ b/Web/Scripts/Shared/Site.js
@@ -92,7 +92,7 @@ $(function() {
 // Add active class to nav
 $(function() {
     var idNavActiveRegex = {
-        'log-nav': /\/log/i,
+        'log-nav': /\/log|\/City|\/Purpose/i,
         'vehicle-nav': /\/vehicle/i,
         'user-nav': /\/user/i
     };
@@ -116,6 +116,7 @@ function addButtonIcons () {
 		'Delete': 'trash',
 		'Add': 'plus',
 		'Export': 'download',
+		'Import': 'upload',
 		'Driver Mileage': 'user',
 		'Vehicle Mileage': 'car'
 	};
diff --git a/Web/Views/City/Index.cshtml b/Web/Views/City/Index.cshtml
index e96a520..bac13a0 100644
--- a/Web/Views/City/Index.cshtml
+++ b/Web/Views/City/Index.cshtml
@@ -4,8 +4,10 @@
 	ViewBag.Title = "Cities by County";
 }
 
-@Html.Partial("_StatusMessage")
+@{ Html.RenderPartial("BackToLogs"); }
 
+@Html.Partial("_StatusMessage")
+	
 <h2>@ViewBag.Title</h2>
 	
 <div>
diff --git a/Web/Views/Log/Index.cshtml b/Web/Views/Log/Index.cshtml
index ae44678..be45f57 100644
--- a/Web/Views/Log/Index.cshtml
+++ b/Web/Views/Log/Index.cshtml
@@ -4,6 +4,7 @@
 @{
     ViewBag.Title = "Logs";
     var grid = new WebGrid(Model.Logs, rowsPerPage: 45);
+	var parameters = new {Model.Year, Model.Month, Model.LogType, Model.MonthRange, Model.VehicleId, Model.EmployeeName};
 }
 @section Styles {
     <link href="@Url.Content("~/Content/VehicleColors.css")" rel="stylesheet" type="text/css" />
@@ -34,7 +35,7 @@
 
 <div class="btn-toolbar clearfix">
     @Html.ActionLink("Add New Log", "Create", null, new { @class = "btn" })
-    @Html.ActionLink("Export", "Export", new { Model.Year, Model.Month, Model.LogType, Model.MonthRange, Model.VehicleId, Model.EmployeeName }, new { @class = "btn" })
+    @Html.ActionLink("Export", "Export", parameters, new { @class = "btn" })
     @Html.ActionLink("Purposes", "Index", "Purpose", null, new { @class = "btn" })
     @Html.ActionLink("Cities", "Index", "City", null, new { @class = "btn" })
 	@Html.ActionLink("Import", "ImportUpload", null, new { @class = "btn"})
@@ -43,10 +44,10 @@
         <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Report <span class="caret"></span></a>
         <ul class="dropdown-menu">
             <li>
-                @Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", new { Year = Model.Year, Month = Model.Month, LogType = Model.LogType })
+                @Html.ActionLink("Vehicle Mileage", "MonthlyVehicleMileage", parameters)
             </li>
             <li>
-                @Html.ActionLink("Driver Mileage", "MonthlyDriverMileage", new { Year = Model.Year, Month = Model.Month, LogType = Model.LogType })
+                @Html.ActionLink("Driver Mileage", "MonthlyDriverMileage", parameters)
             </li>
         </ul>
     </div>
diff --git a/Web/Views/Log/MonthlyDriverMileage.cshtml b/Web/Views/Log/MonthlyDriverMileage.cshtml
index 0c36d66..bd09a2d 100644
--- a/Web/Views/Log/MonthlyDriverMileage.cshtml
+++ b/Web/Views/Log/MonthlyDriverMileage.cshtml
@@ -9,23 +9,7 @@
 
 <h2>@ViewBag.Title</h2>
 
-<div>
-    <dl class="inline">
-        <dt>@Html.DisplayNameFor(m => m.Query.Year)</dt>
-        <dd>@Html.Encode(Model.Query.Year)</dd>
-    </dl>
-    <dl class="inline">
-        <dt>@Html.DisplayNameFor(m => m.Query.Month)</dt>
-        <dd>@Html.Encode(Model.Query.Month)</dd>
-    </dl>
-    @if (Model.Query.LogType.HasValue)
-    {
-	    <dl class="inline">
-            <dt>Type</dt>
-            <dd>@Html.Encode(Model.Query.LogType)</dd>
-        </dl>
-    }
-</div>
+@Html.DisplayFor(m => m.Query)
 
 <table class="table">
     <tr>
diff --git a/Web/Views/Log/MonthlyVehicleMileage.cshtml b/Web/Views/Log/MonthlyVehicleMileage.cshtml
index 0541b42..51b0fc1 100644
--- a/Web/Views/Log/MonthlyVehicleMileage.cshtml
+++ b/Web/Views/Log/MonthlyVehicleMileage.cshtml
@@ -9,23 +9,7 @@
 
 <h2>@ViewBag.Title</h2>
 
-<div>
-    <dl class="inline">
-        <dt>@Html.DisplayNameFor(m => m.Query.Year)</dt>
-        <dd>@Html.Encode(Model.Query.Year)</dd>
-    </dl>
-    <dl class="inline">
-        <dt>@Html.DisplayNameFor(m => m.Query.Month)</dt>
-        <dd>@Html.Encode(Model.Query.Month)</dd>
-    </dl>
-    @if (Model.Query.LogType.HasValue)
-    {
-	    <dl class="inline">
-            <dt>Type</dt>
-            <dd>@Html.Encode(Model.Query.LogType)</dd>
-        </dl>
-    }
-</div>
+@Html.DisplayFor(m => m.Query)
 
 <table class="table">
     <tr>
diff --git a/Web/Views/Purpose/Index.cshtml b/Web/Views/Purpose/Index.cshtml
index c777480..556d60b 100644
--- a/Web/Views/Purpose/Index.cshtml
+++ b/Web/Views/Purpose/Index.cshtml
@@ -5,6 +5,8 @@
     var grid = new WebGrid(Model, canSort: false, canPage: false);
 }
 
+@{ Html.RenderPartial("BackToLogs"); }
+
 @Html.Partial("_StatusMessage")
 
 <h2>@ViewBag.Title</h2>
diff --git a/Web/Views/Log/BackToLogs.cshtml b/Web/Views/Shared/BackToLogs.cshtml
similarity index 100%
rename from Web/Views/Log/BackToLogs.cshtml
rename to Web/Views/Shared/BackToLogs.cshtml
diff --git a/Web/Views/Shared/DisplayTemplates/LogQueryViewModel.cshtml b/Web/Views/Shared/DisplayTemplates/LogQueryViewModel.cshtml
new file mode 100644
index 0000000..82a2f6b
--- /dev/null
+++ b/Web/Views/Shared/DisplayTemplates/LogQueryViewModel.cshtml
@@ -0,0 +1,37 @@
+@model MileageTraker.Web.ViewModels.Log.LogQueryViewModel
+
+<div>
+    <dl class="inline">
+        <dt>@Html.DisplayNameFor(m => m.Year)</dt>
+        <dd>@Html.Encode(Model.Year)</dd>
+    </dl>
+	<dl class="inline">
+		<dt>@Html.DisplayNameFor(m => m.Month)</dt>
+		<dd>@Html.Encode(Model.Month)</dd>
+	</dl>
+	<dl class="inline">
+		<dt>@Html.DisplayNameFor(m => m.MonthRange)</dt>
+		<dd>@Html.Encode(Model.MonthRange)</dd>
+	</dl>
+    @if (Model.LogType.HasValue)
+    {
+	    <dl class="inline">
+            <dt>Type</dt>
+            <dd>@Html.Encode(Model.LogType)</dd>
+        </dl>
+    }
+	@if (!string.IsNullOrEmpty(Model.VehicleId))
+	{
+	    <dl class="inline">
+            <dt>Vehicle</dt>
+            <dd>@Html.Encode(Model.VehicleId)</dd>
+        </dl>
+	}
+	@if (!string.IsNullOrEmpty(Model.EmployeeName))
+	{
+	    <dl class="inline">
+            <dt>Driver</dt>
+            <dd>@Html.Encode(Model.EmployeeName)</dd>
+        </dl>
+	}
+</div>
\ No newline at end of file
diff --git a/Web/Views/Shared/EditorTemplates/LogResultsViewModel.cshtml b/Web/Views/Shared/EditorTemplates/LogResultsViewModel.cshtml
index f3ee738..15d802f 100644
--- a/Web/Views/Shared/EditorTemplates/LogResultsViewModel.cshtml
+++ b/Web/Views/Shared/EditorTemplates/LogResultsViewModel.cshtml
@@ -1,5 +1,4 @@
-@using System.Xml
-@using MileageTraker.Web.Models
+@using MileageTraker.Web.Models
 @using MileageTraker.Web.Utility
 @model MileageTraker.Web.ViewModels.Log.LogResultsViewModel
 @{
@@ -33,7 +32,7 @@
 		@Html.TextBoxFor(m => m.VehicleId, new {@class="search-query input-mini", placeholder="Vehicle"})
 	</div>
 	<div class="span4">
-		@Html.Label("EmployeeName", "User")
+		@Html.Label("EmployeeName", "Driver")
 		@Html.TextBoxFor(m => m.EmployeeName, new {@class="search-query input-small", placeholder="User"})
 	</div>
 </div>
diff --git a/Web/Web.csproj b/Web/Web.csproj
index a3df36c..b90ce12 100644
--- a/Web/Web.csproj
+++ b/Web/Web.csproj
@@ -263,6 +263,7 @@
     <Content Include="Views\Shared\EditorTemplates\HttpPostedFileBase.cshtml" />
     <Content Include="Views\City\Index.cshtml" />
     <Content Include="Views\City\Create.cshtml" />
+    <Content Include="Views\Shared\DisplayTemplates\LogQueryViewModel.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Account.Login.css" />
@@ -332,7 +333,7 @@
     <Content Include="Views\Shared\Error.cshtml" />
     <Content Include="Views\Shared\_Layout.cshtml" />
     <Content Include="Views\Web.config" />
-    <Content Include="Views\Log\BackToLogs.cshtml" />
+    <Content Include="Views\Shared\BackToLogs.cshtml" />
     <Content Include="Views\Vehicle\BackToVehicles.cshtml" />
     <Content Include="Views\Shared\EditorTemplates\Date.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\Date.cshtml" />