From 10b45c75aaad8292420d71592255c59fff7d0f81 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 18 Feb 2019 07:55:29 -0800 Subject: [PATCH] web: fix tooltips showing transactions (fixes #927) --- hledger-web/Hledger/Web/Handler/RegisterR.hs | 1 + hledger-web/templates/chart.hamlet | 2 +- hledger-web/templates/journal.hamlet | 4 ++-- hledger-web/templates/register.hamlet | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs index fafe09168..5c663f4d5 100644 --- a/hledger-web/Hledger/Web/Handler/RegisterR.hs +++ b/hledger-web/Hledger/Web/Handler/RegisterR.hs @@ -58,3 +58,4 @@ dayToJsTimestamp d = read (formatTime defaultTimeLocale "%s" t) * 1000 -- XXX read where t = UTCTime d (secondsToDiffTime 0) + diff --git a/hledger-web/templates/chart.hamlet b/hledger-web/templates/chart.hamlet index 347490d91..7c32556eb 100644 --- a/hledger-web/templates/chart.hamlet +++ b/hledger-web/templates/chart.hamlet @@ -38,7 +38,7 @@ #{simpleMixedAmountQuantity $ triCommodityBalance c i}, '#{showMixedAmountWithZeroCommodity $ triCommodityAmount c i}', '#{showMixedAmountWithZeroCommodity $ triCommodityBalance c i}', - '#{concat $ intersperse "\\n" $ lines $ show $ triOrigTransaction i}', + '#{concat $ intersperse "\\n" $ lines $ showTransaction $ triOrigTransaction i}', #{tindex $ triOrigTransaction i} ], /* [] */ diff --git a/hledger-web/templates/journal.hamlet b/hledger-web/templates/journal.hamlet index 6608e9a86..a8f936a92 100644 --- a/hledger-web/templates/journal.hamlet +++ b/hledger-web/templates/journal.hamlet @@ -15,7 +15,7 @@ $if elem CapAdd caps Amount $forall (torig, _, split, _, amt, _) <- items - + #{show (tdate torig)} @@ -25,7 +25,7 @@ $if elem CapAdd caps ^{mixedAmountAsHtml amt} $forall Posting { paccount = acc, pamount = amt } <- tpostings torig - + diff --git a/hledger-web/templates/register.hamlet b/hledger-web/templates/register.hamlet index 6b3487258..54241ab86 100644 --- a/hledger-web/templates/register.hamlet +++ b/hledger-web/templates/register.hamlet @@ -19,11 +19,11 @@ $forall (torig, tacct, split, acct, amt, bal) <- items - + #{show (tdate tacct)} - + #{textElideRight 30 (tdescription tacct)} #{elideRight 40 acct}