From d772d9b0c62ab92d6fbad2a5dccfbccfaf212240 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 30 Jan 2019 18:51:40 +0100 Subject: [PATCH] Syncing UX 5 --- .../Pages/v5/Financial/Json-AttestableCosts.aspx.cs | 2 +- Site/Pages/v5/Financial/ValidateReceipts.aspx | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-AttestableCosts.aspx.cs index 03680c16..12252266 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\":["); diff --git a/Site/Pages/v5/Financial/ValidateReceipts.aspx b/Site/Pages/v5/Financial/ValidateReceipts.aspx index 44401fe3..997fa28b 100644 --- a/Site/Pages/v5/Financial/ValidateReceipts.aspx +++ b/Site/Pages/v5/Financial/ValidateReceipts.aspx @@ -66,6 +66,7 @@ success: function (msg) { var baseId = $(thisIcon).attr("baseid"); $('.row' + baseId).addClass("action-list-item-approved"); + $("#IconWait" + baseId).hide(); $("#IconDenial" + baseId).hide(); $("#IconApproved" + baseId).fadeTo(200, 0.5); // half opacity is intentional $("#IconUndo" + baseId).fadeTo(1000, 1); // the longer delay is intentional @@ -76,8 +77,8 @@ $(".LocalIconUndo").click(function () { var thisIcon = this; - $("#IconApproved" + $(this).attr("baseid")).fadeTo(1000, 0.01); $(this).hide(); + $("#IconApproved" + $(this).attr("baseid")).fadeTo(1000, 0.01); $("#IconWait" + $(this).attr("baseid")).show(); $.ajax({ type: "POST", @@ -87,8 +88,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"); + $("#IconWait" + baseId).hide(); $("#IconApproved" + baseId).hide(); $("#IconApproval" + baseId).fadeTo(200, 1); $("#IconDenial" + baseId).fadeTo(200, 1); @@ -120,11 +121,11 @@ - + +