Cleanup and fixes

This commit is contained in:
2013-01-12 14:58:33 -05:00
parent bc019923d2
commit e50052d41e
27 changed files with 240 additions and 156 deletions
+16 -11
View File
@@ -52,13 +52,18 @@ namespace MileageTraker.Web.Controllers
public ActionResult Export(LogQueryViewModel query)
{
var logs = DataService.GetLogs();
var filteredLogs =
DataService.FilterLogs(logs, query)
.ToList()
.Select(log => new LogViewModel(log));
var name = string.Format(
"MileageLogs{0}-{1}{2}",
query.Year,
query.Month,
query.LogType.HasValue ? "-" + query.LogType.Value.GetDisplayShortName() : "");
var export = ExcelWriter.WriteXls(DataService.FilterLogs(logs, query), name, name);
var export = ExcelWriter.WriteXls(filteredLogs, name, name);
return File(export, "application/ms-excel", name + ".xls");
}
@@ -71,11 +76,11 @@ namespace MileageTraker.Web.Controllers
return View(report);
}
public ActionResult MonthlyEmployeeMileage(LogQueryViewModel query)
public ActionResult MonthlyDriverMileage(LogQueryViewModel query)
{
var items = DataService.GetMonthlyEmployeeMileageItems(query);
var report = new EmployeeMileageViewModel(items, query);
var report = new DriverMileageViewModel(items, query);
return View(report);
}
@@ -119,15 +124,15 @@ namespace MileageTraker.Web.Controllers
return RedirectToAction("Details", new { id = logId });
}
public ActionResult Create()
[HttpGet]
public ActionResult Create(string vehicleId)
{
var viewModel = new LogViewModel { Date = DateTime.Today };
var vehicleId = Request["vehicleId"];
var viewModel = new LogViewModel
{
Date = DateTime.Today,
VehicleId = vehicleId
};
if (vehicleId != null)
{
viewModel.VehicleId = vehicleId;
}
return View(viewModel);
}
@@ -166,7 +171,7 @@ namespace MileageTraker.Web.Controllers
if (ModelState.IsValid)
{
var log = DataService.GetLog(viewModel.LogId);
viewModel.UpdateLog(log);
viewModel.SetProperties(log);
log.User = DataService.FindUserByFullName(viewModel.UserFullName);
DataService.UpdateLog(log);