Added --start-of-week option, used with --weekly
For example, --start-of-week=monday can be used to report weeks that begin on Mondays.
This commit is contained in:
John Wiegley
parent
13812346b6
commit
f4e13f3458
4 changed files with 228 additions and 0 deletions
|
|
@ -368,6 +368,8 @@ void global_scope_t::normalize_report_options(const string& verb)
|
||||||
output_datetime_format = rep.HANDLER(date_format_).str() + " %H:%M:%S";
|
output_datetime_format = rep.HANDLER(date_format_).str() + " %H:%M:%S";
|
||||||
output_date_format = rep.HANDLER(date_format_).str();
|
output_date_format = rep.HANDLER(date_format_).str();
|
||||||
}
|
}
|
||||||
|
if (rep.HANDLED(start_of_week_))
|
||||||
|
start_of_week = string_to_day_of_week(rep.HANDLER(start_of_week_).str());
|
||||||
|
|
||||||
// jww (2008-08-14): This code really needs to be rationalized away for 3.0.
|
// jww (2008-08-14): This code really needs to be rationalized away for 3.0.
|
||||||
// I might be able to do it with command objects, like register_t, which
|
// I might be able to do it with command objects, like register_t, which
|
||||||
|
|
|
||||||
|
|
@ -447,6 +447,7 @@ option_t<report_t> * report_t::lookup_option(const char * p)
|
||||||
else OPT(sort_all_);
|
else OPT(sort_all_);
|
||||||
else OPT(sort_entries_);
|
else OPT(sort_entries_);
|
||||||
else OPT_(subtotal);
|
else OPT_(subtotal);
|
||||||
|
else OPT(start_of_week_);
|
||||||
break;
|
break;
|
||||||
case 't':
|
case 't':
|
||||||
OPT_CH(amount_);
|
OPT_CH(amount_);
|
||||||
|
|
|
||||||
|
|
@ -535,6 +535,7 @@ public:
|
||||||
parent->HANDLER(sort_all_).off();
|
parent->HANDLER(sort_all_).off();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
OPTION(report_t, start_of_week_);
|
||||||
OPTION(report_t, subtotal); // -s
|
OPTION(report_t, subtotal); // -s
|
||||||
OPTION(report_t, tail_);
|
OPTION(report_t, tail_);
|
||||||
|
|
||||||
|
|
|
||||||
224
test/baseline/opt-start-of-week.test
Normal file
224
test/baseline/opt-start-of-week.test
Normal file
|
|
@ -0,0 +1,224 @@
|
||||||
|
reg --weekly --start-of-week=mon books
|
||||||
|
<<<
|
||||||
|
2008/01/01 January
|
||||||
|
Expenses:Books $10.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/01/31 End of January
|
||||||
|
Expenses:Books $10.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/02/01 February
|
||||||
|
Expenses:Books $20.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/02/28 End of February
|
||||||
|
Expenses:Books $20.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/03/01 March
|
||||||
|
Expenses:Books $30.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/03/31 End of March
|
||||||
|
Expenses:Books $30.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/04/01 April
|
||||||
|
Expenses:Books $40.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/04/30 End of April
|
||||||
|
Expenses:Books $40.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/05/01 May
|
||||||
|
Expenses:Books $50.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/05/31 End of May
|
||||||
|
Expenses:Books $50.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/06/01 June
|
||||||
|
Expenses:Books $60.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/06/30 End of June
|
||||||
|
Expenses:Books $60.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/07/01 July
|
||||||
|
Expenses:Books $70.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/07/31 End of July
|
||||||
|
Expenses:Books $70.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/08/01 August
|
||||||
|
Expenses:Books $80.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/08/31 End of August
|
||||||
|
Expenses:Books $80.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/09/01 September
|
||||||
|
Expenses:Books $90.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/09/30 End of September
|
||||||
|
Expenses:Books $90.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/10/01 October
|
||||||
|
Expenses:Books $100.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/10/31 End of October
|
||||||
|
Expenses:Books $100.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/11/01 November
|
||||||
|
Expenses:Books $110.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/11/30 End of November
|
||||||
|
Expenses:Books $110.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/12/01 December
|
||||||
|
Expenses:Books $120.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2008/12/31 End of December
|
||||||
|
Expenses:Books $120.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/01/01 January
|
||||||
|
Expenses:Books $10.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/01/31 End of January
|
||||||
|
Expenses:Books $10.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/02/01 February
|
||||||
|
Expenses:Books $20.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/02/28 End of February
|
||||||
|
Expenses:Books $20.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/03/01 March
|
||||||
|
Expenses:Books $30.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/03/31 End of March
|
||||||
|
Expenses:Books $30.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/04/01 April
|
||||||
|
Expenses:Books $40.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/04/30 End of April
|
||||||
|
Expenses:Books $40.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/05/01 May
|
||||||
|
Expenses:Books $50.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/05/31 End of May
|
||||||
|
Expenses:Books $50.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/06/01 June
|
||||||
|
Expenses:Books $60.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/06/30 End of June
|
||||||
|
Expenses:Books $60.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/07/01 July
|
||||||
|
Expenses:Books $70.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/07/31 End of July
|
||||||
|
Expenses:Books $70.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/08/01 August
|
||||||
|
Expenses:Books $80.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/08/31 End of August
|
||||||
|
Expenses:Books $80.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/09/01 September
|
||||||
|
Expenses:Books $90.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/09/30 End of September
|
||||||
|
Expenses:Books $90.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/10/01 October
|
||||||
|
Expenses:Books $100.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/10/31 End of October
|
||||||
|
Expenses:Books $100.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/11/01 November
|
||||||
|
Expenses:Books $110.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/11/30 End of November
|
||||||
|
Expenses:Books $110.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/12/01 December
|
||||||
|
Expenses:Books $120.00
|
||||||
|
Assets:Cash
|
||||||
|
|
||||||
|
2009/12/31 End of December
|
||||||
|
Expenses:Books $120.00
|
||||||
|
Assets:Cash
|
||||||
|
>>>1
|
||||||
|
07-Dec-31 - 08-Jan-06 Expenses:Books $10.00 $10.00
|
||||||
|
08-Jan-28 - 08-Feb-03 Expenses:Books $30.00 $40.00
|
||||||
|
08-Feb-25 - 08-Mar-02 Expenses:Books $50.00 $90.00
|
||||||
|
08-Mar-31 - 08-Apr-06 Expenses:Books $70.00 $160.00
|
||||||
|
08-Apr-28 - 08-May-04 Expenses:Books $90.00 $250.00
|
||||||
|
08-May-26 - 08-Jun-01 Expenses:Books $110.00 $360.00
|
||||||
|
08-Jun-30 - 08-Jul-06 Expenses:Books $130.00 $490.00
|
||||||
|
08-Jul-28 - 08-Aug-03 Expenses:Books $150.00 $640.00
|
||||||
|
08-Aug-25 - 08-Aug-31 Expenses:Books $80.00 $720.00
|
||||||
|
08-Sep-01 - 08-Sep-07 Expenses:Books $90.00 $810.00
|
||||||
|
08-Sep-29 - 08-Oct-05 Expenses:Books $190.00 $1000.00
|
||||||
|
08-Oct-27 - 08-Nov-02 Expenses:Books $210.00 $1210.00
|
||||||
|
08-Nov-24 - 08-Nov-30 Expenses:Books $110.00 $1320.00
|
||||||
|
08-Dec-01 - 08-Dec-07 Expenses:Books $120.00 $1440.00
|
||||||
|
08-Dec-29 - 09-Jan-04 Expenses:Books $130.00 $1570.00
|
||||||
|
09-Jan-26 - 09-Feb-01 Expenses:Books $30.00 $1600.00
|
||||||
|
09-Feb-23 - 09-Mar-01 Expenses:Books $50.00 $1650.00
|
||||||
|
09-Mar-30 - 09-Apr-05 Expenses:Books $70.00 $1720.00
|
||||||
|
09-Apr-27 - 09-May-03 Expenses:Books $90.00 $1810.00
|
||||||
|
09-May-25 - 09-May-31 Expenses:Books $50.00 $1860.00
|
||||||
|
09-Jun-01 - 09-Jun-07 Expenses:Books $60.00 $1920.00
|
||||||
|
09-Jun-29 - 09-Jul-05 Expenses:Books $130.00 $2050.00
|
||||||
|
09-Jul-27 - 09-Aug-02 Expenses:Books $150.00 $2200.00
|
||||||
|
09-Aug-31 - 09-Sep-06 Expenses:Books $170.00 $2370.00
|
||||||
|
09-Sep-28 - 09-Oct-04 Expenses:Books $190.00 $2560.00
|
||||||
|
09-Oct-26 - 09-Nov-01 Expenses:Books $210.00 $2770.00
|
||||||
|
09-Nov-30 - 09-Dec-06 Expenses:Books $230.00 $3000.00
|
||||||
|
09-Dec-28 - 10-Jan-03 Expenses:Books $120.00 $3120.00
|
||||||
|
>>>2
|
||||||
|
=== 0
|
||||||
Loading…
Add table
Reference in a new issue