From 250adc8a0d1b26cd19689513ac5ed013003be9fd Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 15 Feb 2025 14:37:48 +0000 Subject: [PATCH 1/3] Forgotten victim of new datatable --- assets/js/sections/hamsat.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/js/sections/hamsat.js b/assets/js/sections/hamsat.js index 2092bf648..3865536dd 100644 --- a/assets/js/sections/hamsat.js +++ b/assets/js/sections/hamsat.js @@ -49,7 +49,7 @@ function configureButton(rowLength) { function loadActivationsTable(rows, show_workable_only) { var uninitialized = $('#activationsList').filter(function() { - if ($.fn.DataTable.fnIsDataTable(this)) { + if ($.fn.DataTable.isDataTable(this)) { return false; } else { configureButton(rows.length); @@ -76,6 +76,9 @@ function loadActivationsTable(rows, show_workable_only) { ordering: true, "scrollY": window.innerHeight - $('#searchForm').innerHeight() - 250, "scrollCollapse": true, + createdRow: function (row, data, dataIndex) { + $(row).attr('id',data.id); + }, "language": { url: getDataTablesLanguageUrl(), }, @@ -171,10 +174,10 @@ function loadActivationsTable(rows, show_workable_only) { } else { data.push(''); } - + data.id='activationID-' + activation.id; let createdRow = table.row.add(data).index(); table.rows(createdRow).nodes().to$().data('activationID', activation.id); - table.row(createdRow).node().id = 'activationID-' + activation.id; + // table.row(createdRow).node().id = 'activationID-' + activation.id; } table.draw(); $('[data-bs-toggle="tooltip"]').tooltip(); From 6274431e296f83e35778ac96b460cc37a8eced6c Mon Sep 17 00:00:00 2001 From: int2001 Date: Sat, 15 Feb 2025 14:38:56 +0000 Subject: [PATCH 2/3] Remove commented out line --- assets/js/sections/hamsat.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/js/sections/hamsat.js b/assets/js/sections/hamsat.js index 3865536dd..a8846b80e 100644 --- a/assets/js/sections/hamsat.js +++ b/assets/js/sections/hamsat.js @@ -177,7 +177,6 @@ function loadActivationsTable(rows, show_workable_only) { data.id='activationID-' + activation.id; let createdRow = table.row.add(data).index(); table.rows(createdRow).nodes().to$().data('activationID', activation.id); - // table.row(createdRow).node().id = 'activationID-' + activation.id; } table.draw(); $('[data-bs-toggle="tooltip"]').tooltip(); From f8c3b7fe3a0f1eebc5e270bcdf99f0b5062a2432 Mon Sep 17 00:00:00 2001 From: int2001 Date: Sun, 16 Feb 2025 06:58:15 +0000 Subject: [PATCH 3/3] Workaround for dtable-error --- assets/js/sections/hamsat.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/assets/js/sections/hamsat.js b/assets/js/sections/hamsat.js index a8846b80e..7c43b10cf 100644 --- a/assets/js/sections/hamsat.js +++ b/assets/js/sections/hamsat.js @@ -68,9 +68,15 @@ function loadActivationsTable(rows, show_workable_only) { $.fn.dataTable.moment(custom_date_format); $(this).DataTable({ "pageLength": 25, - "columnDefs": [{ - "targets": [8, 9, 10], "orderable": false - }], + "columnDefs": [ + { + "defaultContent": "-", + "targets": "_all" + },{ + "targets": [8, 9, 10], + "orderable": false + } + ], searching: true, responsive: false, ordering: true,