From d28440e3c830c4f77e1a4359f3fc42fc958a2e7c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 15 Aug 2014 10:54:33 -0700 Subject: Fade in transactions report --- public/assets/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../assets/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../assets/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../assets/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../assets/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes .../assets/images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 0 bytes .../assets/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 0 bytes .../assets/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes public/assets/images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes public/assets/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes public/assets/images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes public/assets/images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes public/assets/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes public/css/images/animated-overlay.gif | Bin 0 -> 1738 bytes public/css/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes public/css/images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 208 bytes public/css/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes public/css/images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 207 bytes public/css/images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes public/css/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes public/css/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes public/css/images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes public/css/images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes public/css/images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes public/css/images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes public/css/images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes public/js/report.coffee | 61 +++++++++++---------- views/transactions/index.html | 3 +- 30 files changed, 33 insertions(+), 31 deletions(-) delete mode 100644 public/assets/images/animated-overlay.gif delete mode 100644 public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 public/assets/images/ui-bg_flat_75_ffffff_40x100.png delete mode 100644 public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 public/assets/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 public/assets/images/ui-bg_glass_75_dadada_1x400.png delete mode 100644 public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png delete mode 100644 public/assets/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 public/assets/images/ui-icons_222222_256x240.png delete mode 100644 public/assets/images/ui-icons_2e83ff_256x240.png delete mode 100644 public/assets/images/ui-icons_454545_256x240.png delete mode 100644 public/assets/images/ui-icons_888888_256x240.png delete mode 100644 public/assets/images/ui-icons_cd0a0a_256x240.png create mode 100644 public/css/images/animated-overlay.gif create mode 100644 public/css/images/ui-bg_flat_0_aaaaaa_40x100.png create mode 100644 public/css/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 public/css/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 public/css/images/ui-bg_glass_65_ffffff_1x400.png create mode 100644 public/css/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 public/css/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 public/css/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 public/css/images/ui-icons_222222_256x240.png create mode 100644 public/css/images/ui-icons_2e83ff_256x240.png create mode 100644 public/css/images/ui-icons_454545_256x240.png create mode 100644 public/css/images/ui-icons_888888_256x240.png create mode 100644 public/css/images/ui-icons_cd0a0a_256x240.png diff --git a/public/assets/images/animated-overlay.gif b/public/assets/images/animated-overlay.gif deleted file mode 100644 index d441f75e..00000000 Binary files a/public/assets/images/animated-overlay.gif and /dev/null differ diff --git a/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png deleted file mode 100644 index 9aab30b1..00000000 Binary files a/public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ diff --git a/public/assets/images/ui-bg_flat_75_ffffff_40x100.png b/public/assets/images/ui-bg_flat_75_ffffff_40x100.png deleted file mode 100644 index 0b2088de..00000000 Binary files a/public/assets/images/ui-bg_flat_75_ffffff_40x100.png and /dev/null differ diff --git a/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index b1e1380b..00000000 Binary files a/public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ diff --git a/public/assets/images/ui-bg_glass_65_ffffff_1x400.png b/public/assets/images/ui-bg_glass_65_ffffff_1x400.png deleted file mode 100644 index 0850cce5..00000000 Binary files a/public/assets/images/ui-bg_glass_65_ffffff_1x400.png and /dev/null differ diff --git a/public/assets/images/ui-bg_glass_75_dadada_1x400.png b/public/assets/images/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 7d57debb..00000000 Binary files a/public/assets/images/ui-bg_glass_75_dadada_1x400.png and /dev/null differ diff --git a/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png deleted file mode 100644 index 4061d4a2..00000000 Binary files a/public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ diff --git a/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png b/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png deleted file mode 100644 index 83e61bc8..00000000 Binary files a/public/assets/images/ui-bg_glass_95_fef1ec_1x400.png and /dev/null differ diff --git a/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png deleted file mode 100644 index 7d58f386..00000000 Binary files a/public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png and /dev/null differ diff --git a/public/assets/images/ui-icons_222222_256x240.png b/public/assets/images/ui-icons_222222_256x240.png deleted file mode 100644 index c1cb1170..00000000 Binary files a/public/assets/images/ui-icons_222222_256x240.png and /dev/null differ diff --git a/public/assets/images/ui-icons_2e83ff_256x240.png b/public/assets/images/ui-icons_2e83ff_256x240.png deleted file mode 100644 index 84b601bf..00000000 Binary files a/public/assets/images/ui-icons_2e83ff_256x240.png and /dev/null differ diff --git a/public/assets/images/ui-icons_454545_256x240.png b/public/assets/images/ui-icons_454545_256x240.png deleted file mode 100644 index b6db1acd..00000000 Binary files a/public/assets/images/ui-icons_454545_256x240.png and /dev/null differ diff --git a/public/assets/images/ui-icons_888888_256x240.png b/public/assets/images/ui-icons_888888_256x240.png deleted file mode 100644 index feea0e20..00000000 Binary files a/public/assets/images/ui-icons_888888_256x240.png and /dev/null differ diff --git a/public/assets/images/ui-icons_cd0a0a_256x240.png b/public/assets/images/ui-icons_cd0a0a_256x240.png deleted file mode 100644 index ed5b6b09..00000000 Binary files a/public/assets/images/ui-icons_cd0a0a_256x240.png and /dev/null differ diff --git a/public/css/images/animated-overlay.gif b/public/css/images/animated-overlay.gif new file mode 100644 index 00000000..d441f75e Binary files /dev/null and b/public/css/images/animated-overlay.gif differ diff --git a/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100644 index 00000000..9aab30b1 Binary files /dev/null and b/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/public/css/images/ui-bg_flat_75_ffffff_40x100.png b/public/css/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100644 index 00000000..0b2088de Binary files /dev/null and b/public/css/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 00000000..b1e1380b Binary files /dev/null and b/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/public/css/images/ui-bg_glass_65_ffffff_1x400.png b/public/css/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100644 index 00000000..0850cce5 Binary files /dev/null and b/public/css/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/public/css/images/ui-bg_glass_75_dadada_1x400.png b/public/css/images/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 00000000..7d57debb Binary files /dev/null and b/public/css/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100644 index 00000000..4061d4a2 Binary files /dev/null and b/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/public/css/images/ui-bg_glass_95_fef1ec_1x400.png b/public/css/images/ui-bg_glass_95_fef1ec_1x400.png new file mode 100644 index 00000000..83e61bc8 Binary files /dev/null and b/public/css/images/ui-bg_glass_95_fef1ec_1x400.png differ diff --git a/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png new file mode 100644 index 00000000..7d58f386 Binary files /dev/null and b/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png differ diff --git a/public/css/images/ui-icons_222222_256x240.png b/public/css/images/ui-icons_222222_256x240.png new file mode 100644 index 00000000..c1cb1170 Binary files /dev/null and b/public/css/images/ui-icons_222222_256x240.png differ diff --git a/public/css/images/ui-icons_2e83ff_256x240.png b/public/css/images/ui-icons_2e83ff_256x240.png new file mode 100644 index 00000000..84b601bf Binary files /dev/null and b/public/css/images/ui-icons_2e83ff_256x240.png differ diff --git a/public/css/images/ui-icons_454545_256x240.png b/public/css/images/ui-icons_454545_256x240.png new file mode 100644 index 00000000..b6db1acd Binary files /dev/null and b/public/css/images/ui-icons_454545_256x240.png differ diff --git a/public/css/images/ui-icons_888888_256x240.png b/public/css/images/ui-icons_888888_256x240.png new file mode 100644 index 00000000..feea0e20 Binary files /dev/null and b/public/css/images/ui-icons_888888_256x240.png differ diff --git a/public/css/images/ui-icons_cd0a0a_256x240.png b/public/css/images/ui-icons_cd0a0a_256x240.png new file mode 100644 index 00000000..ed5b6b09 Binary files /dev/null and b/public/css/images/ui-icons_cd0a0a_256x240.png differ diff --git a/public/js/report.coffee b/public/js/report.coffee index 7bcfb8c3..90b7c0aa 100644 --- a/public/js/report.coffee +++ b/public/js/report.coffee @@ -48,37 +48,38 @@ filterDates = -> display(transactions) display = (transactions) -> - $('.alert').remove() $('.report tbody tr').remove() - $('.report').show() if transactions.length is 0 - $('.report').before("

No transactions were found for the specified time period

") $('.report').hide() - - $.each(transactions, -> - exchange = parseFloat(this.exchange) - received = parseFloat(this.received) - amount = received * exchange - - $('.report tbody').append(""" - - #{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')} - #{exchange.toFixed(2)} - #{received.toFixed(5)} - #{amount.toFixed(2)} - - """) - ) - - btc = 0 - $('table.report tbody td:nth-child(3)').each(-> - btc += parseFloat($(this).html()) - ) - $('#btc').html(btc.toFixed(5)) - - cad = 0 - $('table.report tbody td:nth-child(4)').each(-> - cad += parseFloat($(this).html()) - ) - $('#cad').html(cad.toFixed(2)) + $('.alert').fadeIn() + else + $('.alert').hide() + $.each(transactions, -> + exchange = parseFloat(this.exchange) + received = parseFloat(this.received) + amount = received * exchange + + $('.report tbody').append(""" + + #{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')} + #{exchange.toFixed(2)} + #{received.toFixed(5)} + #{amount.toFixed(2)} + + """) + ) + + btc = 0 + $('table.report tbody td:nth-child(3)').each(-> + btc += parseFloat($(this).html()) + ) + $('#btc').html(btc.toFixed(5)) + + cad = 0 + $('table.report tbody td:nth-child(4)').each(-> + cad += parseFloat($(this).html()) + ) + $('#cad').html(cad.toFixed(2)) + + $('.report').fadeIn() diff --git a/views/transactions/index.html b/views/transactions/index.html index afbc55ab..633fa212 100644 --- a/views/transactions/index.html +++ b/views/transactions/index.html @@ -13,8 +13,9 @@ + - +
-- cgit v1.2.3