Add notes
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
// <auto-generated />
|
||||
namespace MileageTraker.Web.Migrations
|
||||
{
|
||||
using System.Data.Entity.Migrations;
|
||||
using System.Data.Entity.Migrations.Infrastructure;
|
||||
|
||||
public sealed partial class AddLogNotes : IMigrationMetadata
|
||||
{
|
||||
string IMigrationMetadata.Id
|
||||
{
|
||||
get { return "201303051835510_AddLogNotes"; }
|
||||
}
|
||||
|
||||
string IMigrationMetadata.Source
|
||||
{
|
||||
get { return null; }
|
||||
}
|
||||
|
||||
string IMigrationMetadata.Target
|
||||
{
|
||||
get { return "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"; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
namespace MileageTraker.Web.Migrations
|
||||
{
|
||||
using System.Data.Entity.Migrations;
|
||||
|
||||
public partial class AddLogNotes : DbMigration
|
||||
{
|
||||
public override void Up()
|
||||
{
|
||||
AddColumn("Log", "Notes", c => c.String(maxLength: 64));
|
||||
}
|
||||
|
||||
public override void Down()
|
||||
{
|
||||
DropColumn("Log", "Notes");
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-2
@@ -24,14 +24,17 @@ namespace MileageTraker.Web.Models
|
||||
[Display(Name = "Type")]
|
||||
public MileageLogTypeWrapper LogType { get; set; }
|
||||
|
||||
[Required]
|
||||
public virtual User User { get; set; }
|
||||
|
||||
[Required]
|
||||
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
|
||||
public string CityName { get; set; }
|
||||
|
||||
public virtual PurposeType Purpose { get; set; }
|
||||
|
||||
[Required]
|
||||
public virtual User User { get; set; }
|
||||
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
|
||||
public string Notes { get; set; }
|
||||
|
||||
[Range(0, 50)]
|
||||
public double GasPurchased { get; set; }
|
||||
|
||||
@@ -42,6 +42,14 @@ $(function () {
|
||||
});
|
||||
});
|
||||
|
||||
// add popup for span titles
|
||||
$('span[title]').append(' <span class="muted">▴</span>').qtip({
|
||||
content: {
|
||||
text: false // Use each elements title attribute
|
||||
},
|
||||
style: { classes: "qtip-light" } // Give it some style
|
||||
});
|
||||
|
||||
$(".miles-unknown").addClass('label label-warning').append(' <span class="muted">▴</span>')
|
||||
.each(function () {
|
||||
$(this).qtip({
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace MileageTraker.Web.ViewModels.CreateLog
|
||||
public SelectListViewModel Purpose { get; set; }
|
||||
|
||||
[InputSize("large")]
|
||||
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
|
||||
public string Notes { get; set; }
|
||||
|
||||
[RegularExpression(@"\d+\.\d{3}", ErrorMessage = "Enter all 3 decimal places")]
|
||||
|
||||
@@ -29,6 +29,8 @@ namespace MileageTraker.Web.ViewModels.Log
|
||||
[Display(Name = "Purpose")]
|
||||
public string PurposePurpose { get; set; }
|
||||
|
||||
public string Notes { get; set; }
|
||||
|
||||
[Display(Name = "Driver Name")]
|
||||
public string UserFullName { get; set; }
|
||||
|
||||
|
||||
@@ -28,6 +28,8 @@ namespace MileageTraker.Web.ViewModels.Log
|
||||
[Display(Name = "Purpose")]
|
||||
public string PurposePurpose { get; set; }
|
||||
|
||||
public string Notes { get; set; }
|
||||
|
||||
[DisplayFormat(DataFormatString = "{0:0.000}", ApplyFormatInEditMode = true)]
|
||||
public double GasPurchased { get; set; }
|
||||
|
||||
|
||||
@@ -53,6 +53,7 @@ namespace MileageTraker.Web.ViewModels.Log
|
||||
public SelectListViewModel Purpose { get; set; }
|
||||
|
||||
[InputSize("large")]
|
||||
[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
|
||||
public string Notes { get; set; }
|
||||
|
||||
[Display(Name = "Gas Purchased")]
|
||||
|
||||
@@ -71,6 +71,9 @@
|
||||
@Html.DisplayFor(model => model.Purpose)
|
||||
@Html.HiddenFor(model => model.Purpose.Selected)
|
||||
|
||||
@Html.DisplayFor(model => model.Notes)
|
||||
@Html.HiddenFor(model => model.Notes)
|
||||
|
||||
<dl class="dl-horizontal gas">
|
||||
<dt>
|
||||
@Html.DisplayNameFor(m => m.GasPurchased)
|
||||
|
||||
@@ -56,7 +56,14 @@
|
||||
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("CityName", "City Name"),
|
||||
grid.Column("PurposePurpose", "Purpose"),
|
||||
grid.Column("PurposePurpose", "Purpose", item =>
|
||||
{
|
||||
if (item.Notes != null)
|
||||
{
|
||||
return Html.Raw("<span title='" + item.Notes + "'>" + item.PurposePurpose + "</span>");
|
||||
}
|
||||
return item.PurposePurpose;
|
||||
}),
|
||||
grid.Column("Driver Name", format: item => item.UserFullName),
|
||||
grid.Column(format:
|
||||
@<div class='btn-group'>
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
Layout = "~/Views/Shared/DisplayTemplates/_FieldLayout.cshtml";
|
||||
}
|
||||
|
||||
@Model.Available.FirstOrDefault(i => i.Value == Model.Selected.ToString()).Text
|
||||
@(Model.Selected > 0 ? Model.Available.FirstOrDefault(i => i.Value == Model.Selected.ToString()).Text : string.Empty)
|
||||
@@ -159,6 +159,10 @@
|
||||
<Compile Include="Migrations\201303020124385_AddPurposeType.Designer.cs">
|
||||
<DependentUpon>201303020124385_AddPurposeType.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Migrations\201303051835510_AddLogNotes.cs" />
|
||||
<Compile Include="Migrations\201303051835510_AddLogNotes.Designer.cs">
|
||||
<DependentUpon>201303051835510_AddLogNotes.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Migrations\Configuration.cs" />
|
||||
<Compile Include="Models\PurposeType.cs" />
|
||||
<Compile Include="ViewModels\Account\ResetPasswordViewModel.cs" />
|
||||
|
||||
Reference in New Issue
Block a user