Add back button for import, remove edit for duplicate
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using AutoMapper;
|
using AutoMapper;
|
||||||
using MileageTraker.Web.ViewModels;
|
using MileageTraker.Web.ViewModels;
|
||||||
using MileageTraker.Web.ViewModels.CreateLog;
|
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
|
||||||
namespace Web.Tests.ViewModels.CreateLog
|
namespace Web.Tests.ViewModels.CreateLog
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ namespace MileageTraker.Web.Controllers
|
|||||||
{
|
{
|
||||||
Status = ImportStatus.Duplicate.ToString(),
|
Status = ImportStatus.Duplicate.ToString(),
|
||||||
Message = "This log has been previously entered",
|
Message = "This log has been previously entered",
|
||||||
Action = link
|
//Action = link
|
||||||
}, JsonRequestBehavior.AllowGet);
|
}, JsonRequestBehavior.AllowGet);
|
||||||
}
|
}
|
||||||
// verify vehicle exists
|
// verify vehicle exists
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
function importLogs(userFullName) {
|
function importLogs(userFullName) {
|
||||||
|
$('.breadcrumb').hide();
|
||||||
$('.import-status').html('<span class="label">Pending</span');
|
$('.import-status').html('<span class="label">Pending</span');
|
||||||
var total = $("#logs > tbody > tr:not(.complete)").length;
|
var total = $("#logs > tbody > tr:not(.complete)").length;
|
||||||
$('#page-import-status').html('<span class="label label-warning"><i class="fa fa-spinner fa-spin"></i> Import In Progress</span> <strong>Keep page open until complete.</strong>');
|
$('#page-import-status').html('<span class="label label-warning"><i class="fa fa-spinner fa-spin"></i> Import In Progress</span> <strong>Keep page open until complete.</strong>');
|
||||||
@@ -29,18 +30,18 @@
|
|||||||
$row.addClass("complete");
|
$row.addClass("complete");
|
||||||
if (result.Status == "Success") {
|
if (result.Status == "Success") {
|
||||||
$('.import-status', $row).html('<span class="label label-success">Success</span');
|
$('.import-status', $row).html('<span class="label label-success">Success</span');
|
||||||
$('.import-status', $row).append(" " + result.Action);
|
|
||||||
}
|
}
|
||||||
else if (result.Status == "Failure") {
|
else if (result.Status == "Failure") {
|
||||||
$('.import-status', $row).html('<span class="label label-important">Failure</span');
|
$('.import-status', $row).html('<span class="label label-important">Failure</span');
|
||||||
$('.import-message', $row).text(result.Message);
|
$('.import-message', $row).text(result.Message);
|
||||||
$('.import-status', $row).append(" " + result.Action);
|
|
||||||
errorCount++;
|
errorCount++;
|
||||||
$('.progress .bar').addClass('bar-warning');
|
$('.progress .bar').addClass('bar-warning');
|
||||||
}
|
}
|
||||||
else if (result.Status == "Duplicate") {
|
else if (result.Status == "Duplicate") {
|
||||||
$('.import-status', $row).html('<span class="label label-inverse">Duplicate</span');
|
$('.import-status', $row).html('<span class="label label-inverse">Duplicate</span');
|
||||||
$('.import-message', $row).text(result.Message);
|
$('.import-message', $row).text(result.Message);
|
||||||
|
}
|
||||||
|
if (result.Action != undefined && result.Action != null) {
|
||||||
$('.import-status', $row).append(" " + result.Action);
|
$('.import-status', $row).append(" " + result.Action);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -48,6 +49,7 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
$('.breadcrumb').show();
|
||||||
$('.progress').removeClass('progress-striped');
|
$('.progress').removeClass('progress-striped');
|
||||||
$('.progress').removeClass('active');
|
$('.progress').removeClass('active');
|
||||||
if (errorCount == 0) {
|
if (errorCount == 0) {
|
||||||
|
|||||||
@@ -8,6 +8,10 @@
|
|||||||
<link href="@Url.Content("~/Content/font-awesome.min.css")" rel="stylesheet" type="text/css" />
|
<link href="@Url.Content("~/Content/font-awesome.min.css")" rel="stylesheet" type="text/css" />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<ul class="no-print breadcrumb">
|
||||||
|
<li>@Html.ActionLink("Enter Log", "Index")</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
@Html.Partial("_StatusMessage")
|
@Html.Partial("_StatusMessage")
|
||||||
|
|
||||||
<h2>@ViewBag.Title</h2>
|
<h2>@ViewBag.Title</h2>
|
||||||
|
|||||||
Reference in New Issue
Block a user