From 3182f2c69a6a9dd269a7092f69dbcc388bcdc960 Mon Sep 17 00:00:00 2001 From: Ryan Desfosses Date: Wed, 14 May 2014 11:58:38 -0400 Subject: [PATCH] Common: Added Register link to sidebar --- hledger-web/Handler/Common.hs | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/hledger-web/Handler/Common.hs b/hledger-web/Handler/Common.hs index dbf2a1c9b..c6ae14ded 100644 --- a/hledger-web/Handler/Common.hs +++ b/hledger-web/Handler/Common.hs @@ -181,7 +181,7 @@ addform _ vd@VD{..} = [hamlet| acctnames = sort $ journalAccountNamesUsed j -- 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 - manyfiles = (length $ files j) > 1 + manyfiles = length (files j) > 1 postingfields :: ViewData -> Int -> HtmlUrl AppRoute postingfields _ n = [hamlet| @@ -247,7 +247,7 @@ editform VD{..} = [hamlet| |] where title = "Edit journal" :: String - manyfiles = (length $ files j) > 1 + manyfiles = length (files j) > 1 formathelp = helplink "file-format" "file format help" -- | Import journal form. @@ -293,10 +293,10 @@ balanceReportAsHtml _ vd@VD{..} (items',total) = [+] - - + +
- Add a transaction.. + Register @@ -309,6 +309,11 @@ balanceReportAsHtml _ vd@VD{..} (items',total) = edit + + +
+ Add a transaction.. +
@@ -527,7 +532,7 @@ numberTransactionsReportItems items = number 0 nulldate items where number :: Int -> Day -> [TransactionsReportItem] -> [(Int,Bool,Bool,Bool,TransactionsReportItem)] 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 newday = d/=prevd newmonth = dm/=prevdm || dy/=prevdy