Merge pull request 'Fix table sorting algorithm' (#41) from colwellkr/HummingBirdAnimeClient:fix-sort into develop

Reviewed-on: #41

app/views/anime/list.php

@@ -25,10 +25,10 @@
 					<?php endif ?>
 					<th>Title</th>
 					<th>Airing Status</th>
-					<th>Score</th>
+					<th class='numeric'>Score</th>
 					<th>Type</th>
-					<th>Progress</th>
+					<th class='numeric'>Progress</th>
-					<th>Rated</th>
+					<th class='rating'>Age Rating</th>
 					<th>Attributes</th>
 					<?php if($hasNotes): ?><th>Notes</th><?php endif ?>
 				</tr>

app/views/collection/list.php

@@ -38,10 +38,10 @@
 							{$firstTh}
 							<th>Title</th>
 							{$mediaTh}
-							<th>Episode Count</th>
+							<th class='numeric'>Episode Count</th>
-							<th>Episode Length</th>
+							<th class='numeric'>Episode Length</th>
 							<th>Show Type</th>
-							<th>Age Rating</th>
+							<th class='rating'>Age Rating</th>
 							{$noteTh}
 							<th>Genres</th>
 						</tr>

app/views/manga/list.php

@@ -20,8 +20,8 @@
 					<td>&nbsp;</td>
 					<?php endif ?>
 					<th>Title</th>
-					<th>Rating</th>
+					<th class='numeric'>Score</th>
-					<th>Completed Chapters</th>
+					<th class='numeric'>Completed Chapters</th>
 					<th>Attributes</th>
 					<th>Type</th>
 				</tr>

frontEndSrc/js/base/sort-tables.js

@@ -6,9 +6,22 @@ const LightTableSorter = (() => {
 	const sort = (a, b) => {
 		let textA = text(a);
 		let textB = text(b);
-		const n = parseInt(textA, 10);
+		console.log("Comparing " + textA + " and " + textB)
-		if (n) {
+		
-			textA = n;
+		if(th.classList.contains("numeric")){
+			arrayA = textA.replace('episodes:  ','').replace('-',0).split("/");
+			arrayB = textB.replace('episodes:  ','').replace('-',0).split("/");
+			if(arrayA.length > 1) {
+				textA = parseInt(arrayA[0],10) / parseInt(arrayA[1],10);
+				textB = parseInt(arrayB[0],10) / parseInt(arrayB[1],10);
+			}
+			else{
+				textA = parseInt(arrayA[0],10);
+				textB = parseInt(arrayB[0],10);
+			}
+		}
+		else if (parseInt(textA, 10)) {
+			textA = parseInt(textA, 10);
 			textB = parseInt(textB, 10);
 		}
 		if (textA > textB) {
@@ -59,6 +72,7 @@ const LightTableSorter = (() => {
 			for (let i = 0, len = ths.length; i < len; i++) {
 				let th = ths[i];
 				th.classList.add('sorting');
+				th.classList.add('testing');
 				results.push(th.onclick = onClickEvent);
 			}
 			return results;

public/js/tables.min.js

@@ -1 +1 @@
-var LightTableSorter=function(){var th=null;var cellIndex=null;var order='';var text=function(row){return row.cells.item(cellIndex).textContent.toLowerCase()};var sort=function(a,b){var textA=text(a);var textB=text(b);var n=parseInt(textA,10);if(n){textA=n;textB=parseInt(textB,10)}if(textA>textB)return 1;if(textA<textB)return -1;return 0};var toggle=function(){var c=order!=='sorting-asc'?'sorting-asc':'sorting-desc';th.className=(th.className.replace(order,'')+' '+c).trim();return order=c};var reset=function(){th.classList.remove('sorting-asc','sorting-desc');th.classList.add('sorting');return order=''};var onClickEvent=function(e){if(th&&cellIndex!==e.target.cellIndex)reset();th=e.target;if(th.nodeName.toLowerCase()==='th'){cellIndex=th.cellIndex;var tbody=th.offsetParent.getElementsByTagName('tbody')[0];var rows=Array.from(tbody.rows);if(rows){rows.sort(sort);if(order==='sorting-asc')rows.reverse();toggle();tbody.innerHtml='';rows.forEach(function(row){tbody.appendChild(row)})}}};return{init:function(){var ths=document.getElementsByTagName('th');var results=[];for(var i=0,len=ths.length;i<len;i++){var th=ths[i];th.classList.add('sorting');results.push(th.onclick=onClickEvent)}return results}}}();LightTableSorter.init()
+var LightTableSorter=function(){var th=null;var cellIndex=null;var order='';var text=function(row){return row.cells.item(cellIndex).textContent.toLowerCase()};var sort=function(a,b){var textA=text(a);var textB=text(b);console.log("Comparing "+textA+" and "+textB);if(th.classList.contains("numeric")){arrayA=textA.replace('episodes:  ','').replace('-',0).split("/");arrayB=textB.replace('episodes:  ','').replace('-',0).split("/");if(arrayA.length>1){textA=parseInt(arrayA[0],10)/parseInt(arrayA[1],10);textB=parseInt(arrayB[0],10)/parseInt(arrayB[1],10)}else{textA=parseInt(arrayA[0],10);textB=parseInt(arrayB[0],10)}}else if(parseInt(textA,10)){textA=parseInt(textA,10);textB=parseInt(textB,10)}if(textA>textB)return 1;if(textA<textB)return -1;return 0};var toggle=function(){var c=order!=='sorting-asc'?'sorting-asc':'sorting-desc';th.className=(th.className.replace(order,'')+' '+c).trim();return order=c};var reset=function(){th.classList.remove('sorting-asc','sorting-desc');th.classList.add('sorting');return order=''};var onClickEvent=function(e){if(th&&cellIndex!==e.target.cellIndex)reset();th=e.target;if(th.nodeName.toLowerCase()==='th'){cellIndex=th.cellIndex;var tbody=th.offsetParent.getElementsByTagName('tbody')[0];var rows=Array.from(tbody.rows);if(rows){rows.sort(sort);if(order==='sorting-asc')rows.reverse();toggle();tbody.innerHtml='';rows.forEach(function(row){tbody.appendChild(row)})}}};return{init:function(){var ths=document.getElementsByTagName('th');var results=[];for(var i=0,len=ths.length;i<len;i++){var th=ths[i];th.classList.add('sorting');th.classList.add('testing');results.push(th.onclick=onClickEvent)}return results}}}();LightTableSorter.init()