sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sort by default unless --unsorted is selected

Browse source
This commit is contained in:
John Wiegley 2009-10-28 01:17:10 -04:00
parent b7233edd8a
commit 559566751d
12 changed files with 99 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/chain.cc
View file

@ -114,6 +114,10 @@ post_handler_ptr chain_post_handlers(report_t& report,
else else
handler.reset(new sort_posts(handler, report.HANDLER(sort_).str())); handler.reset(new sort_posts(handler, report.HANDLER(sort_).str()));
} }
else if (! report.HANDLED(period_) &&
! report.HANDLED(unsorted)) {
handler.reset(new sort_posts(handler, "date"));
}
// collapse_posts causes xacts with multiple posts to appear as xacts // collapse_posts causes xacts with multiple posts to appear as xacts
// with a subtotaled post for each commodity used. // with a subtotaled post for each commodity used.
@ -135,6 +139,10 @@ post_handler_ptr chain_post_handlers(report_t& report,
else if (report.HANDLED(subtotal)) else if (report.HANDLED(subtotal))
handler.reset(new subtotal_posts(handler, expr)); handler.reset(new subtotal_posts(handler, expr));
} }
else if (! report.HANDLED(period_) &&
! report.HANDLED(unsorted)) {
handler.reset(new sort_posts(handler, "date"));
}
if (report.HANDLED(dow)) if (report.HANDLED(dow))
handler.reset(new dow_posts(handler, expr)); handler.reset(new dow_posts(handler, expr));

1
src/report.cc
View file

@ -650,6 +650,7 @@ option_t<report_t> * report_t::lookup_option(const char * p)
OPT(unbudgeted); OPT(unbudgeted);
else OPT(uncleared); else OPT(uncleared);
else OPT(unround); else OPT(unround);
else OPT(unsorted);
break; break;
case 'w': case 'w':
OPT(weekly); OPT(weekly);

3
src/report.h
View file

@ -290,6 +290,7 @@ public:
HANDLER(unbudgeted).report(out); HANDLER(unbudgeted).report(out);
HANDLER(uncleared).report(out); HANDLER(uncleared).report(out);
HANDLER(unround).report(out); HANDLER(unround).report(out);
HANDLER(unsorted).report(out);
HANDLER(weekly).report(out); HANDLER(weekly).report(out);
HANDLER(wide).report(out); HANDLER(wide).report(out);
HANDLER(yearly).report(out); HANDLER(yearly).report(out);
@ -821,6 +822,8 @@ public:
.set_expr(string("--unround"), "unrounded(total_expr)"); .set_expr(string("--unround"), "unrounded(total_expr)");
}); });
OPTION(report_t, unsorted);
OPTION_(report_t, weekly, DO() { // -W OPTION_(report_t, weekly, DO() { // -W
parent->HANDLER(period_).on(string("--weekly"), "weekly"); parent->HANDLER(period_).on(string("--weekly"), "weekly");
}); });

32
test/baseline/opt-by-payee.test
View file

@ -192,29 +192,29 @@ reg --by-payee not @End
Expenses:Books $120.00 Expenses:Books $120.00
Assets:Cash Assets:Cash
>>>1 >>>1
08-Apr-01 April Assets:Cash $-80.00 $-80.00
Expenses:Books $80.00 0
08-Aug-01 August Assets:Cash $-160.00 $-160.00
Expenses:Books $160.00 0
08-Dec-01 December Assets:Cash $-240.00 $-240.00
Expenses:Books $240.00 0
08-Feb-01 February Assets:Cash $-40.00 $-40.00
Expenses:Books $40.00 0
08-Jan-01 January Assets:Cash $-20.00 $-20.00 08-Jan-01 January Assets:Cash $-20.00 $-20.00
Expenses:Books $20.00 0 Expenses:Books $20.00 0
08-Jul-01 July Assets:Cash $-140.00 $-140.00 08-Feb-01 February Assets:Cash $-40.00 $-40.00
Expenses:Books $140.00 0 Expenses:Books $40.00 0
08-Jun-01 June Assets:Cash $-120.00 $-120.00
Expenses:Books $120.00 0
08-Mar-01 March Assets:Cash $-60.00 $-60.00 08-Mar-01 March Assets:Cash $-60.00 $-60.00
Expenses:Books $60.00 0 Expenses:Books $60.00 0
08-Apr-01 April Assets:Cash $-80.00 $-80.00
Expenses:Books $80.00 0
08-May-01 May Assets:Cash $-100.00 $-100.00 08-May-01 May Assets:Cash $-100.00 $-100.00
Expenses:Books $100.00 0 Expenses:Books $100.00 0
08-Nov-01 November Assets:Cash $-220.00 $-220.00 08-Jun-01 June Assets:Cash $-120.00 $-120.00
Expenses:Books $220.00 0 Expenses:Books $120.00 0
08-Oct-01 October Assets:Cash $-200.00 $-200.00 08-Jul-01 July Assets:Cash $-140.00 $-140.00
Expenses:Books $200.00 0 Expenses:Books $140.00 0
08-Aug-01 August Assets:Cash $-160.00 $-160.00
Expenses:Books $160.00 0
08-Sep-01 September Assets:Cash $-180.00 $-180.00 08-Sep-01 September Assets:Cash $-180.00 $-180.00
Expenses:Books $180.00 0 Expenses:Books $180.00 0
08-Oct-01 October Assets:Cash $-200.00 $-200.00
Expenses:Books $200.00 0
08-Nov-01 November Assets:Cash $-220.00 $-220.00
Expenses:Books $220.00 0
08-Dec-01 December Assets:Cash $-240.00 $-240.00
Expenses:Books $240.00 0
>>>2 >>>2
=== 0 === 0

4
test/baseline/opt-effective.test
View file

@ -14,8 +14,8 @@ reg --effective
>>>1 >>>1
08-Jan-01 January Expenses:Books $10.00 $10.00 08-Jan-01 January Expenses:Books $10.00 $10.00
Assets:Cash $-10.00 0 Assets:Cash $-10.00 0
08-Feb-01 End of January Expenses:Books $10.00 $10.00 08-Jan-01 End of January Assets:Cash $-10.00 $-10.00
08-Jan-01 End of January Assets:Cash $-10.00 0 08-Feb-01 End of January Expenses:Books $10.00 0
08-Feb-01 February Expenses:Books $20.00 $20.00 08-Feb-01 February Expenses:Books $20.00 $20.00
Assets:Cash $-20.00 0 Assets:Cash $-20.00 0
>>>2 >>>2

104
test/baseline/opt-forecast-while.test
View file

@ -229,57 +229,57 @@ reg --now=2009/03/21 --forecast-while='total < $3500' books
09-Apr-01 April Expenses:Books $40.00 $1720.00 09-Apr-01 April Expenses:Books $40.00 $1720.00
09-Apr-30 End of April Expenses:Books $40.00 $1760.00 09-Apr-30 End of April Expenses:Books $40.00 $1760.00
09-May-01 May Expenses:Books $50.00 $1810.00 09-May-01 May Expenses:Books $50.00 $1810.00
09-May-31 End of May Expenses:Books $50.00 $1860.00 09-May-01 Forecast transaction Expenses:Books $10.00 $1820.00
09-Jun-01 June Expenses:Books $60.00 $1920.00 09-May-31 End of May Expenses:Books $50.00 $1870.00
09-Jun-30 End of June Expenses:Books $60.00 $1980.00 09-Jun-01 June Expenses:Books $60.00 $1930.00
09-Jul-01 July Expenses:Books $70.00 $2050.00 09-Jun-01 Forecast transaction Expenses:Books $10.00 $1940.00
09-Jul-31 End of July Expenses:Books $70.00 $2120.00 09-Jun-30 End of June Expenses:Books $60.00 $2000.00
09-Aug-01 August Expenses:Books $80.00 $2200.00 09-Jul-01 July Expenses:Books $70.00 $2070.00
09-Aug-31 End of August Expenses:Books $80.00 $2280.00 09-Jul-01 Forecast transaction Expenses:Books $10.00 $2080.00
09-Sep-01 September Expenses:Books $90.00 $2370.00 09-Jul-31 End of July Expenses:Books $70.00 $2150.00
09-Sep-30 End of September Expenses:Books $90.00 $2460.00 09-Aug-01 August Expenses:Books $80.00 $2230.00
09-Oct-01 October Expenses:Books $100.00 $2560.00 09-Aug-01 Forecast transaction Expenses:Books $10.00 $2240.00
09-Oct-31 End of October Expenses:Books $100.00 $2660.00 09-Aug-31 End of August Expenses:Books $80.00 $2320.00
09-Nov-01 November Expenses:Books $110.00 $2770.00 09-Sep-01 September Expenses:Books $90.00 $2410.00
09-Nov-30 End of November Expenses:Books $110.00 $2880.00 09-Sep-01 Forecast transaction Expenses:Books $10.00 $2420.00
09-Dec-01 December Expenses:Books $120.00 $3000.00 09-Sep-30 End of September Expenses:Books $90.00 $2510.00
09-Dec-31 End of December Expenses:Books $120.00 $3120.00 09-Oct-01 October Expenses:Books $100.00 $2610.00
09-Apr-01 Forecast transaction Expenses:Books $10.00 $3130.00 09-Oct-01 Forecast transaction Expenses:Books $10.00 $2620.00
09-May-01 Forecast transaction Expenses:Books $10.00 $3140.00 09-Oct-31 End of October Expenses:Books $100.00 $2720.00
09-Jun-01 Forecast transaction Expenses:Books $10.00 $3150.00 09-Nov-01 November Expenses:Books $110.00 $2830.00
09-Jul-01 Forecast transaction Expenses:Books $10.00 $3160.00 09-Nov-01 Forecast transaction Expenses:Books $10.00 $2840.00
09-Aug-01 Forecast transaction Expenses:Books $10.00 $3170.00 09-Nov-30 End of November Expenses:Books $110.00 $2950.00
09-Sep-01 Forecast transaction Expenses:Books $10.00 $3180.00 09-Dec-01 December Expenses:Books $120.00 $3070.00
09-Oct-01 Forecast transaction Expenses:Books $10.00 $3190.00 09-Dec-01 Forecast transaction Expenses:Books $10.00 $3080.00
09-Nov-01 Forecast transaction Expenses:Books $10.00 $3200.00 09-Dec-31 End of December Expenses:Books $120.00 $3200.00
09-Dec-01 Forecast transaction Expenses:Books $10.00 $3210.00 10-Jan-01 Forecast transaction Expenses:Books $10.00 $3210.00
10-Jan-01 Forecast transaction Expenses:Books $10.00 $3220.00 10-Feb-01 Forecast transaction Expenses:Books $10.00 $3220.00
10-Feb-01 Forecast transaction Expenses:Books $10.00 $3230.00 10-Mar-01 Forecast transaction Expenses:Books $10.00 $3230.00
10-Mar-01 Forecast transaction Expenses:Books $10.00 $3240.00 10-Apr-01 Forecast transaction Expenses:Books $10.00 $3240.00
10-Apr-01 Forecast transaction Expenses:Books $10.00 $3250.00 10-May-01 Forecast transaction Expenses:Books $10.00 $3250.00
10-May-01 Forecast transaction Expenses:Books $10.00 $3260.00 10-Jun-01 Forecast transaction Expenses:Books $10.00 $3260.00
10-Jun-01 Forecast transaction Expenses:Books $10.00 $3270.00 10-Jul-01 Forecast transaction Expenses:Books $10.00 $3270.00
10-Jul-01 Forecast transaction Expenses:Books $10.00 $3280.00 10-Aug-01 Forecast transaction Expenses:Books $10.00 $3280.00
10-Aug-01 Forecast transaction Expenses:Books $10.00 $3290.00 10-Sep-01 Forecast transaction Expenses:Books $10.00 $3290.00
10-Sep-01 Forecast transaction Expenses:Books $10.00 $3300.00 10-Oct-01 Forecast transaction Expenses:Books $10.00 $3300.00
10-Oct-01 Forecast transaction Expenses:Books $10.00 $3310.00 10-Nov-01 Forecast transaction Expenses:Books $10.00 $3310.00
10-Nov-01 Forecast transaction Expenses:Books $10.00 $3320.00 10-Dec-01 Forecast transaction Expenses:Books $10.00 $3320.00
10-Dec-01 Forecast transaction Expenses:Books $10.00 $3330.00 11-Jan-01 Forecast transaction Expenses:Books $10.00 $3330.00
11-Jan-01 Forecast transaction Expenses:Books $10.00 $3340.00 11-Feb-01 Forecast transaction Expenses:Books $10.00 $3340.00
11-Feb-01 Forecast transaction Expenses:Books $10.00 $3350.00 11-Mar-01 Forecast transaction Expenses:Books $10.00 $3350.00
11-Mar-01 Forecast transaction Expenses:Books $10.00 $3360.00 11-Apr-01 Forecast transaction Expenses:Books $10.00 $3360.00
11-Apr-01 Forecast transaction Expenses:Books $10.00 $3370.00 11-May-01 Forecast transaction Expenses:Books $10.00 $3370.00
11-May-01 Forecast transaction Expenses:Books $10.00 $3380.00 11-Jun-01 Forecast transaction Expenses:Books $10.00 $3380.00
11-Jun-01 Forecast transaction Expenses:Books $10.00 $3390.00 11-Jul-01 Forecast transaction Expenses:Books $10.00 $3390.00
11-Jul-01 Forecast transaction Expenses:Books $10.00 $3400.00 11-Aug-01 Forecast transaction Expenses:Books $10.00 $3400.00
11-Aug-01 Forecast transaction Expenses:Books $10.00 $3410.00 11-Sep-01 Forecast transaction Expenses:Books $10.00 $3410.00
11-Sep-01 Forecast transaction Expenses:Books $10.00 $3420.00 11-Oct-01 Forecast transaction Expenses:Books $10.00 $3420.00
11-Oct-01 Forecast transaction Expenses:Books $10.00 $3430.00 11-Nov-01 Forecast transaction Expenses:Books $10.00 $3430.00
11-Nov-01 Forecast transaction Expenses:Books $10.00 $3440.00 11-Dec-01 Forecast transaction Expenses:Books $10.00 $3440.00
11-Dec-01 Forecast transaction Expenses:Books $10.00 $3450.00 12-Jan-01 Forecast transaction Expenses:Books $10.00 $3450.00
12-Jan-01 Forecast transaction Expenses:Books $10.00 $3460.00 12-Feb-01 Forecast transaction Expenses:Books $10.00 $3460.00
12-Feb-01 Forecast transaction Expenses:Books $10.00 $3470.00 12-Mar-01 Forecast transaction Expenses:Books $10.00 $3470.00
12-Mar-01 Forecast transaction Expenses:Books $10.00 $3480.00 12-Apr-01 Forecast transaction Expenses:Books $10.00 $3480.00
12-Apr-01 Forecast transaction Expenses:Books $10.00 $3490.00 12-May-01 Forecast transaction Expenses:Books $10.00 $3490.00
>>>2 >>>2
=== 0 === 0

2
test/baseline/opt-lot-dates.test
View file

@ -1,4 +1,4 @@
reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lot-dates reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lot-dates --unsorted
<<< <<<
C 1.00s = 100c C 1.00s = 100c
C 1.00G = 100s C 1.00G = 100s

2
test/baseline/opt-lot-prices.test
View file

@ -1,4 +1,4 @@
reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lot-prices reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lot-prices --unsorted
<<< <<<
C 1.00s = 100c C 1.00s = 100c
C 1.00G = 100s C 1.00G = 100s

2
test/baseline/opt-lots.test
View file

@ -1,4 +1,4 @@
reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lots reg -F '%(justify(scrub(total_expr), 80, 80, true))\n' --lots --unsorted
<<< <<<
C 1.00s = 100c C 1.00s = 100c
C 1.00G = 100s C 1.00G = 100s

12
test/baseline/opt-lots_basis.test
View file

@ -871,12 +871,6 @@ D 1.00G
Expenses:Fees:Mail 30c 1.50G Expenses:Fees:Mail 30c 1.50G
Expenses:Fees:Mail 30c 1.51G Expenses:Fees:Mail 30c 1.51G
Assets:Tajer -1.51G 0 Assets:Tajer -1.51G 0
06-Mar-27 Player Assets:Tajer 160.00G 160.00G
Assets:Tajer:Items -160.00G 0
Expenses:Capital Loss 40.00G 40.00G
Equity:Capital Losses -40.00G 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0
06-Mar-26 Player Expenses:Items 54.00G 54.00G 06-Mar-26 Player Expenses:Items 54.00G 54.00G
Expenses:Items 10.00G 64.00G Expenses:Items 10.00G 64.00G
Expenses:Fees:Bank 10.00G 74.00G Expenses:Fees:Bank 10.00G 74.00G
@ -884,6 +878,12 @@ D 1.00G
Expenses:Fees:Mail 3.30s 74.10G Expenses:Fees:Mail 3.30s 74.10G
Expenses:Fees:Mail 30c 74.10G Expenses:Fees:Mail 30c 74.10G
Assets:Tajer -74.10G 0 Assets:Tajer -74.10G 0
06-Mar-27 Player Assets:Tajer 160.00G 160.00G
Assets:Tajer:Items -160.00G 0
Expenses:Capital Loss 40.00G 40.00G
Equity:Capital Losses -40.00G 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0
06-Apr-01 Auction House Assets:Tajer:Items 155.00G 155.00G 06-Apr-01 Auction House Assets:Tajer:Items 155.00G 155.00G
Assets:Tajer -155.00G 0 Assets:Tajer -155.00G 0
>>>2 >>>2

12
test/baseline/opt-lots_basis_base.test
View file

@ -872,12 +872,6 @@ D 1.00G
Expenses:Fees:Mail 30c 15030c Expenses:Fees:Mail 30c 15030c
Expenses:Fees:Mail 30c 15060c Expenses:Fees:Mail 30c 15060c
Assets:Tajer -15060c 0 Assets:Tajer -15060c 0
06-Mar-27 Player Assets:Tajer 1600000c 1600000c
Assets:Tajer:Items -1600000c 0
Expenses:Capital Loss 400000c 400000c
Equity:Capital Losses -400000c 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0
06-Mar-26 Player Expenses:Items 540000c 540000c 06-Mar-26 Player Expenses:Items 540000c 540000c
Expenses:Items 100000c 640000c Expenses:Items 100000c 640000c
Expenses:Fees:Bank 100000c 740000c Expenses:Fees:Bank 100000c 740000c
@ -885,6 +879,12 @@ D 1.00G
Expenses:Fees:Mail 330c 740960c Expenses:Fees:Mail 330c 740960c
Expenses:Fees:Mail 30c 740990c Expenses:Fees:Mail 30c 740990c
Assets:Tajer -740990c 0 Assets:Tajer -740990c 0
06-Mar-27 Player Assets:Tajer 1600000c 1600000c
Assets:Tajer:Items -1600000c 0
Expenses:Capital Loss 400000c 400000c
Equity:Capital Losses -400000c 0
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
Assets:Tajer -30c 0
06-Apr-01 Auction House Assets:Tajer:Items 1550000c 1550000c 06-Apr-01 Auction House Assets:Tajer:Items 1550000c 1550000c
Assets:Tajer -1550000c 0 Assets:Tajer -1550000c 0
>>>2 >>>2

4
test/baseline/opt-strict.test
View file

@ -14,10 +14,10 @@ reg --strict
>>>1 >>>1
07-Feb-02 Foo Expenses:Food $10.00 $10.00 07-Feb-02 Foo Expenses:Food $10.00 $10.00
Assets:Cash $-10.00 0 Assets:Cash $-10.00 0
07-Feb-03 Bar Expenses:Food $20.00 $20.00
Assets:Cash $-20.00 0
07-Feb-02 Baz Expenses:Foodx $30.00 $30.00 07-Feb-02 Baz Expenses:Foodx $30.00 $30.00
Assets:Cash $-30.00 0 Assets:Cash $-30.00 0
07-Feb-03 Bar Expenses:Food $20.00 $20.00
Assets:Cash $-20.00 0
>>>2 >>>2
Warning: "$FILE", line 10: Unknown account 'Expenses:Foodx' Warning: "$FILE", line 10: Unknown account 'Expenses:Foodx'
=== 0 === 0