Combine layouts

Web/Controllers/VehicleController.cs

@@ -2,7 +2,6 @@
 using System.Web.Mvc;
 using MileageTraker.Web.DAL;
 using MileageTraker.Web.Models;
-using MileageTraker.Web.ViewModels;
 using MileageTraker.Web.ViewModels.Vehicle;
 
 namespace MileageTraker.Web.Controllers
@@ -10,23 +9,21 @@ namespace MileageTraker.Web.Controllers
 	[Authorize(Roles = "Administrator, Developer")]
 	public class VehicleController : ControllerBase
     {
-		private readonly DataService _ds = new DataService();
-
         public ViewResult Index()
         {
-        	var vehicles = _ds.GetVehicles();
+        	var vehicles = DataService.GetVehicles();
         	return View(vehicles);
         }
 
 		public ViewResult Details(string id)
         {
-			var vehicle = _ds.GetVehicle(id);
+			var vehicle = DataService.GetVehicle(id);
             return View(vehicle);
         }
 
 		public PartialViewResult DetailsPartial(string id)
 		{
-			var vehicle = _ds.GetVehicle(id);
+			var vehicle = DataService.GetVehicle(id);
 			return PartialView(new VehiclePartialDetails(vehicle));
 		}
 
@@ -40,7 +37,7 @@ namespace MileageTraker.Web.Controllers
         {
             if (ModelState.IsValid)
             {
-                _ds.AddVehicle(vehicle);
+                DataService.AddVehicle(vehicle);
                 return RedirectToAction("Index");  
             }
 
@@ -49,7 +46,7 @@ namespace MileageTraker.Web.Controllers
 
 		public ActionResult Edit(string id)
         {
-			var vehicle = _ds.GetVehicle(id);
+			var vehicle = DataService.GetVehicle(id);
             return View(vehicle);
         }
 
@@ -58,7 +55,7 @@ namespace MileageTraker.Web.Controllers
         {
             if (ModelState.IsValid)
             {
-				_ds.UpdateVehicle(vehicle);
+				DataService.UpdateVehicle(vehicle);
 				return RedirectToAction("Details", new { id = vehicle.VehicleId });
             }
             return View(vehicle);
@@ -66,21 +63,15 @@ namespace MileageTraker.Web.Controllers
 		
 		public JsonResult Exists(string vehicleId)
 		{
-			var vehicle = _ds.GetVehicle(vehicleId);
+			var vehicle = DataService.GetVehicle(vehicleId);
 			return Json(vehicle != null, JsonRequestBehavior.AllowGet);
 		}
 
 		public FileResult Export()
 		{
-			var vehicles = _ds.GetVehicles();
+			var vehicles = DataService.GetVehicles();
 			var export = VehicleImporter.Export(vehicles);
 			return File(export, "application/ms-excel", string.Format("ETHRAVehicles{0:yyyy-MM-dd}.xls", DateTime.Today));
 		}
-
-    	protected override void Dispose(bool disposing)
-        {
-            _ds.Dispose();
-            base.Dispose(disposing);
-        }
     }
 }