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

Compare commits

base: slaesvuo:0af1204dd57366230a7300d370a62629de371eea
Branches Tags
slaesvuo:kalenterikamppanja
slaesvuo:tilintarkastus
..
compare: slaesvuo:ab1e1760108f4b3aeeb2ebe3940eb2f02cf5cfc6
Branches Tags
slaesvuo:tilintarkastus
slaesvuo:kalenterikamppanja

10 Commits
0af1204dd5 ... ab1e176010

Author SHA1 Message Date
Saku Laesvuori
ab1e176010 Fix transaction visibility without add permission 2026-01-25 22:43:42 +02:00
Saku Laesvuori
ef936a0733 Make filter links exact 2026-01-25 20:42:05 +02:00
Saku Laesvuori
8f0a7bdecc Filter by payee by clicking on it 2026-01-25 20:42:05 +02:00
Saku Laesvuori
a8d51001f8 Unify filtering style rules 2026-01-25 20:42:05 +02:00
Saku Laesvuori
a40507ccea Filter by code by clicking on it 2026-01-25 20:42:05 +02:00
Saku Laesvuori
8635ef8b17 Filter by tag by clicking on it 2026-01-25 20:42:05 +02:00
Saku Laesvuori
4dd58ee2d5 Display all accounts in the tree mode 2026-01-25 20:42:05 +02:00
Saku Laesvuori
7b18e75676 Display balance assertions in hledger web 2026-01-25 20:42:05 +02:00
Saku Laesvuori
4f9dcfec1c Add links to tosite tags 2026-01-25 20:42:05 +02:00
Saku Laesvuori
f509a091e6 Add links to URI-valued tags 2026-01-25 20:33:57 +02:00
2 changed files with 75 additions and 73 deletions
Show Stats Expand all files Collapse all files

2
hledger-web/hledger-web.cabal
View File

@ -184,6 +184,7 @@ library
, http-conduit , http-conduit
, http-types , http-types
, megaparsec >=7.0.0 && <9.8 , megaparsec >=7.0.0 && <9.8
, modern-uri
, mtl >=2.2.1 , mtl >=2.2.1
, network , network
, safe >=0.3.20 , safe >=0.3.20
@ -196,6 +197,7 @@ library
, unordered-containers , unordered-containers
, utf8-string , utf8-string
, wai , wai
, wai-app-static
, wai-cors , wai-cors
, wai-extra , wai-extra
, wai-handler-launch >=3.0.3 , wai-handler-launch >=3.0.3

146
hledger-web/templates/journal.hamlet
View File

@ -6,82 +6,82 @@ $if elem AddPermission perms
data-toggle="modal" data-target="#addmodal" title="Lisää uusi tapahtuma kirjanpitoon."> data-toggle="modal" data-target="#addmodal" title="Lisää uusi tapahtuma kirjanpitoon.">
Kirjaa tapahtuma Kirjaa tapahtuma
<ol .transactionsreport .list-unstyled> <ol .transactionsreport .list-unstyled>
$forall torig <- items $forall torig <- items
<li .transaction ##{transactionFrag torig}> <li .transaction ##{transactionFrag torig}>
<div .title title="#{showTransaction torig}"> <div .title title="#{showTransaction torig}">
$with (payee, note) <- payeeAndNoteFromDescription' $ tdescription torig $with (payee, note) <- payeeAndNoteFromDescription' $ tdescription torig
<details .elided-text .transaction-metarow> <details .elided-text .transaction-metarow>
<summary>
<time .date datetime="#{show (tdate torig)}" nowrap>
#{show (tdate torig)}
<div .status>
$case tstatus torig
$of Unmarked
<div .status-unmarked title="Tarkistamaton" aria-label="Tarkistamaton">
$of Pending
<div .status-pending title="Kesken" aria-label="Kesken">
$of Cleared
<div .status-cleared title="Tarkistettu" aria-label="Tarkistettu">
$if not $ T.null $ tcode torig
<div .transaction-code>
<a href=@?{addCodeQuery $ tcode torig} .filter>
(#{tcode torig})
$if not $ T.null $ T.strip payee
<span .transaction-payee>
<a href=@?{addPayeeQuery payee} .filter>
#{payee}
$if not $ T.null $ T.strip note
<details .transaction-note .elided-text>
<summary> <summary>
<time .date datetime="#{show (tdate torig)}" nowrap> #{note}
#{show (tdate torig)}
<div .status>
$case tstatus torig
$of Unmarked
<div .status-unmarked title="Tarkistamaton" aria-label="Tarkistamaton">
$of Pending
<div .status-pending title="Kesken" aria-label="Kesken">
$of Cleared
<div .status-cleared title="Tarkistettu" aria-label="Tarkistettu">
$if not $ T.null $ tcode torig
<div .transaction-code>
<a href=@?{addCodeQuery $ tcode torig} .filter>
(#{tcode torig})
$if not $ T.null $ T.strip payee
<span .transaction-payee>
<a href=@?{addPayeeQuery payee} .filter>
#{payee}
$if not $ T.null $ T.strip note
<details .transaction-note .elided-text>
<summary>
#{note}
$if null $ filter isVisibleTag $ ttags torig $if null $ filter isVisibleTag $ ttags torig
$else $else
<ul .tags> <ul .tags>
$forall (tagName, tagValue) <- filter isVisibleTag $ ttags torig $forall (tagName, tagValue) <- filter isVisibleTag $ ttags torig
<li .tag title="#{mconcat [tagName, ": ", tagValue]}"> <li .tag title="#{mconcat [tagName, ": ", tagValue]}">
<div .tag-name> <div .tag-name>
<a href=@?{addTagQuery tagName tagValue} .filter> <a href=@?{addTagQuery tagName tagValue} .filter>
#{tagName} #{tagName}
$if not $ T.null $ T.strip tagValue $if not $ T.null $ T.strip tagValue
<div .tag-value> <div .tag-value>
$if isAbsoluteURI tagValue $if isAbsoluteURI tagValue
<a href="#{tagValue}">#{tagValue} <a href="#{tagValue}">#{tagValue}
$elseif tagName == "tosite" $elseif tagName == "tosite"
<a href="@{documentRoute tagValue}">#{tagValue} <a href="@{documentRoute tagValue}">#{tagValue}
$else $else
#{tagValue} #{tagValue}
<ul .postings> <ul .postings>
$forall Posting { paccount = acc, pamount = amt, pbalanceassertion = passert, ptags = tags } <- tpostings torig $forall Posting { paccount = acc, pamount = amt, pbalanceassertion = passert, ptags = tags } <- tpostings torig
<li .posting> <li .posting>
<div .posting-row> <div .posting-row>
<div .account> <div .account>
<a href="@?{acctlink acc}##{tindex torig}" title="#{acc}"> <a href="@?{acctlink acc}##{tindex torig}" title="#{acc}">
#{elideAccountName 40 acc} #{elideAccountName 40 acc}
<div .amount style="text-align:right;"> <div .amount style="text-align:right;">
<span .posted-amount> <span .posted-amount>
^{mixedAmountAsHtml amt} ^{mixedAmountAsHtml amt}
$maybe BalanceAssertion { baamount = assertAmt } <- passert $maybe BalanceAssertion { baamount = assertAmt } <- passert
<span .balance-assertion> <span .balance-assertion>
jälkeen ^{mixedAmountAsHtml $ mixedAmount assertAmt} jälkeen ^{mixedAmountAsHtml $ mixedAmount assertAmt}
$if null $ filter (isPostingTag acc) $ filter isVisibleTag tags $if null $ filter (isPostingTag acc) $ filter isVisibleTag tags
$else $else
<ul .tags> <ul .tags>
$forall (tagName, tagValue) <- filter (isPostingTag acc) $ filter isVisibleTag tags $forall (tagName, tagValue) <- filter (isPostingTag acc) $ filter isVisibleTag tags
<li .tag title="#{mconcat [tagName, ": ", tagValue]}"> <li .tag title="#{mconcat [tagName, ": ", tagValue]}">
<div .tag-name> <div .tag-name>
<a href=@?{addTagQuery tagName tagValue} .filter> <a href=@?{addTagQuery tagName tagValue} .filter>
#{tagName} #{tagName}
$if not $ T.null $ T.strip tagValue $if not $ T.null $ T.strip tagValue
<div .tag-value> <div .tag-value>
$if isAbsoluteURI tagValue $if isAbsoluteURI tagValue
<a href="#{tagValue}">#{tagValue} <a href="#{tagValue}">#{tagValue}
$elseif tagName == "tosite" $elseif tagName == "tosite"
<a href="@{documentRoute tagValue}">#{tagValue} <a href="@{documentRoute tagValue}">#{tagValue}
$else $else
#{tagValue} #{tagValue}
$if elem AddPermission perms $if elem AddPermission perms
^{addModal AddR j today} ^{addModal AddR j today}