diff --git a/hledger-web/Handler/JournalR.hs b/hledger-web/Handler/JournalR.hs index fa2cca24a..29ade6c61 100644 --- a/hledger-web/Handler/JournalR.hs +++ b/hledger-web/Handler/JournalR.hs @@ -60,7 +60,7 @@ journalTransactionsReportAsHtml _ vd (_,items) = [hamlet| -- .#{datetransition} itemAsHtml :: ViewData -> (Int, Bool, Bool, Bool, TransactionsReportItem) -> HtmlUrl AppRoute itemAsHtml VD{..} (n, _, _, _, (t, _, split, _, amt, _)) = [hamlet| - + #{date} #{elideRight 60 desc} @@ -72,7 +72,7 @@ $forall p' <- tpostings t   - #{elideAccountName 40 $ paccount p'} + #{elideAccountName 40 $ paccount p'} #{mixedAmountAsHtml $ pamount p'}   diff --git a/hledger-web/Handler/RegisterR.hs b/hledger-web/Handler/RegisterR.hs index 64678be93..164f50de8 100644 --- a/hledger-web/Handler/RegisterR.hs +++ b/hledger-web/Handler/RegisterR.hs @@ -73,8 +73,9 @@ registerItemsHtml _ vd (balancelabel,items) = [hamlet| itemAsHtml :: ViewData -> (Int, Bool, Bool, Bool, TransactionsReportItem) -> HtmlUrl AppRoute itemAsHtml VD{..} (n, newd, newm, _, (torig, tacct, split, acct, amt, bal)) = [hamlet| - - #{date} + + + #{date} #{elideRight 30 desc} #{elideRight 40 acct} @@ -119,7 +120,7 @@ registerChartHtml percommoditytxnreports = $forall i <- reverse items [ #{dayToJsTimestamp $ triDate i}, - #{simpleMixedAmountQuantity $ triCommodityBalance c i}, + #{simpleMixedAmountQuantity $ triCommodityBalance c i} ], /* [] */ ], @@ -145,6 +146,7 @@ registerChartHtml percommoditytxnreports = '#{showMixedAmountWithZeroCommodity $ triCommodityAmount c i}', '#{showMixedAmountWithZeroCommodity $ triCommodityBalance c i}', '#{concat $ intersperse "\\n" $ lines $ show $ triOrigTransaction i}', + #{tindex $ triOrigTransaction i} ], /* [] */ ], diff --git a/hledger-web/static/hledger.js b/hledger-web/static/hledger.js index 18012d385..1a460f73b 100644 --- a/hledger-web/static/hledger.js +++ b/hledger-web/static/hledger.js @@ -113,13 +113,12 @@ function registerChart($container, series) { function registerChartClick(ev, pos, item) { if (item) { - var date = $.plot.dateGenerator(item.datapoint[0], {}); - var dateid = $.plot.formatDate(date, '%Y-%m-%d'); - $target = $('#'+dateid); - if ($target.length) + $target = $('#'+item.series.data[item.dataIndex][5]); + if ($target.length) { $('html, body').animate({ scrollTop: $target.offset().top }, 1000); + } } }