Match count update for import too

This commit is contained in:
2015-10-13 21:25:25 -04:00
parent 78e8924bfa
commit 43d471af94
4 changed files with 26 additions and 22 deletions
+2
View File
@@ -43,6 +43,8 @@
}
if (result.Action != undefined && result.Action != null) {
$('.match-status', $row).append(" " + result.Action);
var $action = $("a[matchcount]", $row);
matchCountFunc.apply($action);
}
submitNext();
+16 -13
View File
@@ -83,21 +83,24 @@ $(function () {
}
});
var matchCountFunc = function() {
var $link = $(this);
var url = $link.attr("matchcount");
return $.ajax({
url: url,
success: function(matchcount) {
if (matchcount > 0) {
$link.append(" <span class='badge badge-info'>" + matchcount + "</span>");
} else {
$link.append(" <span class='badge'>0</span>");
}
}
});
};
// add get match count for all the current items
$(function () {
var $requests = $("a[matchcount]").map(function() {
var $link = $(this);
return $.ajax({
url: $link.attr("matchcount"),
success: function (matchcount) {
if (matchcount > 0) {
$link.append(" <span class='badge badge-info'>" + matchcount + "</span>");
} else {
$link.append(" <span class='badge'>0</span>");
}
}
});
});
var $requests = $("a[matchcount]").map(matchCountFunc);
$.when.apply($, $requests);
});
@@ -12,6 +12,12 @@
LogId = fuelLog.Log.LogId;
}
public MatchLinkViewModel(int fuelLogId, int? logId)
{
FuelLogId = fuelLogId;
LogId = logId;
}
public MatchLinkViewModel(ImportFuelLogViewModel viewModel)
{
FuelLogId = viewModel.FuelLogId;
+2 -9
View File
@@ -1,4 +1,5 @@
@using MileageTraker.Web.Utility
@using MileageTraker.Web.ViewModels.FuelLog
@model MileageTraker.Web.ViewModels.FuelLog.FuelLogResultsViewModel
@{
@@ -44,15 +45,7 @@
grid.Column("MPG"),
grid.Column("GasPurchased", "Gas Purchased", @<text>@String.Format("{0:0.000}", item.GasPurchased)</text>),
grid.Column("TotalPrice", "Total Price", @<text>@String.Format("{0:C}", item.TotalPrice)</text>),
grid.Column("Log", "Matched Log", @<text>
@(item.LogId != null
? Html.ActionLink("View Match", "Match", new {id = item.FuelLogId}, new {@class = "btn btn-mini", target="_blank"})
: Html.ActionLink("Match", "Match", new {id = item.FuelLogId},
new {@class = "btn btn-warning btn-mini",
target="_blank",
matchcount=Url.Action("AvailableMatchCount", "FuelLog", new {id = item.FuelLogId})
}))
</text>)),
grid.Column("Log", "Matched Log", item => @Html.Partial("MatchLink", new MatchLinkViewModel (item.FuelLogId, item.LogId)))),
htmlAttributes: new { @class = "table table-striped table-bordered table-hover table-condensed"},
numericLinksCount: 20
)