Le sigh - needed to make a new ImportLogViewModel - can't be shared because of DenyPreviousMonth

Web.Tests/Utility/CustomExtensionsTests.cs

@@ -4,7 +4,9 @@ using MileageTraker.Web.Models;
 using MileageTraker.Web.Utility;
 using MileageTraker.Web.ViewModels;
 using MileageTraker.Web.ViewModels.CreateLog;
+using MileageTraker.Web.ViewModels.Log;
 using NUnit.Framework;
+using ImportLogViewModel = MileageTraker.Web.ViewModels.Log.ImportLogViewModel;
 
 namespace Web.Tests.Utility
 {
@@ -70,7 +72,7 @@ namespace Web.Tests.Utility
 		[Test]
 		public void Type_GetPropertyNames()
 		{
-			var propertyNames = (typeof (LogImportViewModel).GetPropertyNames()).ToList();
+			var propertyNames = (typeof (ImportLogViewModel).GetPropertyNames()).ToList();
 
 			Assert.That(propertyNames, Has.Member("Vehicle ID"));
 			Assert.That(propertyNames, Has.Count.GreaterThan(5));

Web.Tests/ViewModels/CreateLog/LogImportViewModelTests.cs

@@ -1,6 +1,7 @@
 using System;
 using AutoMapper;
 using MileageTraker.Web.ViewModels;
+using MileageTraker.Web.ViewModels.Log;
 using NUnit.Framework;
 
 namespace Web.Tests.ViewModels.CreateLog
@@ -8,9 +9,9 @@ namespace Web.Tests.ViewModels.CreateLog
 	[TestFixture]
 	public class LogImportViewModelTests
 	{
-		private LogImportViewModel GetTestModel()
+		private ImportLogViewModel GetTestModel()
 		{
-			return new LogImportViewModel
+			return new ImportLogViewModel
 			{
 				CityName = "City",
 				Date = "10-20-2010",

Web/Attributes/DenyPreviousMonthDateAttribute.cs

@@ -8,18 +8,15 @@ namespace MileageTraker.Web.Attributes
 	{
 		public override bool IsValid(object value)
 		{
-			var date = DateTime.Parse(value.ToString());
+			DateTime date;
+			if (value == null || !DateTime.TryParse(value.ToString(), out date))
+				return false;
 			return date.Date >= GetCutoff();
 		}
 
 		private static DateTime GetCutoff()
 		{
 			return DomainRules.GetLogEntryCutoff();
-			//var today = DateTime.Today;
-			//return today.AddMonths(-1).AddDays(-today.Day + 1); // last two months
-			//if (today.Day > 10)
-			//	return today.AddDays(-today.Day); // beginning of this month
-			//return today.AddMonths(-1).AddDays(-today.Day); // beginning of previous month
 		}
 	}
 }

Web/Controllers/CreateLogController.cs

@@ -205,7 +205,7 @@ namespace MileageTraker.Web.Controllers
 
 		[HttpPost]
 		[ActionLog]
-		public ActionResult ImportCreate(LogImportViewModel viewModel)
+		public ActionResult ImportCreate(ImportLogViewModel viewModel)
 		{
 			var buttonAttributes = new Dictionary<string, object> { { "class", "btn btn-mini" }, { "target", "_blank" } };
 
@@ -316,11 +316,11 @@ namespace MileageTraker.Web.Controllers
 			}
 		}
 
-		private string GetFixLink(LogImportViewModel viewModel)
+		private string GetFixLink(ImportLogViewModel viewModel)
 		{
 			try
 			{
-				viewModel.GetLogViewModel();
+				viewModel.GetCreateLogViewModel();
 			}
 			catch
 			{
@@ -331,7 +331,7 @@ namespace MileageTraker.Web.Controllers
 		}
 
 		[HttpPost]
-		public ActionResult ImportFix(LogImportViewModel viewModel)
+		public ActionResult ImportFix(ImportLogViewModel viewModel)
 		{
 			var createGetLogViewModel = viewModel.GetCreateLogViewModel();
 			createGetLogViewModel.Purpose = new SelectListViewModel

Web/Controllers/LogController.cs

@@ -268,7 +268,7 @@ namespace MileageTraker.Web.Controllers
 					var path = Path.Combine(Server.MapPath("~/App_Data/uploads"), fileName);
 					viewModel.File.SaveAs(path);
 
-					IEnumerable<LogImportViewModel> logImports;
+					IEnumerable<ImportLogViewModel> logImports;
 					try
 					{
 						logImports = LogImporter.Import(path);
@@ -294,7 +294,7 @@ namespace MileageTraker.Web.Controllers
 
 		[HttpPost]
 		[ActionLog]
-		public ActionResult ImportCreate(LogImportViewModel viewModel, string userFullName)
+		public ActionResult ImportCreate(ImportLogViewModel viewModel, string userFullName)
 		{
 			var buttonAttributes = new Dictionary<string, object> { { "class", "btn btn-mini" }, { "target", "_blank" } };
 
@@ -405,7 +405,7 @@ namespace MileageTraker.Web.Controllers
 			}
 		}
 
-		private string GetFixLink(LogImportViewModel viewModel)
+		private string GetFixLink(ImportLogViewModel viewModel)
 		{
 			try
 			{
@@ -420,7 +420,7 @@ namespace MileageTraker.Web.Controllers
 		}
 
 		[HttpPost]
-		public ActionResult ImportFix(LogImportViewModel viewModel)
+		public ActionResult ImportFix(ImportLogViewModel viewModel)
 		{
 			var logViewModel = viewModel.GetLogViewModel();
 			logViewModel.Purpose.Available = GetPurposeTypesSelectList();

Web/DAL/LogImportTemplateWriter.cs

@@ -4,6 +4,7 @@ using ExcelLibrary.SpreadSheet;
 using MileageTraker.Web.Models;
 using MileageTraker.Web.Utility;
 using MileageTraker.Web.ViewModels;
+using MileageTraker.Web.ViewModels.Log;
 
 namespace MileageTraker.Web.DAL
 {
@@ -12,7 +13,7 @@ namespace MileageTraker.Web.DAL
 		public static byte[] Write()
 		{
 			var example =
-				new LogImportViewModel
+				new ImportLogViewModel
 					{
 						CityName = "City Name",
 						Date = "10/20/2010",
@@ -27,10 +28,10 @@ namespace MileageTraker.Web.DAL
 
 			var worksheet = new Worksheet("LogImport");
 
-			ExcelWriter<LogImportViewModel>.WriteColumnHeaders(worksheet, formatString: headerFormat);
+			ExcelWriter<ImportLogViewModel>.WriteColumnHeaders(worksheet, formatString: headerFormat);
-			ExcelWriter<LogImportViewModel>.WriteItems(worksheet, new[] { example }, 1); // write the example item
+			ExcelWriter<ImportLogViewModel>.WriteItems(worksheet, new[] { example }, 1); // write the example item
 
-			var propertyCount = ExcelWriter<LogImportViewModel>.GetPropertyCount();
+			var propertyCount = ExcelWriter<ImportLogViewModel>.GetPropertyCount();
 
 			worksheet.Cells[0, propertyCount + 1] = new Cell("Accepted values for fields:", headerFormat);
 
@@ -50,7 +51,7 @@ namespace MileageTraker.Web.DAL
 			worksheet.Cells[1, propertyCount + 1] = new Cell("Type", headerFormat);
 			ExcelWriter<string>.WriteItems(worksheet, logTypes, 2, propertyCount + 1);
 
-			ExcelWriter<LogImportViewModel>.PadWorksheet(worksheet);
+			ExcelWriter<ImportLogViewModel>.PadWorksheet(worksheet);
 
 			// save it
 			var workbook = new Workbook();

Web/DAL/LogImporter.cs

@@ -4,14 +4,13 @@ using System.IO;
 using System.Linq;
 using ExcelLibrary.SpreadSheet;
 using MileageTraker.Web.Utility;
-using MileageTraker.Web.ViewModels;
+using MileageTraker.Web.ViewModels.Log;
-using MileageTraker.Web.ViewModels.CreateLog;
 
 namespace MileageTraker.Web.DAL
 {
 	public static class LogImporter
 	{
-		public static IEnumerable<LogImportViewModel> Import(string filename)
+		public static IEnumerable<ImportLogViewModel> Import(string filename)
 		{
 			var fileInfo = new FileInfo(filename);
 			return Import(Workbook.Load(fileInfo.FullName));
@@ -19,13 +18,13 @@ namespace MileageTraker.Web.DAL
 
 		private static IList<string> GetMissingHeaderColumns(IEnumerable<string> headerColumns)
 		{
-			var properties = typeof(LogImportViewModel).GetPropertyNames();
+			var properties = typeof(ImportLogViewModel).GetPropertyNames();
 			var pset = new HashSet<string>(properties);
 			var cset = new HashSet<string>(headerColumns);
 			return pset.Except(cset).ToList();
 		}
 
-		private static IEnumerable<LogImportViewModel> Import(Workbook workbook)
+		private static IEnumerable<ImportLogViewModel> Import(Workbook workbook)
 		{
 			var sheet = workbook.Worksheets[0];
 
@@ -62,7 +61,7 @@ namespace MileageTraker.Web.DAL
 					};
 
 				var logImportViewModel = 
-					new LogImportViewModel
+					new ImportLogViewModel
 					{
 						CityName = getRowValue("Destination City"),
 						Date = getRowDateValue("Date"),

Web/Scripts/Shared/Site.js

@@ -96,11 +96,16 @@ $(function() {
         'vehicle-nav': /\/vehicle/i,
         'user-nav': /\/user/i
     };
+	var set = false;
     $.each(idNavActiveRegex, function (id, regex) {
         if (regex.test(document.URL)) {
-            $("#" + id).addClass('active');
+        	$("#" + id).addClass('active');
+	        set = true;
         }
     });
+    if (!set) {
+    	$("#" + 'create-nav').addClass('active');
+    }
 });
 
 function addButtonIcons () {

Web/ViewModels/CreateLog/ImportLogViewModel.cs

@@ -4,12 +4,10 @@ using System.Web.Mvc;
 using AutoMapper;
 using MileageTraker.Web.Attributes;
 using MileageTraker.Web.Utility;
-using MileageTraker.Web.ViewModels.CreateLog;
-using MileageTraker.Web.ViewModels.Log;
 
-namespace MileageTraker.Web.ViewModels
+namespace MileageTraker.Web.ViewModels.CreateLog
 {
-	public class LogImportViewModel
+	public class ImportLogViewModel
 	{
 		[Required(ErrorMessage = "Required")]
 		[StringLength(6, MinimumLength = 4, ErrorMessage = "Must be a 4 digit number")]
@@ -51,21 +49,19 @@ namespace MileageTraker.Web.ViewModels
 		[Required(ErrorMessage = "Required")]
 		[DataType(DataType.Date)]
 		[DenyFutureDate(ErrorMessage = "Future date")]
+		[DenyPreviousMonthDate(ErrorMessage = "Previous Month")]
 		[HiddenInput]
 		public string Date { get; set; }
 
-		static LogImportViewModel()
+		static ImportLogViewModel()
 		{
 			Mapper.CreateMap<string, int>().ConvertUsing(Convert.ToInt32);
 			Mapper.CreateMap<string, double>().ConvertUsing(Convert.ToDouble);
 			Mapper.CreateMap<string, DateTime>().ConvertUsing(new DateTimeTypeConverter());
-			Mapper.CreateMap<LogImportViewModel, LogViewModel>()
+			Mapper.CreateMap<ImportLogViewModel, CreateLogViewModel>()
-				  .ForMember(u => u.LogType, opt => opt.Ignore())
-			      .ForMember(u => u.Purpose, opt => opt.Ignore());
-			Mapper.CreateMap<LogImportViewModel, CreateLogViewModel>()
 				  .ForMember(u => u.LogType, opt => opt.Ignore())
 				  .ForMember(u => u.Purpose, opt => opt.Ignore());
-			Mapper.CreateMap<LogImportViewModel, Models.Log>()
+			Mapper.CreateMap<ImportLogViewModel, Models.Log>()
 				  .ForMember(u => u.Purpose, opt => opt.Ignore())
 			      .ForMember(dest => dest.GasPurchased,
 			                 opt =>
@@ -74,18 +70,7 @@ namespace MileageTraker.Web.ViewModels
 								 ? 0 
 								 : Math.Round(Double.Parse(vm.GasPurchased), 3)));
 		}
-
+		
-		public LogImportViewModel()
-		{
-		}
-
-		public LogViewModel GetLogViewModel()
-		{
-			var log = new LogViewModel();
-			Mapper.Map(this, log);
-			return log;
-		}
-
 		public CreateLogViewModel GetCreateLogViewModel()
 		{
 			var log = new CreateLogViewModel();

Web/ViewModels/Log/ImportLogViewModel.cs

@@ -0,0 +1,94 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.Web.Mvc;
+using AutoMapper;
+using MileageTraker.Web.Attributes;
+using MileageTraker.Web.Utility;
+
+namespace MileageTraker.Web.ViewModels.Log
+{
+	public class ImportLogViewModel
+	{
+		[Required(ErrorMessage = "Required")]
+		[StringLength(6, MinimumLength = 4, ErrorMessage = "Must be a 4 digit number")]
+		[Display(Name = "Vehicle ID")]
+		[HiddenInput]
+		public string VehicleId { get; set; }
+
+		[Required(ErrorMessage = "Required")]
+		[Range(1, 500000, ErrorMessage = "Between 1 and 500k")]
+		[Display(Name = "End Odometer")]
+		[HiddenInput]
+		public string EndOdometer { get; set; }
+
+		[Required(ErrorMessage = "Required")]
+		[MileageLogTypeValid(ErrorMessage = "Invalid Log Type")]
+		[Display(Name = "Type")]
+		[HiddenInput]
+		public string LogType { get; set; }
+
+		[Required(ErrorMessage = "Required")]
+		[Display(Name = "Destination City")]
+		[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
+		[HiddenInput]
+		public string CityName { get; set; }
+
+		[Required(ErrorMessage = "Required")]
+		[Display(Name = "Purpose")]
+		[HiddenInput]
+		public string Purpose { get; set; }
+
+		[StringLength(64, MinimumLength = 3, ErrorMessage = "Minimum 3 characters")]
+		[HiddenInput]
+		public string Notes { get; set; }
+
+		[Display(Name = "Gas Purchased")]
+		[HiddenInput]
+		public string GasPurchased { get; set; }
+
+		[Required(ErrorMessage = "Required")]
+		[DataType(DataType.Date)]
+		[DenyFutureDate(ErrorMessage = "Future date")]
+		[HiddenInput]
+		public string Date { get; set; }
+
+		static ImportLogViewModel()
+		{
+			Mapper.CreateMap<string, int>().ConvertUsing(Convert.ToInt32);
+			Mapper.CreateMap<string, double>().ConvertUsing(Convert.ToDouble);
+			Mapper.CreateMap<string, DateTime>().ConvertUsing(new DateTimeTypeConverter());
+			Mapper.CreateMap<ImportLogViewModel, LogViewModel>()
+				  .ForMember(u => u.LogType, opt => opt.Ignore())
+			      .ForMember(u => u.Purpose, opt => opt.Ignore());
+			Mapper.CreateMap<ImportLogViewModel, Models.Log>()
+				  .ForMember(u => u.Purpose, opt => opt.Ignore())
+			      .ForMember(dest => dest.GasPurchased,
+			                 opt =>
+			                 opt.ResolveUsing(vm => 
+								 string.IsNullOrEmpty(vm.GasPurchased) 
+								 ? 0 
+								 : Math.Round(Double.Parse(vm.GasPurchased), 3)));
+		}
+		
+		public LogViewModel GetLogViewModel()
+		{
+			var log = new LogViewModel();
+			Mapper.Map(this, log);
+			return log;
+		}
+		
+		public Models.Log GetLog()
+		{
+			var log = new Models.Log();
+			Mapper.Map(this, log);
+			return log;
+		}
+
+		public override string ToString()
+		{
+			return string.Format(
+				"vehicle: {0}, odo: {1}, type: {2}, city: {3}, gas: {4}, purpose: {5}, date: {6}",
+				VehicleId, EndOdometer, LogType, CityName, GasPurchased, Purpose, Date);
+		}
+	}
+}

Web/Views/CreateLog/Import.cshtml

@@ -1,4 +1,4 @@
-@model IList<MileageTraker.Web.ViewModels.LogImportViewModel>
+@model IList<MileageTraker.Web.ViewModels.Log.ImportLogViewModel>
 
 @{
     ViewBag.Title = "Import Logs";

Web/Views/CreateLog/ImportFix.cshtml

@@ -1,4 +1,4 @@
-@model MileageTraker.Web.ViewModels.LogImportViewModel
+@model MileageTraker.Web.ViewModels.CreateLog.ImportLogViewModel
 @{
     Layout = null;
 }

Web/Views/Log/Import.cshtml

@@ -1,4 +1,4 @@
-@model IList<MileageTraker.Web.ViewModels.LogImportViewModel>
+@model IList<MileageTraker.Web.ViewModels.Log.ImportLogViewModel>
 
 @{
     ViewBag.Title = "Import Logs";

Web/Views/Log/ImportFix.cshtml

@@ -1,4 +1,4 @@
-@model MileageTraker.Web.ViewModels.LogImportViewModel
+@model MileageTraker.Web.ViewModels.Log.ImportLogViewModel
 @{
     Layout = null;
 }

Web/Views/Shared/_Layout.cshtml

@@ -25,7 +25,7 @@
                         <ul class="nav">
                             @if (User.IsInRole("Driver") || User.IsInRole("Developer") || User.IsInRole("Administrator"))
                             {
-                                <li>@Html.ActionLink("Enter Log", "Index", "CreateLog")</li>
+                                <li id="create-nav">@Html.ActionLink("Enter Log", "Index", "CreateLog")</li>
                             }
                             @if (User.IsInRole("Developer") || User.IsInRole("Administrator"))
                             {

Web/Web.csproj

@@ -187,10 +187,11 @@
     <Compile Include="ViewModels\Account\RegisterModel.cs" />
     <Compile Include="ViewModels\CheckBoxViewModel.cs" />
     <Compile Include="ViewModels\CreateLog\EditPastViewModel.cs" />
+    <Compile Include="ViewModels\CreateLog\ImportLogViewModel.cs" />
     <Compile Include="ViewModels\CreateLog\ImportUploadViewModel.cs" />
     <Compile Include="ViewModels\DriverMileageItem.cs" />
     <Compile Include="ViewModels\DriverMileageViewModel.cs" />
-    <Compile Include="ViewModels\LogImportViewModel.cs" />
+    <Compile Include="ViewModels\Log\ImportLogViewModel.cs" />
     <Compile Include="ViewModels\Log\ImportUploadViewModel.cs" />
     <Compile Include="ViewModels\Log\LogViewModel.cs" />
     <Compile Include="ViewModels\Log\LogIndexViewModel.cs" />