CmdChart: Renamed rc.reports.<type>.24h to rc.reports.<type>.hours with 'all' or 'auto' as values

This commit is contained in:
Paul Beckingham 2016-05-29 15:44:52 -04:00
parent b2a8a0abfb
commit 6688e98c1a
2 changed files with 4 additions and 4 deletions

View file

@ -45,7 +45,7 @@ Rules::Rules ()
{"verbose", "on"}, {"verbose", "on"},
// 'day' report. // 'day' report.
{"reports.day.24h", "yes"}, {"reports.day.hours", "all"},
{"reports.day.lines", "2"}, {"reports.day.lines", "2"},
{"reports.day.spacing", "1"}, {"reports.day.spacing", "1"},
{"reports.day.month", "no"}, {"reports.day.month", "no"},
@ -57,7 +57,7 @@ Rules::Rules ()
{"reports.day.holidays", "no"}, {"reports.day.holidays", "no"},
// 'week' report. // 'week' report.
{"reports.week.24h", "yes"}, {"reports.week.hours", "all"},
{"reports.week.lines", "1"}, {"reports.week.lines", "1"},
{"reports.week.spacing", "1"}, {"reports.week.spacing", "1"},
{"reports.week.month", "no"}, {"reports.week.month", "no"},
@ -69,7 +69,7 @@ Rules::Rules ()
{"reports.week.holidays", "yes"}, {"reports.week.holidays", "yes"},
// 'month' report. // 'month' report.
{"reports.month.24h", "yes"}, {"reports.month.hours", "all"},
{"reports.month.lines", "1"}, {"reports.month.lines", "1"},
{"reports.month.spacing", "1"}, {"reports.month.spacing", "1"},
{"reports.month.month", "yes"}, {"reports.month.month", "yes"},

View file

@ -219,7 +219,7 @@ static void determineHourRange (
int& first_hour, int& first_hour,
int& last_hour) int& last_hour)
{ {
if (! rules.getBoolean ("reports." + type + ".24h")) if (rules.getBoolean ("reports." + type + ".hours") == "auto")
{ {
// Get the extreme time range for the filtered data. // Get the extreme time range for the filtered data.
first_hour = 23; first_hour = 23;