Syncing UX 4

This commit is contained in:
Rick Falkvinge
2019-01-30 18:36:33 +01:00
parent c1bbfa75db
commit 496077b56e
4 changed files with 64 additions and 120 deletions
+6 -55
View File
@@ -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
@@ -42,7 +42,7 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base
StringBuilder result = new StringBuilder (16384);
string hasDoxString =
"<img src='/Images/Icons/iconshock-search-256px.png' onmouseover=\\\"this.src='/Images/Icons/iconshock-search-hot-256px.png';\\\" onmouseout=\\\"this.src='/Images/Icons/iconshock-search-256px.png';\\\" baseid='{5}' class='LocalViewDox' style='cursor:pointer' height='20' width='20' />";
"<img src='/Images/Icons/iconshock-search-256px.png' baseid='{5}' class='LocalViewDox action-icon' />";
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 : "&nbsp;") + "\"," +
"\"actions\":\"<span style=\\\"position:relative;left:-2px\\\">" +
"<img id=\\\"IconApproval{5}\\\" class=\\\"LocalIconApproval LocalNew LocalFundsInsufficient\\\" accountid=\\\"{6}\\\" amount=\\\"{4}\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconApproved{5}\\\" class=\\\"LocalIconApproved LocalNew\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconDenial{5}\\\" class=\\\"LocalIconDenial LocalNew\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconDenied{5}\\\" class=\\\"LocalIconDenied LocalNew\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconUndo{5}\\\" class=\\\"LocalIconUndo LocalNew\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" /></span>\"",
"\"actions\":\"<span style='position:relative;left:-2px'\">" +
"<img id='IconApproval{5}' class='LocalIconApproval LocalNew LocalFundsInsufficient action-icon' accountid='{6}' amount='{4}' baseid='{5}' />" +
"<img id='IconApproved{5}' class='LocalIconApproved LocalNew status-icon' baseid='{5}' />" +
"<img id='IconUndo{5}' class='LocalIconUndo LocalNew action-icon' baseid='{5}' />" +
"<img id='IconWait{5}' class='LocalIconWait LocalNew status-icon' baseid='{5}' />" +
"<img id='IconDenial{5}' class='LocalIconDenial LocalNew action-icon' baseid='{5}' />" +
"<img id='IconDenied{5}' class='LocalIconDenied LocalNew status-icon' baseid='{5}' />" +
"</span>\"",
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 : "&nbsp;") + "\"," +
"\"actions\":\"<span style=\\\"position:relative;left:-2px\\\">" +
"<img id=\\\"IconApproval{5}\\\" class=\\\"LocalIconApproval LocalFundsInsufficient LocalPreviouslyAttested\\\" accountid=\\\"{6}\\\" amount=\\\"{4}\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconApproved{5}\\\" class=\\\"LocalIconApproved LocalPreviouslyAttested\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconDenial{5}\\\" class=\\\"LocalIconDenial LocalPreviouslyAttested\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconDenied{5}\\\" class=\\\"LocalIconDenied LocalPreviouslyAttested\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" />" +
"<img id=\\\"IconUndo{5}\\\" class=\\\"LocalIconUndo LocalPreviouslyAttested\\\" baseid=\\\"{5}\\\" height=\\\"18\\\" width=\\\"24\\\" /></span>\"",
"\"actions\":\"<span style='position:relative;left:-2px'>" +
"<img id='IconApproval{5}' class='LocalIconApproval LocalFundsInsufficient LocalPreviouslyAttested' accountid='{6}' amount='{4}' baseid='{5}' />" +
"<img id='IconApproved{5}' class='LocalIconApproved LocalPreviouslyAttested' baseid='{5}' />" +
"<img id='IconUndo{5}' class='LocalIconUndo LocalPreviouslyAttested' baseid='{5}' />" +
"<img id='IconWait{5}' class='LocalIconWait LocalPreviouslyAttested status-icon' baseid='{5}' />" +
"<img id='IconDenial{5}' class='LocalIconDenial LocalPreviouslyAttested' baseid='{5}' />" +
"<img id='IconDenied{5}' class='LocalIconDenied LocalPreviouslyAttested' baseid='{5}' />" +
"</span>\"",
JsonSanitize(GetGlobalResourceObject("Global", item.IdentityDisplay).ToString()),
JsonSanitize(item.Beneficiary), JsonSanitize(TryLocalize(item.Description)),
JsonSanitize(item.BudgetName),
@@ -58,6 +58,7 @@ public partial class Pages_v5_Finance_Json_ValidatableReceipts : DataV5Base
"\"actions\":\"" +
"<img id='IconApprovalE{5}' class='LocalIconApproval action-icon' baseid='E{5}' />" +
"<img id='IconApprovedE{5}' class='LocalIconApproved status-icon' baseid='E{5}' />" +
"<img id='IconWaitE{5}' class='LocalIconWait status-icon' baseid='E{5}' />" +
"<img id='IconUndoE{5}' class='LocalIconUndo action-icon' baseid='E{5}' />" +
"<img id='IconDenialE{5}' class='LocalIconDenial action-icon' baseid='E{5}' />" +
"<img id='IconDeniedE{5}' class='LocalIconDenied status-icon' baseid='E{5}' />\"",
+40 -52
View File
@@ -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('+', ' '));
}
});
});