diff --git a/Site/Pages/v5/Financial/AttestCosts.aspx b/Site/Pages/v5/Financial/AttestCosts.aspx
index 871e3634..68ffa7e2 100644
--- a/Site/Pages/v5/Financial/AttestCosts.aspx
+++ b/Site/Pages/v5/Financial/AttestCosts.aspx
@@ -67,61 +67,14 @@
onLoadSuccess: function () {
budgetRemainingLookup.attestabilityInitialized = false;
- $(".LocalIconApproval").attr("src", '/Images/Abstract/ajaxloader-48x36px.gif'); // initialize as rotating loader until budgets known
- $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png").css("opacity", 0.5);
- $(".LocalIconDenied").attr("src", "/Images/Icons/iconshock-red-cross-circled-128x96px.png");
- $(".LocalIconUndo").attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png");
- $(".LocalIconApproved.LocalNew, .LocalIconUndo.LocalNew, .LocalIconDenied.LocalNew, .LocalIconApproval.LocalPreviouslyAttested, .LocalIconDenial.LocalPreviouslyAttested, .LocalIconDenied.LocalPreviouslyAttested").css("display", "none");
+ $(".LocalIconApproval").attr("src", '/Images/Icons/iconshock-balloon-yes-128x96px.png').hide(); // Initialized to wait icon
+ $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png").hide().css("opacity", 0.5);
+ $(".LocalIconDenied").attr("src", "/Images/Icons/iconshock-red-cross-circled-128x96px.png").hide();
+ $(".LocalIconUndo").attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png").hide();
+ $(".LocalIconWait").attr("src", "/Images/Abstract/ajaxloader-48x36px.gif").show(); // initializes as wait cursor here until budgets loaded
+ $(".LocalIconApproved.LocalNew, .LocalIconUndo.LocalNew, .LocalIconDenied.LocalNew, .LocalIconApproval.LocalPreviouslyAttested, .LocalIconDenial.LocalPreviouslyAttested, .LocalIconDenied.LocalPreviouslyAttested").hide();
$(".LocalIconDenial").attr("src", "/Images/Icons/iconshock-balloon-no-128x96px.png");
- $(".LocalIconApproval, .LocalIconUndo, .LocalIconDenial").css("cursor", "pointer");
- $(".LocalIconApproval").mouseover(function () {
- if (budgetRemainingLookup.attestabilityInitialized) {
- if ($(this).attr("rel") != "loading") {
- if ($(this).hasClass("LocalFundsInsufficient")) {
- $(this).attr("src", approvalOverdraftIconHover);
- } else {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-hot.png");
- }
- }
- }
- });
-
- $(".LocalIconApproval").mouseout(function () {
- if (budgetRemainingLookup.attestabilityInitialized) {
- if ($(this).attr("rel") != "loading") {
- if ($(this).hasClass("LocalFundsInsufficient")) {
- $(this).attr("src", approvalOverdraftIcon);
- } else {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png");
- }
- }
- }
- });
-
- $(".LocalIconUndo").mouseover(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px-hot.png");
- }
- });
-
- $(".LocalIconUndo").mouseout(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png");
- }
- });
-
- $(".LocalIconDenial").mouseover(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-no-128x96px-hot.png");
- }
- });
-
- $(".LocalIconDenial").mouseout(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("src", "/Images/Icons/iconshock-balloon-no-128x96px.png");
- }
- });
$(".LocalIconDenial").click(function() {
if ($(this).attr("rel") != "loading" && $("#IconApproval" + $(this).attr("baseid")) != "loading") {
@@ -321,8 +274,6 @@
$("#IconDenial" + baseid).finish().css("display", "none").css("opacity", 1.0);
$("#IconUndo" + baseid).fadeIn(100);
$('.row' + baseid).addClass("action-list-item-approved");
- $('.row' + baseid).removeClass("datagrid-row-selected");
- $('.row' + baseid).removeClass("datagrid-row-checked");
alertify.success(SwarmopsJS.unescape(msg.d.DisplayMessage));
recheckBudgets(); // will double-check budgets against server
diff --git a/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs
index 751ada58..03680c16 100644
--- a/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs
+++ b/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs
@@ -42,7 +42,7 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base
StringBuilder result = new StringBuilder (16384);
string hasDoxString =
- "
";
+ "
";
result.Append ("{\"rows\":[");
@@ -52,12 +52,14 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base
result.AppendFormat(
"\"item\":\"{0}\",\"beneficiary\":\"{1}\",\"description\":\"{2}\",\"budgetName\":\"{3}\",\"amountRequested\":\"{4:N2}\",\"itemId\":\"{5}\"," +
"\"dox\":\"" + (item.HasDox ? hasDoxString : " ") + "\"," +
- "\"actions\":\"" +
- "
" +
- "
" +
- "
" +
- "
" +
- "
\"",
+ "\"actions\":\"" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "\"",
JsonSanitize(GetGlobalResourceObject("Global", item.IdentityDisplay).ToString()),
JsonSanitize(item.Beneficiary), JsonSanitize(TryLocalize(item.Description)),
JsonSanitize(item.BudgetName),
@@ -71,12 +73,14 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base
result.AppendFormat(
"\"item\":\"{0}\",\"beneficiary\":\"{1}\",\"description\":\"{2}\",\"budgetName\":\"{3}\",\"approved\":\"yes\",\"amountRequested\":\"{4:N2}\",\"itemId\":\"{5}\"," +
"\"dox\":\"" + (item.HasDox ? hasDoxString : " ") + "\"," +
- "\"actions\":\"" +
- "
" +
- "
" +
- "
" +
- "
" +
- "
\"",
+ "\"actions\":\"" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "
" +
+ "\"",
JsonSanitize(GetGlobalResourceObject("Global", item.IdentityDisplay).ToString()),
JsonSanitize(item.Beneficiary), JsonSanitize(TryLocalize(item.Description)),
JsonSanitize(item.BudgetName),
diff --git a/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs b/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs
index 42698409..dc6df6a8 100644
--- a/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs
+++ b/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs
@@ -58,6 +58,7 @@ public partial class Pages_v5_Finance_Json_ValidatableReceipts : DataV5Base
"\"actions\":\"" +
"
" +
"
" +
+ "
" +
"
" +
"
" +
"
\"",
diff --git a/Site/Pages/v5/Financial/ValidateReceipts.aspx b/Site/Pages/v5/Financial/ValidateReceipts.aspx
index 0fe2243d..44401fe3 100644
--- a/Site/Pages/v5/Financial/ValidateReceipts.aspx
+++ b/Site/Pages/v5/Financial/ValidateReceipts.aspx
@@ -49,64 +49,52 @@
$(".LocalIconDenial").attr('src', '/Images/Icons/iconshock-balloon-no-128x96px.png');
$(".LocalIconDenied").attr('src', '/Images/Icons/iconshock-red-cross-128x96px.png').hide();
$(".LocalIconUndo").attr('src', '/Images/Icons/iconshock-balloon-undo-128x96px.png').hide();
+ $(".LocalIconWait").attr('src', '/Images/Abstract/ajaxloader-48x36px.gif').hide();
$(".LocalIconApproval").click(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("rel", "loading");
- $(this).attr("src", "/Images/Abstract/ajaxloader-48x36px.gif");
- $("#IconDenial" + $(this).attr("baseid")).fadeTo(1000, 0.01);
- var thisIcon = this;
- $.ajax({
- type: "POST",
- url: "/Pages/v5/Financial/ValidateReceipts.aspx/Validate",
- data: "{'identifier': '" + escape($(this).attr("baseid")) + "'}",
- contentType: "application/json; charset=utf-8",
- dataType: "json",
- success: function (msg) {
- var baseId = $(thisIcon).attr("baseid");
- $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png");
- $(thisIcon).attr("rel", "active");
- $(thisIcon).hide();
- $('.row' + baseId).addClass("action-list-item-approved");
- $('.row' + baseId).removeClass("datagrid-row-selected");
- $('.row' + baseId).removeClass("datagrid-row-checked");
- $("#IconDenial" + baseId).hide();
- $("#IconApproved" + baseId).fadeTo(200, 1);
- $("#IconUndo" + baseId).fadeTo(1000, 1); // the longer delay is intentional
- alertify.success(unescape(msg.d));
- }
- });
- }
+ $(this).hide();
+ $("#IconWait" + $(this).attr("baseid")).show();
+ $("#IconDenial" + $(this).attr("baseid")).fadeTo(1000, 0.01);
+ var thisIcon = this;
+ $.ajax({
+ type: "POST",
+ url: "/Pages/v5/Financial/ValidateReceipts.aspx/Validate",
+ data: "{'identifier': '" + escape($(this).attr("baseid")) + "'}",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ success: function (msg) {
+ var baseId = $(thisIcon).attr("baseid");
+ $('.row' + baseId).addClass("action-list-item-approved");
+ $("#IconDenial" + baseId).hide();
+ $("#IconApproved" + baseId).fadeTo(200, 0.5); // half opacity is intentional
+ $("#IconUndo" + baseId).fadeTo(1000, 1); // the longer delay is intentional
+ alertify.success(unescape(msg.d));
+ }
+ });
});
$(".LocalIconUndo").click(function () {
- if ($(this).attr("rel") != "loading") {
- $(this).attr("rel", "loading");
- $(this).attr("src", "/Images/Abstract/ajaxloader-48x36px.gif");
- var thisIcon = this;
- $("#IconApproved" + $(this).attr("baseid")).fadeTo(1000, 0.01);
- $.ajax({
- type: "POST",
- url: "/Pages/v5/Financial/ValidateReceipts.aspx/Devalidate",
- data: "{'identifier': '" + escape($(this).attr("baseid")) + "'}",
- contentType: "application/json; charset=utf-8",
- dataType: "json",
- success: function (msg) {
- var baseId = $(thisIcon).attr("baseid");
- $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png");
- $(thisIcon).css("display", "none");
- $(thisIcon).attr("rel", "");
- $('.row' + baseId).removeClass("action-list-item-approved");
- $("#IconApproved" + baseId).hide();
- $("#IconApproval" + baseId).fadeTo(200, 1);
- $("#IconDenial" + baseId).fadeTo(200, 1);
- $("#" + $(thisIcon).attr("rel"), "");
- alertify.log(unescape(msg.d).replace('+', ' '));
- }
- });
-
- }
+ var thisIcon = this;
+ $("#IconApproved" + $(this).attr("baseid")).fadeTo(1000, 0.01);
+ $(this).hide();
+ $("#IconWait" + $(this).attr("baseid")).show();
+ $.ajax({
+ type: "POST",
+ url: "/Pages/v5/Financial/ValidateReceipts.aspx/Devalidate",
+ data: "{'identifier': '" + escape($(this).attr("baseid")) + "'}",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ success: function (msg) {
+ var baseId = $(thisIcon).attr("baseid");
+ $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png");
+ $('.row' + baseId).removeClass("action-list-item-approved");
+ $("#IconApproved" + baseId).hide();
+ $("#IconApproval" + baseId).fadeTo(200, 1);
+ $("#IconDenial" + baseId).fadeTo(200, 1);
+ alertify.log(unescape(msg.d).replace('+', ' '));
+ }
+ });
});