Simplified sorting in slides page (#379)

camicroscope · Apr 17, 2020 · d521a82 · d521a82
1 parent 5e7a3e2
commit d521a82
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/apps/table.html b/apps/table.html
@@ -522,11 +522,8 @@ <h5 class="modal-title" id="slideNameChangeModalLabel">Slide name change confirm
 					//Adding names to later validate for new slide names
 					existingSlideNames = data.map(d => d[1]);
 
-					const thead = HeadMapping.map(d => "<th>" + d.title + `<img id='sort1${d.title}' class='float-right sort-btn' width='15px' src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAAtklEQVRIie3XsQrCMBSF4T+CoJsddHAo9HH6AD634NbNqTgo6FI6WQdTtJLQpG0CxXsglIRyv0ugCYWZRsUGd8ARKIA0FroFTkCjxxnIYqNRcBsaFO9Dg+Cu6KS4LzoJrnh/Mr5oOwpgaSu+GNqVY6wHTN/Jo4DNz1oJrAzv7oH6a/4Ani7duabCvLVrnyKht1pggQUWWOA/g0vD2o3ulRgkOXDhcx1egYNvkTG/IIl+3nUD88gLIHVaGvUECUcAAAAASUVORK5CYII='/>
-
-					<img id='sort2${d.title}' class='float-right sort-btn' width='15px' src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABmJLR0QA/wD/AP+gvaeTAAAAs0lEQVRIie3VsQrCMBSF4T/qoFsddBR8Hncf24KTUAquDg4ugoPWwRbSEk2aJhHlHsiQhPCdZAl8KeMBZ+fADLgF6mLNBjgBVT3OwDYFXGqojqvY8NUAV7ye3Tmj8L0EFlhggQX+F3hi2VdAZlgzJQOm2vwCPDx7kWP+Al1G0SnSyqenVsDdt3Ed7xsvgD39b3sE1kMa++BB0L54UNQVj4La8KjoOzwJ2mQJ7IADsEqF/nae93FcRiryrh8AAAAASUVORK5CYII="/>
-					</th>`);
-
+					const thead = HeadMapping.map((d,i) => `<th>${d.title}	<span class="sort-btn fa fa-sort" data-order=${1}
+						 data-index=${i}>  </span> </th>`);
 
 					thead.push("<th></th>");
 
@@ -609,10 +606,9 @@ <h3 class="text-center h3 mb-0">Available Slides</h3>
 					else
 						pageIndicatorVisible($("#datatables tbody .searched").length);
 				});
-				$(".sort-btn").on("click", function() {
-					var value = $(this)[0].id.substr(5);
-					var upordown = parseInt($(this)[0].id[4]);
-					var index = HeadMapping.findIndex((a)=> a.title.toLowerCase() == value.toLowerCase());
+				$(".sort-btn").on("click", function(e) {
+					var index = e.currentTarget.dataset.index;
+					var order = parseInt(e.currentTarget.dataset.order);
 
 					var trs = "#datatables tbody tr";
 					if(searching){
@@ -627,8 +623,9 @@ <h3 class="text-center h3 mb-0">Available Slides</h3>
 							at=Number(at);
 							bt=Number(bt);
 						}
-						if(upordown===1)
+						if(order===1)
 						{
+							e.currentTarget.dataset.order = 2;
 							if(at>bt)
 								return 1;
 							else if(at<bt)
@@ -638,6 +635,7 @@ <h3 class="text-center h3 mb-0">Available Slides</h3>
 						}
 						else
 						{
+							e.currentTarget.dataset.order = 1;
 							if (at < bt)
 								return 1;
 							else if (at > bt)