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

Common: Added Register link to sidebar

Browse Source
This commit is contained in:
Ryan Desfosses 2014-05-14 11:58:38 -04:00
parent 820f230c31
commit 3182f2c69a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hledger-web/Handler/Common.hs
View File

@ -181,7 +181,7 @@ addform _ vd@VD{..} = [hamlet|
acctnames = sort $ journalAccountNamesUsed j acctnames = sort $ journalAccountNamesUsed j
-- Construct data for select2. Text must be quoted in a json string. -- Construct data for select2. Text must be quoted in a json string.
toSelectData as = preEscapedString $ encode $ JSArray $ map (\a -> JSObject $ toJSObject [("text", showJSON a)]) as toSelectData as = preEscapedString $ encode $ JSArray $ map (\a -> JSObject $ toJSObject [("text", showJSON a)]) as
manyfiles = (length $ files j) > 1 manyfiles = length (files j) > 1
postingfields :: ViewData -> Int -> HtmlUrl AppRoute postingfields :: ViewData -> Int -> HtmlUrl AppRoute
postingfields _ n = [hamlet| postingfields _ n = [hamlet|
<tr#postingrow> <tr#postingrow>
@ -247,7 +247,7 @@ editform VD{..} = [hamlet|
|] |]
where where
title = "Edit journal" :: String title = "Edit journal" :: String
manyfiles = (length $ files j) > 1 manyfiles = length (files j) > 1
formathelp = helplink "file-format" "file format help" formathelp = helplink "file-format" "file format help"
-- | Import journal form. -- | Import journal form.
@ -293,10 +293,10 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
<a#accounts-toggle-link.togglelink href="#" title="Toggle sidebar">[+] <a#accounts-toggle-link.togglelink href="#" title="Toggle sidebar">[+]
<div#accounts> <div#accounts>
<table.balancereport> <table.balancereport>
<tr> <tr.item :allaccts:.inacct>
<td.add colspan=3> <td.register colspan=3>
<br> <br>
<a#addformlink href="#" onclick="return addformToggle(event)" title="Add a new transaction to the journal">Add a transaction.. <a href=@{RegisterR} title="Show current register">Register
<tr.item :allaccts:.inacct> <tr.item :allaccts:.inacct>
<td.journal colspan=3> <td.journal colspan=3>
@ -309,6 +309,11 @@ balanceReportAsHtml _ vd@VD{..} (items',total) =
<a#editformlink href="#" onclick="return editformToggle(event)" title="Edit the journal"> <a#editformlink href="#" onclick="return editformToggle(event)" title="Edit the journal">
edit edit
<tr>
<td.add colspan=3>
<br>
<a#addformlink href="#" onclick="return addformToggle(event)" title="Add a new transaction to the journal">Add a transaction..
<tr> <tr>
<td colspan=3> <td colspan=3>
<br> <br>
@ -527,7 +532,7 @@ numberTransactionsReportItems items = number 0 nulldate items
where where
number :: Int -> Day -> [TransactionsReportItem] -> [(Int,Bool,Bool,Bool,TransactionsReportItem)] number :: Int -> Day -> [TransactionsReportItem] -> [(Int,Bool,Bool,Bool,TransactionsReportItem)]
number _ _ [] = [] number _ _ [] = []
number n prevd (i@(Transaction{tdate=d},_,_,_,_,_):rest) = (n+1,newday,newmonth,newyear,i):(number (n+1) d rest) number n prevd (i@(Transaction{tdate=d},_,_,_,_,_):rest) = (n+1,newday,newmonth,newyear,i): number (n+1) d rest
where where
newday = d/=prevd newday = d/=prevd
newmonth = dm/=prevdm || dy/=prevdy newmonth = dm/=prevdm || dy/=prevdy