Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
poprhythm
2014-02-05 20:30:29 -05:00
parent 0a492156a5
commit ff0b2a140c
17 changed files with 142 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Controllers/CreateLogController.cs
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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();