From 066b09ed7193bb73a78be441d0865dd08e38220b Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 4 Dec 2018 12:28:37 +0100 Subject: [PATCH] Testing more UX --- Site/Pages/v5/Ledgers/EndOfMonth.aspx | 19 +++++++++++++++++++ Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs | 7 ++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx b/Site/Pages/v5/Ledgers/EndOfMonth.aspx index 4ec5cfa5..05af89bd 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx @@ -128,6 +128,13 @@ $('.action-list-item').click(function() { $(this).addClass('action-list-item-disabled'); + + var groupId = $(this).attr['data-group']; + if ($(".action-list-item:not(.action-list-item-disabled)[data-group='" + groupId + "']").length == 0) // no further actions in this group enabled + { + // mark the group as completed + $(".group-status-icon[data-group='" + groupId + "']").fadeIn(); + } }); }); @@ -161,6 +168,18 @@ cursor: pointer; } + .status-icon { + border: 1px solid transparent; + width: 26px; + height: 20px; + } + + .group-status-icon { + border: 1px solid transparent; + width: 32px; + height: 24px; + } + .action-icon:hover { border: 1px solid #FFD580; background: #FFEDC8; diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs index c18b0d8b..60662be5 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs @@ -75,10 +75,11 @@ namespace Swarmops.Frontend.Pages.Ledgers $('#TableEomItems').datagrid('appendRow', { itemGroupName: '" + group.Header.Replace(" ", " ").Replace("'", "''") + @"', + action: """" itemId: '" + group.Id + @"' }); - rowCount = $('#TableEomItems').datagrid('getRows').length; + rowCount = $('#TableEomItems').datagrid('getRows').length; $('#TableEomItems').datagrid('mergeCells', { index: rowCount - 1, @@ -93,8 +94,8 @@ namespace Swarmops.Frontend.Pages.Ledgers { builder.Append(@" $('#TableEomItems').datagrid('appendRow', " + '{' + @" - itemName: '" + item.Name + @"', - action: """" + itemName: """ + item.Name + @""", + action: """" }); "); }