From a1b0c3464588f7664594ed096cdbdf5a13886be1 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Fri, 21 Jan 2022 19:41:41 +0100
Subject: [PATCH] Fixed emoji sorting in organization list and service list
 views.

---
 .../htmlize/organizationListView.xhtml        | 47 ++++++++++++++++---
 .../htmlize/serviceListView.xhtml             | 45 +++++++++++++++---
 2 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
index e00bba2..19a6165 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
@@ -47,15 +47,48 @@
 	<script type="text/javascript">
 		$(document).ready(function()
 		{
-		    $.fn.dataTable.moment( 'DD/MM/YYYY' );
+		    $.fn.dataTable.moment('DD/MM/YYYY');
 		 
+            $.extend($.fn.dataTable.ext.type.order,
+		            {
+			            "custom-sort-asc": function(x, y)
+			            {
+			                if (!(!isNaN(x) || !isNaN(y)))
+			                    return 0;
+			                else if (isNaN(x))
+			                    return -1;
+			                else if (isNaN(y))
+			                    return +1;
+			                else
+			                    return x-y;
+			            },
+			            "custom-sort-desc": function(x, y)
+			            {
+			                if (!(!isNaN(x) || !isNaN(y)))
+			                    return 0;
+			                else if (isNaN(x))
+			                    return +1;
+			                else if (isNaN(y))
+			                    return -1;
+			                else
+			                    return y-x;
+			            }
+		           } );
+
+		    
 			$('#organizations').DataTable(
-			{
-				paging: false,
-			    ordering:  true,
-			    "order": [[ 2, "desc" ]],
-			    language: dataTableFrench
-			});
+				{
+					paging: false,
+				    ordering:  true,
+				    "order": [[ 2, "desc" ]],
+				    language: dataTableFrench,
+	                "columnDefs": 
+	                [
+	               		{ targets: 2, "type": 'custom-sort' },
+	               		{ targets: 3, "type": 'custom-sort' },
+	               		{ targets: 4, "type": 'custom-sort' }
+	                ]
+				});
 		} );
 	</script>
 </body>
diff --git a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
index 83d21b0..3a2f581 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
@@ -136,15 +136,46 @@
 	<script type="text/javascript">
 		$(document).ready(function()
 		{
-		    $.fn.dataTable.moment( 'DD/MM/YYYY' );
+		    $.fn.dataTable.moment('DD/MM/YYYY');
 			 
+            $.extend($.fn.dataTable.ext.type.order,
+		            {
+			            "custom-sort-asc": function(x, y)
+			            {
+			                if (!(!isNaN(x) || !isNaN(y)))
+			                    return 0;
+			                else if (isNaN(x))
+			                    return -1;
+			                else if (isNaN(y))
+			                    return +1;
+			                else
+			                    return x-y;
+			            },
+			            "custom-sort-desc": function(x, y)
+			            {
+			                if (!(!isNaN(x) || !isNaN(y)))
+			                    return 0;
+			                else if (isNaN(x))
+			                    return +1;
+			                else if (isNaN(y))
+			                    return -1;
+			                else
+			                    return y-x;
+			            }
+		           } );
+		    
 			$('#serviceListTable').DataTable(
-			{
-				paging: false,
-			    ordering:  true,
-			    "order": [[ 2, "desc" ]],
-			    language: dataTableFrench
-			});
+				{
+					paging: false,
+				    ordering:  true,
+				    "order": [[ 2, "desc" ]],
+				    language: dataTableFrench,
+	                "columnDefs": 
+		                [
+		               		{ targets: 4, "type": 'custom-sort' },
+		               		{ targets: 5, "type": 'custom-sort' }
+		                ]
+				});
 		});
 	</script>
 </body>