From dccd31c4f9fcdcccdd223c36e94e3705a59233d4 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 15 Jul 2014 13:42:18 -0700 Subject: Use buttons for transaction report dates --- public/js/report.coffee | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'public/js/report.coffee') diff --git a/public/js/report.coffee b/public/js/report.coffee index ed37159c..9f8a011b 100644 --- a/public/js/report.coffee +++ b/public/js/report.coffee @@ -5,9 +5,21 @@ g = exports ? this $(-> - $('#from').val(moment().subtract('days', 7).format("MM/DD/YYYY")) - $('#to').val(moment().format("MM/DD/YYYY")) - $('.date').datepicker(onClose: filterDates) + from = moment().subtract('days', 7) + to = moment() + + $('#from').html(from.format("MMMM Do, YYYY")) + $('#to').html(to.format("MMMM Do, YYYY")) + + $('#from_date').val(from.format("MM/DD/YYYY")) + $('#to_date').val(to.format("MM/DD/YYYY")) + + $('#from_date').datepicker(onClose: filterDates) + $('#to_date').datepicker(onClose: filterDates) + + $('#from').click(-> $('#from_date').datepicker('show')) + $('#to').click(-> $('#to_date').datepicker('show')) + $.getJSON('transactions.json', (data) -> g.transactions = data.transactions display(g.transactions) @@ -16,11 +28,15 @@ $(-> ) filterDates = -> + $('#from').html(moment($('#from_date').datepicker('getDate')).format("MMMM Do, YYYY")) + $('#to').html(moment($('#to_date').datepicker('getDate')).format("MMMM Do, YYYY")) + transactions = $.grep(g.transactions, (e, i) -> return false unless e - from = moment($('#from').val(), "MM/DD/YYYY") - to = moment($('#to').val(), "MM/DD/YYYY") + from = moment($('#from_date').val(), "MM/DD/YYYY") + to = moment($('#to_date').val(), "MM/DD/YYYY") + d = moment(e.date) amount = parseFloat(e.exchange) * parseFloat(e.received) @@ -31,18 +47,13 @@ filterDates = -> display(transactions) display = (transactions) -> - $('tbody tr').remove() - $('thead, tfoot').show() + $('.alert').remove() + $('.report tbody tr').remove() + $('.report').show() if transactions.length is 0 - $('tbody').append(""" - - - No transactions were found for the specified time period - - - """) - $('thead, tfoot').hide() + $('.report').before("

No transactions were found for the specified time period

") + $('.report').hide() $.each(transactions, -> exchange = parseFloat(this.exchange) @@ -50,7 +61,7 @@ display = (transactions) -> amount = received * exchange received *= 1000 - $('tbody').append(""" + $('.report tbody').append(""" #{this.date} #{this.address} -- cgit v1.2.3