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

This commit is contained in:
2014-02-05 20:30:29 -05:00
parent 0a492156a5
commit ff0b2a140c
17 changed files with 142 additions and 57 deletions
+6 -5
View File
@@ -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<LogImportViewModel>.WriteItems(worksheet, new[] { example }, 1); // write the example item
ExcelWriter<ImportLogViewModel>.WriteColumnHeaders(worksheet, formatString: headerFormat);
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();
+5 -6
View File
@@ -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.CreateLog;
using MileageTraker.Web.ViewModels.Log;
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"),