- fix collisions between js script from main page and the application,

- fix problem with special characters for etrack,

target/classes/static/js/etrackPaggination.js

@@ -27,9 +27,9 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
@@ -132,7 +132,7 @@ function showTable() {
 
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+  var sortBy = document.querySelector('.activeButton').textContent
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {

target/classes/static/js/paggination.js

@@ -14,8 +14,7 @@ var state = {
 }
 
 var myList, data, previousSort;
-
-
+  console.log("raz dwa trzy")
 state.querySet = listForPagination;
 buildTable();
 
@@ -28,15 +27,13 @@ for (let i = 3; i >= 0; i--) {
 function addButtonListeners(i) {
   var buttons = document.querySelectorAll('.btn-sort');
   for (var j = buttons.length - 1; j >= 0; j--) {
-    buttons[j].classList.remove('active');
+    buttons[j].classList.remove('activeButton');
   }
-  document.querySelector('#btn-sort-' + i).classList.add('active');
+  document.querySelector('#btn-sort-' + i).classList.add('activeButton');
   buildTable();
 }
 
-
 function pagination(querySet, page, rows) {
-
   var trimStart = (page - 1) * rows
   var trimEnd = trimStart + rows
   var trimmedData = querySet.slice(trimStart, trimEnd)
@@ -48,10 +45,8 @@ function pagination(querySet, page, rows) {
   }
 }
 
-
 function pageButtons(pages) {
   var wrapper = document.getElementById('pagination-wrapper');
-
   wrapper.innerHTML = ``;
   var maxLeft = (state.page - Math.floor(state.window / 2))
   var maxRight = (state.page + Math.ceil(state.window / 2))
@@ -136,7 +131,6 @@ function showTable() {
                     </td>
                     `
     }
-
     table.append(row)
   }
     for (var i = myList.length + 1; i <= state.rows; i++) {
@@ -158,12 +152,13 @@ function showTable() {
       }
       table.append(row)
     }
-
   pageButtons(data.pages)
 }
 
 function sortTable() {
-  var sortBy = document.querySelector('.active').textContent
+console.log("sortTable");
+  var sortBy = document.querySelector('.activeButton').textContent;
+  console.log(sortBy);
   switch (sortBy) {
     case "MessageId":
       if (previousSort === "MessageId") {
@@ -191,6 +186,7 @@ function sortTable() {
     previousSort = ""
   } else previousSort = sortBy;
   myList = state.querySet;
+    console.log(myList);
 }
 
 function prepareTable() {
@@ -199,6 +195,7 @@ function prepareTable() {
 }
 
 function buildTable() {
+console.log("buildTable");
   sortTable();
   prepareTable();
   showTable();