diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs
index 447534c7..13fc0ffc 100644
--- a/Site/App_GlobalResources/Global.designer.cs
+++ b/Site/App_GlobalResources/Global.designer.cs
@@ -1230,6 +1230,15 @@ namespace Resources {
}
}
+ ///
+ /// Looks up a localized string similar to This action is no longer available..
+ ///
+ internal static string Global_Error_Concurrency {
+ get {
+ return ResourceManager.GetString("Global_Error_Concurrency", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Unable to connect WebSocket. Live updates will not be available..
///
diff --git a/Site/App_GlobalResources/Global.resx b/Site/App_GlobalResources/Global.resx
index 19bf3062..ccae9e75 100644
--- a/Site/App_GlobalResources/Global.resx
+++ b/Site/App_GlobalResources/Global.resx
@@ -1072,6 +1072,10 @@
No records
There are no records of the requested type
+
+ This action is no longer available.
+ This message is displayed when another user does something just before this user, so that this user's indended action can't be completed. Example: Somebody else denies an expense claim 2 milliseconds before this user tries to approve the same expense claim. The database updates, but the user interface and user won't have time to react.
+
Item
As in "record", "list item", something listed
diff --git a/Site/Pages/v5/Financial/AttestCosts.aspx b/Site/Pages/v5/Financial/AttestCosts.aspx
index f9e1b8db..be4b93e0 100644
--- a/Site/Pages/v5/Financial/AttestCosts.aspx
+++ b/Site/Pages/v5/Financial/AttestCosts.aspx
@@ -353,12 +353,11 @@
function onDenyRecord() {
var reason = $('#<%=this.TextDenyReason.ClientID%>').val();
- // hide yes/no icons, show denied icon, but set it to "loading" icon until completed
+ // hide yes/no icons, show waiting
- $('#IconApproval' + recordId).hide();
+ $('#IconApproval' + recordId).fadeOut(1000,0.01);
$('#IconDenial' + recordId).hide();
- $('#IconDenied' + recordId).attr('src', '/Images/Abstract/ajaxloader-48x36px.gif');
- $('#IconDenied' + recordId).show();
+ $('#IconWait' + recordId).hide();
<%= this.DialogDeny.ClientID %>_close();
SwarmopsJS.ajaxCall(
@@ -366,10 +365,8 @@
{ recordId: recordId, reason: reason },
$.proxy(function(result) {
if (result.Success) {
- $(this).attr("src", "/Images/Icons/iconshock-red-cross-circled-128x96px.png");
- $(this).fadeIn(); // was visible already, but this will create an effect as it changes image
- $('.row' + $(this).attr('baseid')).animate({ color: "#CCC" }, 500);
- $('.row' + $(this).attr('baseid')).css('text-decoration', 'line-through');
+ $(this).fadeTo(1000, 1);
+ $('.row' + $(this).attr('baseid')).addClass("action-list-item-denied");
} else {
// Failure can happen for many reasons, all bad, so we're just reloading the
// entire grid to cover our bases
diff --git a/Site/Pages/v5/Financial/ValidateReceipts.aspx b/Site/Pages/v5/Financial/ValidateReceipts.aspx
index 997fa28b..1f501714 100644
--- a/Site/Pages/v5/Financial/ValidateReceipts.aspx
+++ b/Site/Pages/v5/Financial/ValidateReceipts.aspx
@@ -137,7 +137,7 @@
- |
+ |
|
|
diff --git a/Site/Style/style-v5.css b/Site/Style/style-v5.css
index ab278212..fd4254f8 100644
--- a/Site/Style/style-v5.css
+++ b/Site/Style/style-v5.css
@@ -1015,17 +1015,17 @@ input.entryError, span.entryError, div.entryError {
display: none;
}
-.action-list-item-completed {
+.action-list-item-completed, .action-list-item-denied {
-webkit-transition: all 0.50s;
transition: all 0.50s;
color: #ccc;
text-decoration: line-through;
}
-.action-list-item-disabled {
+.action-list-item-disabled, .action-list-item-approved {
-webkit-transition: all 0.50s;
transition: all 0.50s;
- color: #aaa;
+ color: #aaa !important;
}
.action-icon-disabled {
@@ -1036,11 +1036,6 @@ input.entryError, span.entryError, div.entryError {
background:transparent !important;
}
-.action-list-item-approved {
- color: #aaa !important;
- transition: all 0.50s;
- -webkit-transition: all 0.50s;
-}
/* DISPLAY FIELDS */