From e98950b336cfec8eb570f54f926172825a72f9c0 Mon Sep 17 00:00:00 2001 From: Felix Van der Jeugt Date: Fri, 11 Sep 2015 17:51:45 +0200 Subject: [PATCH 1/2] remove console.log --- app/views/users/show.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 1e5da96..c3867e0 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -94,7 +94,6 @@ var filter = $(element); var type = filter.attr('data-input-type'); var column = table.column(filter.attr('data-filter-name') + ':name'); - console.log(column); filter.find('input').on('keyup change', function() { var value = null if(filter.hasClass('bound')) { From 6e192bb907e40e673add8aaf971324fc0f9395dc Mon Sep 17 00:00:00 2001 From: Ilion Beyst Date: Fri, 11 Sep 2015 17:54:37 +0200 Subject: [PATCH 2/2] reload table on new transaction --- app/assets/javascripts/transactions.js | 57 +++++++++++++++++++++++++ app/views/users/show.html.haml | 58 -------------------------- 2 files changed, 57 insertions(+), 58 deletions(-) diff --git a/app/assets/javascripts/transactions.js b/app/assets/javascripts/transactions.js index 32cbd0b..5d578e4 100644 --- a/app/assets/javascripts/transactions.js +++ b/app/assets/javascripts/transactions.js @@ -4,6 +4,61 @@ ready = function() { errors = $("#transaction_errors") panel_ul = $(errors).find(".panel-body ul") flash_success = $("#transaction_success") + var table = $('#transactions').DataTable({ + processing: true, + serverSide: true, + searching: true, + lengthChange: false, + ordering: false, + ajax: $('#transactions').data('source'), + pagingType: 'full_numbers', + autoWidth: false, + responsive: true, + columns: [ + { data: 'time', name: 'Time', width: "15%", className: 'min-tablet-l'}, + { data: 'amount', name: 'Amount', width: "10%", className: 'min-mobile'}, + { data: 'peer', name: 'Peer', width: "15%", className: 'min-mobile'}, + { data: 'issuer', name: 'Issuer', width: "15%", className: 'min-desktop'}, + { data: 'message', name: 'Message', width: "45%", className: 'min-tablet-p'} + ], + columnDefs: [ + { + targets: 0, + render: function(data, type, full, meta) { + return $.format.date(data, 'E dd/MM/yyyy HH:mm'); + } + }, + { + targets: 1, + render: function(data, type, full, meta) { + return (data/100).toFixed(2); + } + } + ] + }); + + $('.dataTables_filter').hide(); + + $('.input-listen').each(function(index, element) { + var filter = $(element); + var type = filter.attr('data-input-type'); + var column = table.column(filter.attr('data-filter-name') + ':name'); + console.log(column); + filter.find('input').on('keyup change', function() { + var value = null + if(filter.hasClass('bound')) { + var lower = filter.find('.lower-bound'); + var upper = filter.find('.upper-bound'); + value = lower.val() + '~' + upper.val(); + } else { + value = $(this).val(); + } + value = filter.attr('data-input-type') + ':' + value; + if(column.search() !== value) { + column.search(value).draw(); + } + }); + }); $(form).on("ajax:before", function(xhr, settings) { $(flash_success).addClass("hidden") @@ -22,9 +77,11 @@ ready = function() { }).on("ajax:complete", function(xhr, status) { $(submit_button).val("Send it") $(submit_button).attr('disabled', false); + table.ajax.reload(); }) } + $.ajaxSetup({ dataType: 'text' }) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index c3867e0..f0dddc6 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -52,61 +52,3 @@ %th Issuer %th Message %tbody - -:javascript - $(document).ready(function() { - var table = $('#transactions').DataTable({ - processing: true, - serverSide: true, - searching: true, - lengthChange: false, - ordering: false, - ajax: $('#transactions').data('source'), - pagingType: 'full_numbers', - autoWidth: false, - responsive: true, - columns: [ - { data: 'time', name: 'Time', width: "15%", className: 'min-tablet-l'}, - { data: 'amount', name: 'Amount', width: "10%", className: 'min-mobile'}, - { data: 'peer', name: 'Peer', width: "15%", className: 'min-mobile'}, - { data: 'issuer', name: 'Issuer', width: "15%", className: 'min-desktop'}, - { data: 'message', name: 'Message', width: "45%", className: 'min-tablet-p'} - ], - columnDefs: [ - { - targets: 0, - render: function(data, type, full, meta) { - return $.format.date(data, 'E dd/MM/yyyy HH:mm'); - } - }, - { - targets: 1, - render: function(data, type, full, meta) { - return (data/100).toFixed(2); - } - } - ] - }); - - $('.dataTables_filter').hide(); - - $('.input-listen').each(function(index, element) { - var filter = $(element); - var type = filter.attr('data-input-type'); - var column = table.column(filter.attr('data-filter-name') + ':name'); - filter.find('input').on('keyup change', function() { - var value = null - if(filter.hasClass('bound')) { - var lower = filter.find('.lower-bound'); - var upper = filter.find('.upper-bound'); - value = lower.val() + '~' + upper.val(); - } else { - value = $(this).val(); - } - value = filter.attr('data-input-type') + ':' + value; - if(column.search() !== value) { - column.search(value).draw(); - } - }); - }); - });