close #16 ソートの不具合を解決

8398a7 · Feb 13, 2015 · 78fae58 · 78fae58
1 parent 332117e
commit 78fae58
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/app/assets/javascripts/recommends.js.coffee b/app/assets/javascripts/recommends.js.coffee
@@ -0,0 +1,11 @@
+$.extend $.fn.DataTable.ext.oSort,
+  'custom': (a) ->
+    a
+  'custom-asc': (x, y) ->
+    x = parseFloat(x)
+    y = parseFloat(y)
+    if x < y then -1 else if x > y then 1 else 0
+  'custom-desc': (x, y) ->
+    x = parseFloat(x)
+    y = parseFloat(y)
+    if x < y then 1 else if x > y then -1 else 0
diff --git a/app/views/recommends/integration.html.slim b/app/views/recommends/integration.html.slim
@@ -27,6 +27,7 @@ javascript:
   (function() {
     $('.table').dataTable({
       order: [1, 'desc'],
-      aLengthMenu: [#{ @sheets.count }]
+      aLengthMenu: [#{ @sheets.count }],
+      columnDefs: [{type: 'custom', targets: [1]}]
     });
   }).call(this);
diff --git a/app/views/recommends/list.html.slim b/app/views/recommends/list.html.slim
@@ -30,8 +30,10 @@ table.table
         td.center bgcolor=@color[0] = val[4]
         td.center = val[5]
 javascript:
-  (function() {
+  $(document).ready(function() {
     $('.table').dataTable({
-      aLengthMenu: [#{ @sheets.count }]
+      order: [4, 'desc'],
+      aLengthMenu: [#{ @sheets.count }],
+      columnDefs: [{type: 'custom', targets: [1, 2, 3, 4, 5, 6]}]
     });
   }).call(this);
diff --git a/app/views/sheets/power.html.slim b/app/views/sheets/power.html.slim
@@ -24,6 +24,7 @@ table.table
 javascript:
   (function() {
     $('.table').dataTable({
-      aLengthMenu: [#{ @sheets.count }]
+      aLengthMenu: [#{ @sheets.count }],
+      columnDefs: [{type: 'custom', targets: [1, 2, 3, 4, 5, 6]}]
     });
   }).call(this);