diff options
| author | Adam Soltys <[email protected]> | 2012-12-10 17:34:44 -0800 |
|---|---|---|
| committer | Adam Soltys <[email protected]> | 2012-12-11 00:06:49 -0800 |
| commit | 7f19424e402be418d18b77dab06f263ef450a146 (patch) | |
| tree | 62992fb6d26250dfb8ddd7d1ce097b31f901a883 /public | |
| parent | 4b5d0c7635cd14dd78fc6ab1ac5d494bd99b41d4 (diff) | |
| download | coinos-server-7f19424e402be418d18b77dab06f263ef450a146.tar.gz coinos-server-7f19424e402be418d18b77dab06f263ef450a146.zip | |
Minor fixes
Diffstat (limited to 'public')
| -rw-r--r-- | public/css/calculator.less | 2 | ||||
| -rw-r--r-- | public/js/report.coffee | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/public/css/calculator.less b/public/css/calculator.less index deb385ac..58d1a258 100644 --- a/public/css/calculator.less +++ b/public/css/calculator.less @@ -21,7 +21,7 @@ div#calculator { small, label { color: #999; font-size: 1.2em; } strong#total { font-size: 2em; } #title { display: none; } - #logo { display: none; padding: 10px 0; } + #logo { display: none; padding: 10px 0; margin-bottom: 10px; max-height: 150px; } #error { margin-top: 10px; } } diff --git a/public/js/report.coffee b/public/js/report.coffee index 004f655f..ab5da2b9 100644 --- a/public/js/report.coffee +++ b/public/js/report.coffee @@ -17,13 +17,15 @@ $(-> filterDates = -> transactions = $.grep(g.transactions, (e, i) -> + return false unless e + from = moment($('#from').val(), "MM/DD/YYYY") to = moment($('#to').val(), "MM/DD/YYYY") d = moment(e.date) amount = parseFloat(e.exchange) * parseFloat(e.received) - return false unless !isNaN(parseFloat(amount)) && isFinite(amount) - return (!from? || d.diff(from) >= 0) && (!to? || d.diff(to) <= 0) + !isNaN(parseFloat(amount)) && isFinite(amount) && + (!from? || d.diff(from) >= 0) && (!to? || d.diff(to) <= 0) ) display(transactions) @@ -36,7 +38,7 @@ display = (transactions) -> $('tbody').append(""" <tr> <td colspan='5'> - No transactions were found during the specified time period + No transactions were found for the specified time period </td> </tr> """) |