slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Command.Balance: pass command-line query to HTML and FODS hyperlinks

Browse Source
This commit is contained in:
Henning Thielemann 2024-09-28 19:43:24 +02:00 committed by Simon Michael
parent cc86cd1f0e
commit 6e7324a36e
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hledger/Hledger/Cli/Commands/Balance.hs
View File

@ -584,27 +584,41 @@ headerCell text =
(Ods.cellBorder deflt) {Ods.borderBottom = Ods.DoubleLine} (Ods.cellBorder deflt) {Ods.borderBottom = Ods.DoubleLine}
} }
headerDateSpanCell :: Maybe Text -> DateSpan -> Ods.Cell Ods.NumLines Text registerQueryUrl :: [Text] -> Text
headerDateSpanCell base spn = registerQueryUrl query =
"register?q=" <>
T.intercalate "+" (map quoteIfSpaced $ filter (not . T.null) query)
-- cf. Web.Widget.Common
removeDates :: [Text] -> [Text]
removeDates =
filter (\term_ ->
not $ T.isPrefixOf "date:" term_ || T.isPrefixOf "date2:" term_)
replaceDate :: Text -> [Text] -> [Text]
replaceDate prd query = "date:"<>prd : removeDates query
headerDateSpanCell ::
Maybe Text -> [Text] -> DateSpan -> Ods.Cell Ods.NumLines Text
headerDateSpanCell base query spn =
let prd = showDateSpan spn in let prd = showDateSpan spn in
(headerCell prd) { (headerCell prd) {
Ods.cellAnchor = Ods.cellAnchor =
foldMap (\url -> url <> "register?q=date:" <> prd) base foldMap (<> registerQueryUrl (replaceDate prd query)) base
} }
simpleDateSpanCell :: DateSpan -> Ods.Cell Ods.NumLines Text simpleDateSpanCell :: DateSpan -> Ods.Cell Ods.NumLines Text
simpleDateSpanCell = Ods.defaultCell . showDateSpan simpleDateSpanCell = Ods.defaultCell . showDateSpan
dateSpanCell :: dateSpanCell ::
(Ods.Lines border) => Maybe Text -> Text -> DateSpan -> Ods.Cell border Text (Ods.Lines border) =>
dateSpanCell base acct spn = Maybe Text -> [Text] -> Text -> DateSpan -> Ods.Cell border Text
dateSpanCell base query acct spn =
let prd = showDateSpan spn in let prd = showDateSpan spn in
(Ods.defaultCell prd) { (Ods.defaultCell prd) {
Ods.cellAnchor = Ods.cellAnchor =
foldMap foldMap
(\url -> url <> (<> registerQueryUrl ("inacct:"<>acct : replaceDate prd query))
"register?q=inacct:" <> quoteIfSpaced acct <>
" date:" <> prd)
base base
} }
@ -621,13 +635,11 @@ rawTableContent :: [[Ods.Cell border text]] -> [[text]]
rawTableContent = map (map Ods.cellContent) rawTableContent = map (map Ods.cellContent)
setAccountAnchor :: setAccountAnchor ::
Maybe Text -> Text -> Ods.Cell border text -> Ods.Cell border text Maybe Text -> [Text] -> Text -> Ods.Cell border text -> Ods.Cell border text
setAccountAnchor base acct cell = setAccountAnchor base query acct cell =
cell cell
{Ods.cellAnchor = {Ods.cellAnchor =
foldMap foldMap (<> registerQueryUrl ("inacct:"<>acct : query)) base}
(\url -> url <> "register?q=inacct:" <> quoteIfSpaced acct)
base}
-- | Render a single-column balance report as FODS. -- | Render a single-column balance report as FODS.
@ -652,7 +664,8 @@ balanceReportAsSpreadsheet opts (items, total) =
rows rc name ma = rows rc name ma =
let accountCell = let accountCell =
setAccountAnchor setAccountAnchor
(guard (rc==Value) >> balance_base_url_ opts) name $ (guard (rc==Value) >> balance_base_url_ opts)
(querystring_ opts) name $
cell $ accountNameDrop (drop_ opts) name in cell $ accountNameDrop (drop_ opts) name in
case layout_ opts of case layout_ opts of
LayoutBare -> LayoutBare ->
@ -743,15 +756,15 @@ multiBalanceReportAsSpreadsheetHelper ishtml opts@ReportOpts{..} (PeriodicReport
LayoutBare -> headerCell "commodity" : dateHeaders LayoutBare -> headerCell "commodity" : dateHeaders
_ -> dateHeaders _ -> dateHeaders
dateHeaders = dateHeaders =
map (headerDateSpanCell balance_base_url_) colspans ++ map (headerDateSpanCell balance_base_url_ querystring_) colspans ++
[hCell "rowtotal" "total" | row_total_] ++ [hCell "rowtotal" "total" | row_total_] ++
[hCell "rowaverage" "average" | average_] [hCell "rowaverage" "average" | average_]
fullRowAsTexts row = fullRowAsTexts row =
map (anchorCell:) $ map (anchorCell:) $
rowAsText Value (dateSpanCell balance_base_url_ acctName) row rowAsText Value (dateSpanCell balance_base_url_ querystring_ acctName) row
where acctName = prrFullName row where acctName = prrFullName row
anchorCell = anchorCell =
setAccountAnchor balance_base_url_ acctName $ setAccountAnchor balance_base_url_ querystring_ acctName $
accountCell $ accountNameDrop drop_ acctName accountCell $ accountNameDrop drop_ acctName
totalrows totalrows
| no_total_ = [] | no_total_ = []
@ -1279,8 +1292,8 @@ budgetReportAsSpreadsheet
joinNames = map (accountCell :) joinNames = map (accountCell :)
accountCell = accountCell =
let name = render row in let name = render row in
setAccountAnchor (guard (rc==Value) >> balance_base_url_) name $ setAccountAnchor (guard (rc==Value) >> balance_base_url_)
cell name querystring_ name (cell name)
-- tests -- tests