diff --git a/v2realbot/static/index.html b/v2realbot/static/index.html index 2f666e8..726c65e 100644 --- a/v2realbot/static/index.html +++ b/v2realbot/static/index.html @@ -57,7 +57,7 @@ - + @@ -855,7 +855,7 @@ - + diff --git a/v2realbot/static/js/archivetables.js b/v2realbot/static/js/archivetables.js index d1f114e..681dafa 100644 --- a/v2realbot/static/js/archivetables.js +++ b/v2realbot/static/js/archivetables.js @@ -1256,12 +1256,19 @@ var archiveRecords = // Construct the GROUP HEADER - sem pripadna tlačítka atp. //var groupHeaderContent = '' + (group ? 'Batch ID: ' + group : 'No Batch') + ''; var tools = '' + var icon = '' + exp_coll_icon_name = '' if (group) { tools += 'lab_profile' tools += 'delete' + exp_coll_icon_name = (state == 'collapsed') ? 'expand_more' : 'expand_less' + icon = ''+exp_coll_icon_name+'' } + + //console.log(group, groupId, stratinId) - var groupHeaderContent = ''+(group ? 'Batch ID: ' + group: 'No Batch')+''; + //var groupHeaderContent = ''+(group ? 'Batch ID: ' + group: 'No Batch')+''; + var groupHeaderContent = ''+(group ? icon + 'Batch ID: ' + group: 'No Batch')+''; groupHeaderContent += (group ? ' (' + itemCount + ')' + ' ' + period + ' Profit: ' + profit + '' : ''); groupHeaderContent += group ? tools : "" return $('') @@ -1344,6 +1351,15 @@ $('#archiveTable tbody').on('click', 'tr.group-header', function (event) { var headerRow = $(this); var name = headerRow.data('name'); var collapsed = headerRow.hasClass('collapsed'); + + // Toggle the expand icon name + var expandIcon = headerRow.find('.expand-icon'); + if (collapsed) { + expandIcon.text('expand_less'); + } else { + expandIcon.text('expand_more'); + } + headerRow.toggleClass('collapsed'); archiveRecords.rows().every(function () { diff --git a/v2realbot/static/main.css b/v2realbot/static/main.css index 978ba3d..101ffc7 100644 --- a/v2realbot/static/main.css +++ b/v2realbot/static/main.css @@ -20,6 +20,15 @@ overflow: visible; } +.expand-icon { + margin-right: 3px; + vertical-align: middle; + font-size: 15px; + color: var(--bs-gray-400); + border-radius: 4px; + /* padding: 2px; */ +} + .tool-icon { margin-right: 0px; vertical-align: middle; @@ -254,6 +263,15 @@ table.dataTable thead>tr>th.sorting_asc:before, table.dataTable thead>tr>th.sort margin-right: 5px; vertical-align: middle; } +/* Base style for color-tag */ + +/* Additional class to change the triangle direction when the row is expanded */ +.collapsed .color-tag { + border-top: none; + border-bottom: 10px solid #838E65; /* Triangle pointing down when expanded */ +} + + .group-header { cursor: pointer;