Commit Graph

496 Commits

Author SHA1 Message Date
Simon Michael
847fc23236 ui: use t/l keys for tree/list, T for "today", drop vi keys?! retune help (#1286) 2020-07-17 15:42:05 -07:00
Simon Michael
a3ae4d88f8 ui: use -t/-l short flags for --tree/--flat, like cli (#1286) 2020-07-17 15:36:07 -07:00
Stephen Morgan
51ea6d9f25 lib: Make queryDepth return Maybe Int. 2020-07-16 10:05:53 -07:00
Stephen Morgan
1425301a8c lib, cli: Use --flat as the default mode for all reports. 2020-07-07 15:49:08 -07:00
Simon Michael
3b6a8b0956 ui: register: elide multicommodity amounts 2020-07-05 06:59:16 -07:00
Simon Michael
44c3eb1904 add a color argument to most amount show helpers, drop cshow variants
This is an API change, but it seems better than having additional
colour-supporting variants and trying to avoid duplicated code.
I stopped short of changing showAmount, so cshowAmount still exists.
2020-07-05 06:59:16 -07:00
Stephen Morgan
c811ea4c7b lib, cli, ui, web: intopt and friends now make sure their arguments fit
inside bounds.
2020-07-03 12:35:51 -07:00
Simon Michael
3ade9750d3 ;valuation: fix hledger-ui (#1239, #1253) 2020-06-19 15:10:12 -07:00
Dmitry Astapov
460508807f ui: fix regression in 'F' (fixes #1255) 2020-06-13 14:17:20 -07:00
Dmitry Astapov
b7413edf22 lib: --forecast=PERIODICEXPR. Fixes #835, #1236 2020-06-03 15:53:00 -07:00
Simon Michael
660ba7e1d9 lib: clarify zero-checking function names
isZeroAmount                -> amountLooksZero
isReallyZeroAmount          -> amountIsZero
isZeroMixedAmount           -> mixedAmountLooksZero
isReallyZeroMixedAmount     -> mixedAmountIsZero
isReallyZeroMixedAmountCost dropped
2020-05-29 18:57:22 -07:00
Simon Michael
c1488db4f1 ui: fix a regression, empty register of depth-limited account (fix #1208) 2020-03-08 12:27:05 -07:00
Simon Michael
dac3920221 ;ui: drop redundant exitSuccess 2020-02-22 11:06:58 -08:00
Simon Michael
3bee9a96c9 ui: simpler forecast toggle: just visibility, no reload (#1193) 2020-02-22 11:06:58 -08:00
Simon Michael
4eba930a5c ui: don't force --auto/--forecast on; merge --future with --forecast (#1193)
Periodic transactions were always on, which meant that periodic
transactions occurring today were always shown, in future or present
mode.

Now, both periodic transactions and display of future transactions are
controlled by --forecast, and toggleable by the F key ("forecast
mode"). The --future flag has been dropped (it still works as a hidden
alias for --forecast, but is deprecated).

It seemed to also make sense to leave auto postings off by default,
like hledger.
2020-02-22 11:06:58 -08:00
Stephen Morgan
74778efcf5 Use nubSort instead of nub . sort. 2020-01-04 08:31:10 -08:00
Simon Michael
43159f4fea ;ui: E key: comment
[ci skip]
2019-12-15 11:07:26 -08:00
Simon Michael
44da1e1cb7 ;ui: E key: simplify; drop buggy emacs end-of-file positioning 2019-12-15 11:03:05 -08:00
Simon Michael
67635106d2 fix help 2019-12-14 18:06:24 -08:00
Simon Michael
4cd2c35ad4 ;ui: E key: support positioning with nano editor 2019-12-14 17:57:24 -08:00
Simon Michael
1bf271a8c4 ;ui: clarify editorOpenPositionCommand 2019-12-14 17:54:29 -08:00
Simon Michael
a09513c3fb ;ui: refactor: consolidate EditorType definition and related code 2019-12-14 17:43:52 -08:00
Simon Michael
47567cd770 ;fix some warnings with GHC 8.10 alpha
hledger is GHC 8.10 ready!
2019-12-14 17:30:19 -08:00
Simon Michael
5dac8af2ef ;ui: fix build error due to tests rewrite 2019-11-27 21:54:31 -08:00
Simon Michael
332624f9fa ui: B and V keys toggle display of cost, value 2019-11-21 17:33:04 -08:00
Mykola Orliuk
5287fe671b ;all: hide RawOpts internals
This way we can ensure we always use only functions from RawOptions.
2019-11-18 17:38:39 -08:00
Mykola Orliuk
8991419c68 ;all: drop dummy decodeRawOpts 2019-11-18 17:38:39 -08:00
Mykola Orliuk
ab9c150759 ;lib: clean out showTransactionUnelided
Keep aliases until next major release.
2019-11-16 12:53:07 +01:00
Simon Michael
e83cbacbf6 ;ui: help: pmi -> p/m/i 2019-10-19 18:47:39 -07:00
Mykola Orliuk
78146978f4 ;lib: store raw opts unquoted
It looks like we only need quote when we build query and in some
messages.

Fixes simonmichael/hledger#1079
2019-10-19 14:44:08 -07:00
Caleb Maclennan
11d9e5eb6a code: Strip extraneous trailing whitespace from Haskell sources 2019-07-15 16:40:49 +01:00
Simon Michael
692620180e ;lib: refactor: change AmountPrice to a Maybe
I've wanted to do this for a long time; now that prices are in flux,
seems a good time.
2019-06-13 15:50:01 -07:00
Simon Michael
faf85d91e3 cli: restore --aux-date and --effective as --date2 aliases (#1034)
These Ledger-ish spellings were dropped over the years, to improve
--help's layout. Now they work again, but are considered hidden flags
so --help doesn't show them automatically (but I decided to mention
them manually in --date2's description).
2019-06-02 08:48:41 -07:00
Simon Michael
b2e7cc7827 ui: support brick 0.47+ as well
I should have supported latest brick, to get into stackage nightly.
Now it does.

No upper bound, once again; responding lazily to brick API changes
seems less disruptive overall.
2019-03-20 17:38:44 -07:00
Jakub Zárybnický
6becbc78f3 cli, web, ui: Replace withJournalDo* variants 2019-03-01 05:42:30 -08:00
Simon Michael
3b47b58aec lib: clarify transaction balancing & balance assertion checking 2019-02-20 09:14:30 -08:00
Jakob Schöttl
98d7c073c7 Reduce simple lambda 2019-02-09 12:47:24 -08:00
Simon Michael
98e3358046 ui: more defensive brick list imports to fix recent breakage 2019-02-02 08:22:23 -08:00
Simon Michael
fda41373f7 ui: fix build issues with older brick/snapshots, require brick 0.23+ 2019-02-01 21:05:56 -08:00
Simon Michael
ad424e0381 ui: C-z suspend now restores the terminal cleanly 2019-01-23 17:26:27 -08:00
Simon Michael
cc0764eac2 ui: on posix, support ctrl-z to suspend the program 2019-01-18 16:33:06 -08:00
Simon Michael
c02647d05e ui: support ctrl-l everywhere 2019-01-18 16:32:57 -08:00
Simon Michael
bb5d6c47c6 ui: probably more effective redraw when pressing Ctrl-l
Now uses vtyRefresh.
2019-01-18 16:32:52 -08:00
Simon Michael
c5ae8e6891 comments 2019-01-16 13:58:04 -08:00
Simon Michael
389eaa4c5d ui: whitespace 2019-01-15 06:18:35 -08:00
Simon Michael
e6392b3d46 ui: streamline top status info 2019-01-05 18:42:03 +00:00
Simon Michael
a94e632524 ui: avoid brick reverse clash (#935) 2018-12-10 10:48:40 +00:00
Simon Michael
12d3ba6fc0 ui: refactor, try to clarify toggles' help
Consistent ordering with most-used toggles first, more intuitive wording
2018-11-04 13:54:20 -08:00
Mykola Orliuk
99bfebd1a1 ui: support all results of showGenericSourcePos
Resolves simonmichael/hledger#904
2018-10-26 16:32:16 -07:00
Simon Michael
d1a20553e3 ui: fix Any build error with GHC < 8.4 2018-10-24 12:20:52 -07:00
Simon Michael
119e1e3a49 ui: register: positive amounts: green -> black
The green/red scheme helped distinguish the changes column from the
black/red balance column, but the default green is hard to read on
the pale background in some terminals. Less is more. Also the changes
column is non-bold now.
2018-10-23 07:40:06 -07:00
Simon Michael
7ebf3a276b ui: style tweaks; cyan/blue -> white/yellow 2018-10-23 07:15:11 -07:00
Simon Michael
3dd2bfd01d ui: style tweaks, white instead of cyan 2018-10-23 06:47:30 -07:00
Simon Michael
42a4a4a7e4 ui: use "border" instead of borderAttr everywhere
Assume it won't change, it's clearer and more consistent.
2018-10-23 06:43:21 -07:00
Simon Michael
5bc82e9536 ui: themes cleanup, style tweaks 2018-10-23 06:33:21 -07:00
Simon Michael
f66bb8d5c0 ui: style help headings & keys; style cleanups 2018-10-23 06:07:35 -07:00
Simon Michael
16faa7dd9c ui: capitalise cursor keys in quick help, like help dialog 2018-10-23 05:43:57 -07:00
Simon Michael
3ef8d9fc82 ui: color help dialog like the borders, make it pop 2018-10-23 05:43:42 -07:00
Simon Michael
f10f9b6a17 ui: ensure more consistent quiet style in horizontal borders (#838) 2018-10-23 05:41:42 -07:00
Simon Michael
cf9eb78ad2 ui: UIUtils export list, cleanup 2018-10-23 05:21:08 -07:00
Simon Michael
74611a7be1 ui: accounts: fix balances when there's only periodic txns
And clarify multiBalanceReport.
2018-10-18 14:43:00 -07:00
Simon Michael
89a0c7a308 ui: comment 2018-10-18 14:43:00 -07:00
Simon Michael
2edb1f2705 ui: always enable periodic transactions and transaction modifiers
Rule-based transactions and postings are always generated
(--forecast and --auto are always on).
Experimental.
2018-10-18 14:43:00 -07:00
Simon Michael
b85bbbb095 ui: drop the --status-toggles flag 2018-10-18 14:43:00 -07:00
Simon Michael
a924ad047e ui: drop the --present flag 2018-10-18 14:43:00 -07:00
Simon Michael
2a44d7eb26 ui: reorganise help dialog, fit content into 80x25 again 2018-10-18 14:43:00 -07:00
Simon Michael
cf6f4ed28c ui: escape key resets to flat mode
Flat mode is the default at startup. Probably it should reset to tree
mode if --tree was used at startup.
2018-10-18 14:43:00 -07:00
Simon Michael
1b42d34a78 ui: small help tweak
[ci skip]
2018-10-18 14:43:00 -07:00
Simon Michael
52ee10bd87 ui: reg: ensure T always has a visible effect 2018-10-18 14:43:00 -07:00
Simon Michael
1c3233cc0f ui: replace odd-looking pattern 2018-10-18 14:43:00 -07:00
Simon Michael
1db9b018f1 ui: add --present/--future, hide future txns by default, toggle with F
You may have transactions dated later than today, perhaps piped from
print --forecast or recorded in the journal, which you don't want to
see except when forecasting.

By default, we now hide future transactions, showing "today's balance".
This can be toggled with the F key, which is easier than setting a
date query. --present and --future flags have been added to set the
initial mode.

(Experimental. Interactions with date queries have not been explored.)
2018-10-18 14:43:00 -07:00
Simon Michael
e52430bd62 ui: default theme: reduce highlighting noise in bottom border help 2018-10-18 14:43:00 -07:00
Simon Michael
89712fe81d ui: make flat the default, toggle with T, add --tree/-T/-F flags 2018-10-18 14:43:00 -07:00
Alex Chen
3d2584d869 lib: switch to megaparsec 7 2018-09-30 20:15:12 -06:00
Simon Michael
0f83fb91c1 ui, web: fix build after tests cleanup 2018-09-03 08:43:57 -07:00
Simon Michael
cd67f8ea68 tests: clear out old boilerplate 2018-08-31 18:12:17 -07:00
Simon Michael
d778a92561 tests: export HUnit/EasyTest from Hledger.Utils.Test; more helpers 2018-08-18 15:19:59 +01:00
Simon Michael
ea52c3d620 ui: restore support for fsnotify 0.2.1.2, as well as 0.3.x (#833)
For easier stackage entry.
2018-07-03 12:50:51 +01:00
Simon Michael
a1c0835445 ui: fix a vty version bound typo & possibly build failures (#494)
CPP intended to use old code for vty < 5.15 was always using the new code.
2018-07-03 12:38:40 +01:00
Simon Michael
236101e31a ui: support/require fsnotify 0.3.0.1+
The api has changed, it supports directory events, and might be more robust.
2018-06-05 06:41:13 -07:00
Simon Michael
061aad0431 remove some CPP that's obsolete since we require base 4.8+ 2018-06-04 17:33:21 -07:00
Aerex
5808e289e6 feat(hledger-ui): added neovim as a supported editor
when neovim is set as EDITOR hleger will jump to the correct line number of the transaction; before
hledger will open journal at top of the file
2018-06-03 17:11:43 -07:00
Alex Chen
b245ec7b3d lib: remove the megaparsec compatability module 2018-05-22 12:16:46 -07:00
Simon Michael
581d02162c resolve all current build warnings with the supported GHC versions
If I'm lucky.
2018-05-17 20:43:55 -07:00
Dmitry Astapov
d82370d10b lib, app, web: remove differences between command line and journal file aliases 2018-04-17 16:09:11 -07:00
Dmitry Astapov
f6ec26e321 lib, app, web, ui: rename readJournalFile[s]WithOpts to readJournalFile, same for tryReader[s]WithOpts 2018-04-17 15:25:02 -07:00
Dmitry Astapov
ecf49b1e4b lib: auto postings generated before amount inference and balance checks (#729) 2018-04-17 14:33:32 -07:00
Simon Michael
178e3a234b ui/web: -E toggles zeroes at startup, with opposite default to cli 2018-03-29 22:35:06 +01:00
Simon Michael
84579bb1b4 silence redundant import warnings with ghc 8.4 2018-03-24 22:51:56 +00:00
Simon Michael
0da68d2cb8 ui: fix some of the hlint warnings 2018-02-18 08:05:33 -08:00
Simon Michael
88ef586480 lib: rename, clarify purpose of balanceReportFromMultiBalanceReport 2018-01-23 11:32:24 -08:00
Simon Michael
448934d146 ui: fix manual viewing (on posix) (fix #623) 2017-12-30 12:59:31 -08:00
Simon Michael
f8e781462d ui, web: use/support new -V, --forecast, --auto 2017-12-29 16:53:37 -08:00
Simon Michael
69e255cead lib: deduplicate, refactor valuation code 2017-12-29 16:52:08 -08:00
Simon Michael
5de51c9bad fix warnings/errors found by make stacktest 2017-09-30 13:00:22 -10:00
Simon Michael
e5f794d2cb cli,ui,web: a @FILE argument reads flags & args from FILE, one per line 2017-09-30 06:49:31 -10:00
Simon Michael
fead7c5138 cli, ui, web: make -NUM a shortcut for --depth NUM 2017-09-22 16:14:30 -10:00
Simon Michael
e3c4a76119 add & use simpler readJournalFilesWithOpts/InputOpts api 2017-09-14 17:43:32 -07:00
Simon Michael
55cebad0d5 cli: refactor: move commands to a subdirectory, reinstate test command 2017-09-12 10:04:36 -07:00
Simon Michael
dc191ec76e cli: refactor: new Commands module
Builtin commands are now gathered more tightly in a single module,
Hledger.Cli.Commands, reducing duplication and facilitating change.

The tests command was difficult and has been dropped for now.

The obsolete convert/info/man commands have been dropped.

cli: refactor: a proper commands list, better Main/Commands separation

The legacy "convert" command has been dropped.

The activity command's module is now named consistently.
2017-09-11 16:50:08 -07:00
Jakub Zárybnický
13a6584440 ui, web: Enable --pivot and --anon in ui and web (#474) 2017-09-04 20:45:31 -07:00
Hans-Peter Deifel
79e3a29083 Fix build of hledger-ui with megaparsec-6 2017-08-02 11:35:23 -07:00
Simon Michael
7e896572a7 make --help and -h the same, drop --man and --info for now (#579) 2017-07-07 02:08:34 +01:00
Simon Michael
190bab5c33 ui: help: tweak key order 2017-07-06 14:11:23 +01:00
Felix Yan
ffe8b47529 Update brick to 0.19 2017-06-30 22:45:34 +01:00
Simon Michael
50efcfe359 ui: accounts: reduce "warping", select alphabetically preceding account
..when selected account disappears, eg when toggling zero accounts.
2017-06-30 19:45:21 +01:00
Simon Michael
f666d5fc25 ui: register: reduce "warping", keep selection at nearest txn
When the transaction list changes, eg due to toggling a query filter,
and the previously selected item has disappeared, instead of moving
the selection to the end, we now select the nearest transaction by
date (and if several have the same date, by journal order).
2017-06-30 19:08:51 +01:00
Simon Michael
eab17c8edb ui: transaction: don't show blanks 2017-06-30 19:07:48 +01:00
Simon Michael
8619942388 ui: toggles cleanup 2017-06-30 19:07:26 +01:00
Simon Michael
c642be7570 ui: fix right arrow key 2017-06-30 17:18:54 +01:00
Simon Michael
97964eb2fc ui: consistently support vi & emacs movement keys
hjkl and CTRL-bfnp should now work wherever unmodified arrow keys work.
(You must still use arrow keys with SHIFT for adjusting report period).
2017-06-30 16:37:10 +01:00
Simon Michael
ef5e152fde ui: better scrolling/positioning
In the accounts and register screens:, you can now scroll down further
so that the last item need not always be shown at the bottom of the screen.
Also we now try to center the selected item in the following situations:

- after moving to the end with Page down/End
- after toggling filters (status, real, historical..)
- on pressing the control-l key (should force a screen redraw, also)
- on entering the register screen from the accounts screen (there's a
  known problem with this: it doesn't work the first time).

Items near the top of the list can't be centered, as we don't scroll
higher than the top of the list.
2017-06-30 15:54:30 +01:00
Simon Michael
0ccb8c0779 ui: refactor: consistent order 2017-06-28 12:54:14 +01:00
Simon Michael
ce0d6574e6 ui: show transaction status mark in register screen 2017-06-28 11:47:06 +01:00
Simon Michael
59af88b796 ui: add temporary --status-toggles for testing toggle styles (#564) 2017-06-18 16:20:30 -07:00
Simon Michael
22e751983b ui: allow multiple status filters to be active at once (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
dcc58d4a2b lib: rename ClearedStatus type to Status
(and fix hard-coded enum count)
2017-06-15 19:16:39 -07:00
Simon Michael
eb42ea04e5 use consistent UPC order for --unmarked/--pending/--cleared (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
e119941648 rename "uncleared" status to "unmarked" and --uncleared to --unmarked (#564)
See the issue and linked mail list discussion. Ambiguity between the
uncleared state, and the "not cleared" --uncleared flag causes confusion
and friction. At this point it seems best to break with Ledger and
past hledger, pick a new name and drop --uncleared to put an end to it.
2017-06-15 19:16:39 -07:00
Simon Michael
7fc921db86 lib, cli: -U/-P/-C flags can be combined (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
44c6b324ab ui: add P key to toggle pending mode (#564) 2017-06-15 19:16:39 -07:00
Simon Michael
9a86c9ee52 lib: begin supporting colour
Add some basic helpers for working with ANSI colour codes,
and make strWidth and the various string layout functions aware of them.
2017-04-25 18:27:25 -07:00
Simon Michael
b402fc7e7d lib: optserror -> usageError, consolidate with other error functions (#529) 2017-03-29 08:00:51 -07:00
Simon Michael
7dd34d71b5 ui: transaction: fix pattern match failure when pressing E (fixes #508) 2017-02-05 12:00:45 -08:00
Justin Le
9d817e2d47 hledger-ui command line arguments and documentation edited to reflect new command structure (-V is global command) 2017-02-04 16:38:18 -08:00
Simon Michael
7fab8abd5d ui: fix a GenericSourcePos-related warning 2017-01-25 09:47:21 -08:00
Simon Michael
1f362101cc ui: addenda for #494 2017-01-25 09:42:10 -08:00
Peter Simons
e3d78fd0db hledger-ui: add support for brick 0.17 and vty 0.15 (#494) 2017-01-25 09:35:47 -08:00
Joshua Chia
d3883bad1f Updated hledger-ui to use brick-0.16 (#479)
brick-0.16 uses Brick.BChan.BChan instead of Control.Concurrent.Chan.Chan.
2017-01-14 10:41:46 -08:00
Simon Michael
83975d25eb ui, web: sync some things in help & manual 2017-01-05 17:09:04 -08:00
Simon Michael
5c4d6524e2 ui: drop obsolete --no-elide flag 2017-01-05 17:08:23 -08:00
Simon Michael
7ad31e65a1 ui: comment 2016-12-31 07:54:47 -08:00
Simon Michael
37632a3283 ui: small change to --watch, ignore file add/remove events 2016-12-30 20:01:34 -08:00
Simon Michael
31e4f538c0 ui: the A key runs hledger-iadd (if available) 2016-12-08 13:18:56 -08:00
Simon Michael
3c4cb4eeeb ui: --watch: track date only when a standard period is in effect 2016-12-07 15:19:36 -08:00
Simon Michael
eac2ff0ea7 ui: make --watch work on the error screen too 2016-12-02 15:37:18 -08:00
Simon Michael
9952f93e97 ui: --watch date tracking fixes
- move the period only if it's "current" (contains the old "today" date)
- make it work on all screens, not just accounts
2016-12-02 15:36:23 -08:00
Simon Michael
e3a7f6697e ui: --watch also tracks the current date, when appropriate
ie, when viewing a "current" period (the current day/week/month/quarter/year),
it will be moved to enclose the current date, if needed, whenever the system date changes.
2016-12-01 19:26:38 -08:00
Simon Michael
1735b62011 ui: oops, watch files only with --watch flag 2016-11-25 07:02:07 -08:00
Simon Michael
3387b45a90 ui: tweak --change help 2016-11-24 20:24:07 -08:00
Simon Michael
6dd406779b ui: always reload when g is pressed
Previously it would check the modification time and reload only if
it looked newer than the last reload. But this could get confused
somehow by fsnotify events, such that there were unloaded changes
on disk yet pressing g did nothing.
2016-11-24 20:23:14 -08:00
Simon Michael
148ac4236f ui: --change shows period balances (changes) at startup 2016-11-24 11:32:13 -08:00
Simon Michael
b09b3a7be6 ui: with --watch, react to file changes in real time
Experimental, tested on OSX so far.
Rapid successive file changes can cause it to get stuck.
2016-11-24 11:14:34 -08:00
Simon Michael
0f1108db07 ui: use a custom application event type 2016-11-24 09:10:50 -08:00
Simon Michael
9311077205 ui: allow brick 0.14, vty 5.12, text-zipper 0.9 2016-11-19 08:53:07 -08:00
Simon Michael
c6e2784eeb ui: use brick 0.12, bump version to 1.0.3 2016-10-31 08:06:29 -07:00
Simon Michael
f0f4013b7a ui: use latest brick, 0.11 2016-10-27 14:15:56 -07:00
Simon Michael
1362784546 ui: help: reset wording 2016-09-05 10:57:05 -07:00
Simon Michael
8c32af581b ui: use full narrow terminal width for help dialog 2016-09-05 10:56:38 -07:00
Simon Michael
a4cf233312 ui: keep next/previous period within the journal's date span 2016-08-13 08:08:43 -07:00
Simon Michael
ef961f51ac ui: quick help formatting fix 2016-08-12 18:06:02 -07:00
Simon Michael
4e3c0cc936 ui: historical/period toggle, help updates
accounts and register screens can now switch between "historical"
(default) and "period" modes

title header wording is clearer

quick help footer now indicates historical/period and tree/flat modes,
saving space in the title

help screen is more explanatory

the enter key has been reserved for later and is no longer an alias
for right/l
2016-08-12 17:44:55 -07:00
Simon Michael
1d6ca47536 ui: set report period from date: query args, also
date2: and --date2 might also affect it somehow, untested.
2016-08-10 10:24:43 -07:00
Simon Michael
af9daa3b11 ui: use only shift-cursor keys for period; simplify 2016-08-10 07:17:35 -07:00
Simon Michael
fe1408485d ui: shift-left/right/up/down equivalent to p/n/u/d 2016-08-09 16:36:14 -07:00
Simon Michael
79cc999fa3 ui: d/u zooms report period down/up, t selects today 2016-08-09 15:31:35 -07:00
Simon Michael
11c6426834 ui: show historical balances whenever possible #392
hledger-ui now tries to show historical balances always, including
when (to limit transactions on the register screen) a report start date
is specified. This means that:

- the accounts screen balances are not disturbed by a start date

- the register screen is now a little better at showing the running
  historical balance. It's still not very good at it; some filter
  queries will cause it to fall back to showing the running total of
  visible transactions. But it's no longer disturbed by Z (nonzero mode)
  or a cur: query term.
2016-08-08 17:50:26 -07:00
Simon Michael
974b1e3be0 lib: simplify balance report types; haddocks 2016-08-08 17:23:21 -07:00
Simon Michael
4e1c997965 ui: accounts: always use --no-elide for a more regular tree 2016-08-07 12:17:38 -07:00
Simon Michael
88ceb7470c ui: help: add d/n/p, move DEL/BS to bottom #381 2016-08-04 11:55:46 -07:00
Simon Michael
293b0f6705 ui: strip leading/trailing whitespace from filter query 2016-08-04 11:55:46 -07:00
Simon Michael
3c724efe4f ui: d cycles report duration, n/p steps to next/prev period (#381) 2016-08-02 08:24:04 -07:00
Simon Michael
0cb5703ad1 ui: refactor draw functions 2016-08-02 08:24:04 -07:00
Simon Michael
fe6d4cc7da lib: abstract period/interval/cleared in ReportOpts 2016-07-29 19:20:56 -07:00
Simon Michael
b7071dee84 lib: use Data.Default directly, not via cmdargs 2016-07-29 10:15:48 -07:00
Moritz Kiefer
4141067428 Replace Parsec with Megaparsec (see #289) (#366)
* Replace Parsec with Megaparsec (see #289)

This builds upon PR #289 by @rasendubi

* Revert renaming of parseWithState to parseWithCtx

* Fix doctests

* Update for Megaparsec 5

* Specialize parser to improve performance

* Pretty print errors

* Swap StateT and ParsecT

This is necessary to get the correct backtracking behavior, i.e. discard
state changes if the parsing fails.
2016-07-29 08:57:10 -07:00
Simon Michael
90c0d40777 lib, ui, web: more careful dates in account transactions report/registers
Clarify the account transactions report, and don't change original transactions' dates.

Show a more accurate date in hledger-ui and hledger-web's account registers
when postings have their own dates. This is now called the "transaction register date":
the date which is displayed for that transaction in a register for some current account
and filter query. It is either the transaction date from the journal ("transaction general date"),
or if postings to the current account and matched by the register's filter query have
their own dates, the earliest of those dates.
2016-07-27 12:12:42 -07:00
Simon Michael
ffb40870ce ui: register: be inclusive for a depth-clipped account, matching displayed balance
And drop F key from register screen again.
2016-07-26 17:28:29 -07:00
Simon Michael
9b0cadc179 ui: support/require brick 0.7+ #379 2016-07-24 18:06:49 -07:00
Simon Michael
7eeb5e01ee ui: I toggles balance assertions
This was a bit tricky.
2016-07-06 15:08:57 -07:00
Simon Michael
19fc5b61f7 ui: indicate when balance assertions are ignored
The indication takes up lots of space, may need refinement.
It's currently not shown on the error screen.
2016-07-06 15:07:27 -07:00
Simon Michael
347e9dc701 ui: clarify and refine journal reloading a bit
The CLI options saved in the UI state are not updated if reloading fails.
(I didn't need this change after all, but it seems reasonable.)

Reloading on the error screen just updates the message, rather than
entering a new error screen.

Docs have been clarified.
2016-07-06 14:58:55 -07:00
Simon Michael
9a7fe756b9 ui: help: tweak direction key help 2016-07-06 14:51:26 -07:00
Moritz Kiefer
991204d59a Support vty 0.7 (#365) 2016-07-05 13:23:00 -07:00
Simon Michael
dbeb4e3020 ui: add vi-style movement keys, use ? for help (#357) 2016-06-24 18:54:54 -07:00
Simon Michael
7a4c45aa4a ui: basic manual integration 2016-06-20 11:09:12 -07:00
Simon Michael
76519be8f9 ui: advertise E key on transaction, error screens 2016-06-20 11:08:23 -07:00
Simon Michael
1d419eb7e6 ui: editor: jump to current txn or error location (emacs, emacsclient, vi) 2016-06-19 16:15:17 -07:00
Simon Michael
c79750bafd ui: editor: cleanup, vi support, positioning support 2016-06-19 14:09:49 -07:00
Simon Michael
4923efefb9 ui: basic editor integration
The E key (on all screens) edits the main journal file using
$HLEDGER_UI_EDITOR or $EDITOR or "emacs -nw",
jumping to the end if it's Emacs.
2016-06-19 09:00:04 -07:00
Simon Michael
c4b3a4f996 ui: use Z instead of E for nonzero mode
Breaking consistency with hledger cli flags, but I think it's
more mnemonic, and E will more useful for something else.
2016-06-18 09:00:38 -07:00
Simon Michael
b017426812 ui: use same filter style for depth limit 2016-06-18 08:53:59 -07:00
Simon Michael
cc8180b295 ui: flat mode affects register too; doc updates 2016-06-18 08:46:08 -07:00
Simon Michael
c26178acdd ui: reg: select latest txn by default again 2016-06-18 07:31:09 -07:00
Simon Michael
d4343f8de1 ui: at depth 0 call account "All" (and fix register) 2016-06-12 11:09:59 -07:00
Simon Michael
bdb36b8480 ui: refactor: events, imports cleanup 2016-06-10 17:54:46 -07:00
Simon Michael
47a8eb53c8 ui: refactor: AppState -> UIState, cleanups 2016-06-10 17:54:46 -07:00
Simon Michael
0851851ea9 ui: refactor: drop Vty. prefix 2016-06-10 16:39:06 -07:00
Simon Michael
9ba8465421 ui: accounts: fix an earlier refactoring, helping selection persistence 2016-06-10 16:21:43 -07:00
Simon Michael
8b9f5e1cdf ui: 0 now limits depth to 0 instead of resetting it 2016-06-10 12:51:10 -07:00
Simon Michael
dc6f39a859 ui: doc: latest keys 2016-06-10 12:12:45 -07:00
Simon Michael
ea180f72a0 ui: briefer on-screen help, and a more detailed help dialog 2016-06-10 11:50:57 -07:00
Simon Michael
aa75cc69f6 ui: a more general mode mechanism 2016-06-10 08:40:00 -07:00
Simon Michael
499f249157 ui: clear screen before add 2016-06-09 12:42:47 -07:00
Simon Michael
6c6222ef85 ui: import Lens.Micro.Platform more correctly 2016-06-09 12:41:26 -07:00
Simon Michael
a6d859c273 ui: comments 2016-06-09 09:51:15 -07:00
Simon Michael
1ed7819467 ui: very basic add command integration 2016-06-09 09:50:41 -07:00
Simon Michael
8bda78a447 ui: refactor, simplify, flatten screen types 2016-06-09 07:47:48 -07:00
Simon Michael
e6b1d2d5a7 ui: preliminary lensification, just the accounts screen state
Experimenting with lenses to reduce record accessing/updating noise.
So far, it's not at all a clear win.
cf https://github.com/jtdaugherty/brick/issues/62
2016-06-08 15:47:53 -07:00
Simon Michael
5c343a5848 ui: convert screen states to records
This is highly verbose, but potentially clearer, allows better haddock docs, and hopefully will improve after lensification.
2016-06-08 12:15:58 -07:00
Simon Michael
5259605e82 ui: simplify screen naming & importing 2016-06-08 11:03:49 -07:00
Simon Michael
70d596fb38 ui: extract journal reloading 2016-06-08 10:48:34 -07:00
Simon Michael
1e93feeff3 ui: distinguish regenerateScreens from journal reloading 2016-06-08 10:42:51 -07:00
Simon Michael
bbcbaf6080 ui: Esc (outside minibuffer) resets, jumps to top 2016-06-07 09:26:16 -07:00
Simon Michael
c6313ebf8c ui: use / to filter; backspace/delete clears it
I was planning to use this for search, but I can't help it, my hands
want to use / to adjust the filter.
2016-06-07 09:23:36 -07:00
Simon Michael
4b68675ce5 ui: txn: show current query affecting txn list 2016-06-07 09:20:20 -07:00
Simon Michael
7a951a8dd7 ui: cleanup, haddocks 2016-06-07 09:03:59 -07:00
Simon Michael
9131eb7c67 ui: allow the filter query to be changed 2016-06-04 11:56:10 -07:00
Simon Michael
606036e1a2 ui: consistent -V description in short help 2016-06-03 18:41:12 -07:00
Simon Michael
d1d6e237ec ui: U key shows only uncleared transactions/postings 2016-06-03 18:32:19 -07:00
Simon Michael
3b24c15813 ui: transaction: show when empty/cleared/real are affecting the txn list 2016-06-03 18:00:38 -07:00
Simon Michael
9e42e231c7 ui: accounts, register: more stable scroll position after E/C/R 2016-06-03 17:53:49 -07:00
Simon Michael
4ab1536ea0 ui: accounts: hold selection better during F toggle 2016-06-03 16:31:53 -07:00
Simon Michael
ddf18060ab ui: register: keep scroll position more stable when toggling E 2016-06-03 16:07:37 -07:00
Simon Michael
fa59fd27ee ui: register: fix zero txn toggling, and maintain selection 2016-06-03 12:56:22 -07:00
Simon Michael
16bb17fbe8 ui: show nonzero (empty) mode, turn it off by default
-E/--empty is now the default for hledger-ui, so accounts with 0 balance
and transactions posting 0 change are shown by default.  The E key
toggles this, entering "nonzero" mode which hides zero items.
2016-06-03 09:01:54 -07:00
Simon Michael
2c8b47b293 ui: register: E key toggles zero-amount txns 2016-06-03 08:57:38 -07:00
Simon Michael
cc67aeba8d ui: fix some warnings (#354) 2016-06-02 18:13:07 -07:00
Simon Michael
7c8d7e9820 ui: transaction: ignore real/cleared/empty, always show full txn (#354)
This commit clarifies the account transactions report: as before the included transactions
are the original unfiltered transactions, but now the change and running balance amounts
are calculated from the report-matched postings. This fixed the limitation noted in 509f558,
so that toggling real mode in any screen could work. Then I decided the transaction screen
shouldn't show a partial transaction after all, so real/cleared filtering is no longer allowed or indicated here.
2016-06-02 07:03:00 -07:00
Simon Michael
e3a55a72d9 ui: accounts: E key toggles --empty 2016-06-01 12:32:38 -07:00
Simon Michael
509f55864d ui: indicate real mode and toggle it with R key (#354)
There is a limitation/bug: disabling real mode in the transaction screen
won't show the non-real postings if it was entered from a real-mode
register screen.
2016-06-01 12:30:39 -07:00
Simon Michael
90c9735b7a lib: textification: descriptions & codes
Slightly higher (with small files) and lower (with large files) maximum
residency, and slightly quicker for all.

hledger -f data/100x100x10.journal stats
<<ghc: 42858472 bytes, 84 GCs, 193712/269608 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.015 elapsed), 0.016 MUT (0.042 elapsed), 0.011 GC (0.119 elapsed) :ghc>>
<<ghc: 42891776 bytes, 84 GCs, 190816/260920 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.004 elapsed), 0.017 MUT (0.025 elapsed), 0.010 GC (0.015 elapsed) :ghc>>

hledger -f data/1000x1000x10.journal stats
<<ghc: 349575240 bytes, 681 GCs, 1396425/4091680 avg/max bytes residency (7 samples), 11M in use, 0.000 INIT (0.000 elapsed), 0.137 MUT (0.146 elapsed), 0.050 GC (0.057 elapsed) :ghc>>
<<ghc: 349927568 bytes, 681 GCs, 1397825/4097248 avg/max bytes residency (7 samples), 11M in use, 0.000 INIT (0.000 elapsed), 0.126 MUT (0.133 elapsed), 0.050 GC (0.057 elapsed) :ghc>>

hledger -f data/10000x1000x10.journal stats
<<ghc: 3424029496 bytes, 6658 GCs, 11403141/41077288 avg/max bytes residency (11 samples), 111M in use, 0.000 INIT (0.000 elapsed), 1.278 MUT (1.310 elapsed), 0.493 GC (0.546 elapsed) :ghc>>
<<ghc: 3427418064 bytes, 6665 GCs, 11127869/37790168 avg/max bytes residency (11 samples), 109M in use, 0.000 INIT (0.001 elapsed), 1.212 MUT (1.229 elapsed), 0.466 GC (0.519 elapsed) :ghc>>

hledger -f data/100000x1000x10.journal stats
<<ghc: 34306546248 bytes, 66727 GCs, 77030638/414617944 avg/max bytes residency (14 samples), 1012M in use, 0.000 INIT (0.000 elapsed), 12.965 MUT (13.164 elapsed), 4.771 GC (5.447 elapsed) :ghc>>
<<ghc: 34340246056 bytes, 66779 GCs, 76983178/416011480 avg/max bytes residency (14 samples), 1011M in use, 0.000 INIT (0.008 elapsed), 12.666 MUT (12.836 elapsed), 4.595 GC (5.175 elapsed) :ghc>>
2016-05-24 19:00:58 -07:00
Simon Michael
2538d14ea7 lib: textification begins! account names
The first of several conversions from String to (strict) Text, hopefully
reducing space and time usage.

This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1:

hledger -f data/100x100x10.journal stats
string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>>
text:   <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>>

hledger -f data/1000x100x10.journal stats
string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>>
text:   <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>>

hledger -f data/10000x100x10.journal stats
string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>>
text:   <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>>

hledger -f data/100000x100x10.journal stats
string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>>
text:   <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
2016-05-24 19:00:49 -07:00
Simon Michael
0a90ef4658 ui: preserve --ignore-assertions & flags on reload 2016-05-02 20:12:11 -07:00
Simon Michael
50aeb90596 lib, ui: GHC 8 compatibility 2016-04-28 12:55:19 -07:00
Simon Michael
42c12fe631 cli, ui, web, api: --info, --man, info & man cmds 2016-04-19 19:21:29 -07:00
Simon Michael
f9362707b6 ui, web, api: fix -h, --help 2016-04-18 16:43:51 -07:00
Simon Michael
f331ebec16 ui, api: switch to the quicker-building microlens
This may not make much difference since dependencies brick and
servant-swagger still depend on lens, but that might change.
2016-04-04 17:50:58 -07:00
Simon Michael
f36c4a2a91 mark todo 2016-02-19 17:52:40 -08:00
Simon Michael
8a4f3eaad4 ui: txn: make reloading work on this screen 2015-11-06 21:17:25 -08:00
Simon Michael
ed775e1ef4 ui: cleanup 2015-11-06 21:17:09 -08:00
Simon Michael
a8d9178ee2 ui: haddock 2015-11-06 21:16:44 -08:00
Simon Michael
e061eabe2c ui: C toggles --cleared; f -> F; UI tweaks
You can now toggle showing only cleared items in the accounts and
register screens, with C (like the command-line flag).

The f key has been changed to F for consistency (we don't have this as a
command-line flag, though we could, though Ledger uses it for something
different).

Screen titles have been tweaked, eg switching the cyan and yellow.

Screen help has been squeezed to fit better in 80 columns.
2015-10-30 10:42:44 -07:00
Simon Michael
722e19098f ui: txn: next/prev also moves selection in register 2015-10-29 20:34:31 -07:00
Simon Michael
4691454908 ui: txn: up/down steps through txns in the account 2015-10-29 20:19:18 -07:00
Simon Michael
4d97db02cb ui: txn: show full transaction, not a partial one 2015-10-29 18:20:27 -07:00
Simon Michael
11fee9fbe8 ui: txn: show multi-commodity amounts on one line
In the transaction screen, show multi-commodity posting amounts on one
line, consistent with the rest of hledger-ui.
2015-10-29 18:10:06 -07:00
Simon Michael
68cd35c965 ui: txn: add a transaction-viewing screen 2015-10-29 17:45:57 -07:00
Simon Michael
b48ee2d22e ui: types cleanup 2015-10-28 11:46:06 -07:00
Simon Michael
b950bd0d83 ui: reg: refactor, consolidate state 2015-10-28 11:30:56 -07:00
Simon Michael
45db0a28cc ui: acc: preserve account selection across reloads 2015-10-28 11:13:33 -07:00
Simon Michael
423934b2b8 ui: fixups 2015-10-28 10:27:14 -07:00
Simon Michael
2515025a84 ui: pressing g once now reloads all screens 2015-10-28 10:17:15 -07:00
Simon Michael
b527209e9f ui: err: tweak error message, make it red 2015-10-28 10:02:04 -07:00
Simon Michael
6f85e02f1a ui: show an error screen when reloading fails 2015-10-26 07:41:45 -07:00
Simon Michael
b64f42c2d8 bal, ui: option help tweaks 2015-10-17 11:22:39 -07:00
Simon Michael
bcc22a0367 ui: register: wide-char-aware layout 2015-10-10 12:26:17 -07:00
Simon Michael
7808c502ad ui: accounts: wide-char-aware layout 2015-09-29 21:17:24 -10:00
Simon Michael
af33a5ac3d ui: f key toggles flat/tree mode 2015-09-13 14:34:46 -07:00
Simon Michael
135cf714ef ui: streamline help 2015-09-13 14:34:28 -07:00