diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort.js b/g2p_self_service_portal/static/src/js/self_service_search_sort.js index 42fff20..907c017 100644 --- a/g2p_self_service_portal/static/src/js/self_service_search_sort.js +++ b/g2p_self_service_portal/static/src/js/self_service_search_sort.js @@ -20,12 +20,8 @@ headercells.forEach(function (th) { th.addEventListener("click", function () { const columnIndex = th.cellIndex; const rows = Array.from(table.rows).slice(1); - const firstColumn = rows.map((row) => row.cells[0]); // Determine the data type for this column - if (columnIndex === 0) { - return; - } - rows.forEach((row) => row.removeChild(row.cells[0])); + let dataType = "text"; const firstRow = rows[0]; const firstCell = firstRow.cells[columnIndex]; @@ -63,9 +59,7 @@ headercells.forEach(function (th) { return comparison; }); - rows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0])); sortOrder = sortOrder === "asc" ? "desc" : "asc"; - table.tBodies[0].append(...rows); }); }); diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js index 8d2dfb3..0ca80f8 100644 --- a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js +++ b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js @@ -106,14 +106,6 @@ allheadercells.forEach(function (th) { let sortOrder = "asc"; th.addEventListener("click", function () { const columnIndex = th.cellIndex; - const firstColumn = allRows.map((row) => row.cells[0]); - - // Skip sorting if it's the first column - if (columnIndex === 0) { - return; - } - allRows.forEach((row) => row.removeChild(row.cells[0])); - allRows.sort(function (a, b) { const aCellValue = a.cells[columnIndex].innerText; const bCellValue = b.cells[columnIndex].innerText; @@ -130,7 +122,7 @@ allheadercells.forEach(function (th) { } return comparison; }); - allRows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0])); + sortOrder = sortOrder === "asc" ? "desc" : "asc"; allRows.forEach(function (row) { alltable.tBodies[0].appendChild(row); diff --git a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml index 5c54841..d63a465 100644 --- a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml +++ b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml @@ -27,7 +27,7 @@ -->
-

My Programs

+

My Applications