Refactor Miles into log output

This commit is contained in:
2013-02-28 14:00:50 -05:00
parent 1696b1dd1d
commit 848cb57777
3 changed files with 19 additions and 6 deletions
+3 -3
View File
@@ -53,9 +53,9 @@ namespace MileageTraker.Web.Controllers
{ {
var logs = DataService.GetLogs(); var logs = DataService.GetLogs();
var filteredLogs = var filteredLogs =
DataService.FilterLogs(logs, query) DataService.GetLogIndexViewModels(
.ToList() DataService.FilterLogs(logs, query)
.Select(log => new LogViewModel(log)); ).ToList();
var name = string.Format( var name = string.Format(
"MileageLogs{0}-{1}{2}", "MileageLogs{0}-{1}{2}",
+14 -1
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel.DataAnnotations;
using AutoMapper; using AutoMapper;
using MileageTraker.Web.Models; using MileageTraker.Web.Models;
@@ -11,20 +12,31 @@ namespace MileageTraker.Web.ViewModels.Log
public int LogId { get; set; } public int LogId { get; set; }
[Display(Name = "Vehicle ID")]
public string VehicleId { get; set; } public string VehicleId { get; set; }
[Display(Name = "End Odometer")]
public int EndOdometer { get; set; } public int EndOdometer { get; set; }
public int Miles { get; set; }
[Display(Name = "Type")]
public MileageLogTypeWrapper LogType { get; set; } public MileageLogTypeWrapper LogType { get; set; }
[Display(Name = "City Name")]
public string CityName { get; set; } public string CityName { get; set; }
public virtual Models.User User { get; set; } [Display(Name = "Driver Name")]
public string UserFullName { get; set; }
[Display(Name = "Gas Purchased")]
[DisplayFormat(DataFormatString = "{0:0.000}", ApplyFormatInEditMode = true)]
public double GasPurchased { get; set; } public double GasPurchased { get; set; }
public DateTime Date { get; set; } public DateTime Date { get; set; }
[Display(Name = "Time Created")]
[DisplayFormat(DataFormatString = @"{0:MM/dd/yyyy h:mm tt}")]
public DateTime Created { get; set; } public DateTime Created { get; set; }
static LogIndexViewModel() static LogIndexViewModel()
@@ -39,6 +51,7 @@ namespace MileageTraker.Web.ViewModels.Log
{ {
PreviousLogId = previousLog.LogId; PreviousLogId = previousLog.LogId;
PreviousLogEndOdometer = previousLog.EndOdometer; PreviousLogEndOdometer = previousLog.EndOdometer;
Miles = EndOdometer - previousLog.EndOdometer;
} }
} }
} }
+2 -2
View File
@@ -47,7 +47,7 @@
{ {
if (item.PreviousLogId != null) if (item.PreviousLogId != null)
{ {
string miles = (item.EndOdometer - item.PreviousLogEndOdometer).ToString(); string miles = (item.Miles).ToString();
return Html.ActionLink(miles, "DetailsPartial", new { id = item.PreviousLogId }, new { @class = "qtip-modal" }); return Html.ActionLink(miles, "DetailsPartial", new { id = item.PreviousLogId }, new { @class = "qtip-modal" });
} }
return Html.Raw("<span class='miles-unknown'>?</span>"); return Html.Raw("<span class='miles-unknown'>?</span>");
@@ -56,7 +56,7 @@
grid.Column("GasPurchased", "Gas", item => item.GasPurchased > 0 ? String.Format("{0:0.000}", item.GasPurchased) : string.Empty), grid.Column("GasPurchased", "Gas", item => item.GasPurchased > 0 ? String.Format("{0:0.000}", item.GasPurchased) : string.Empty),
grid.Column("Date", format: item => item.Date.ToString("d")), grid.Column("Date", format: item => item.Date.ToString("d")),
grid.Column("CityName", "City Name"), grid.Column("CityName", "City Name"),
grid.Column("Driver Name", format: item => item.User != null ? item.User.FullName : ""), grid.Column("Driver Name", format: item => item.UserFullName),
grid.Column(format: grid.Column(format:
@<div class='btn-group'> @<div class='btn-group'>
@Html.ActionLink("Edit", "Edit", new { id = item.LogId }, new { @class = "btn btn-mini" }) @Html.ActionLink("Edit", "Edit", new { id = item.LogId }, new { @class = "btn btn-mini" })