GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CmdChart[C: Added reports.<type>.range support

Browse source
This commit is contained in:
Paul Beckingham 2016-05-28 15:18:13 -04:00
parent 0b0860accd
commit d975631c9b
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/commands/CmdChart.cpp
View file

@ -57,7 +57,12 @@ int CmdChartDay (
// Create a filter, and if empty, choose the current month. // Create a filter, and if empty, choose the current month.
auto filter = getFilter (cli); auto filter = getFilter (cli);
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("today"), Datetime ("tomorrow")); {
if (rules.has ("reports.day.range"))
expandIntervalHint (rules.get ("reports.day.range"), filter.range);
else
filter.range = Range (Datetime ("today"), Datetime ("tomorrow"));
}
return renderChart (cli, "day", filter, rules, database); return renderChart (cli, "day", filter, rules, database);
} }
@ -71,7 +76,12 @@ int CmdChartWeek (
// Create a filter, and if empty, choose the current month. // Create a filter, and if empty, choose the current month.
auto filter = getFilter (cli); auto filter = getFilter (cli);
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("socw"), Datetime ("eocw")); {
if (rules.has ("reports.week.range"))
expandIntervalHint (rules.get ("reports.week.range"), filter.range);
else
filter.range = Range (Datetime ("socw"), Datetime ("eocw"));
}
return renderChart (cli, "week", filter, rules, database); return renderChart (cli, "week", filter, rules, database);
} }
@ -85,7 +95,12 @@ int CmdChartMonth (
// Create a filter, and if empty, choose the current month. // Create a filter, and if empty, choose the current month.
auto filter = getFilter (cli); auto filter = getFilter (cli);
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("socm"), Datetime ("eocm")); {
if (rules.has ("reports.month.range"))
expandIntervalHint (rules.get ("reports.month.range"), filter.range);
else
filter.range = Range (Datetime ("socm"), Datetime ("eocm"));
}
return renderChart (cli, "month", filter, rules, database); return renderChart (cli, "month", filter, rules, database);
} }