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

CmdReportDay: Udated to new API

Browse source
This commit is contained in:
Paul Beckingham 2016-04-28 20:31:43 -04:00
parent 28b1bd567c
commit 491d2dbed3
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/commands/CmdReportDay.cpp
View file

@ -52,9 +52,8 @@ int CmdReportDay (
filter.range = Range (Datetime ("today"), Datetime ("tomorrow")); filter.range = Range (Datetime ("today"), Datetime ("tomorrow"));
// Load the data. // Load the data.
auto timeline = createTimelineFromData (rules, database, filter); auto exclusions = getAllExclusions (rules, filter.range);
auto tracked = timeline.tracked (rules); auto tracked = getTrackedIntervals (database, rules, filter);
auto excluded = timeline.excluded (rules);
// Create a color palette. // Create a color palette.
auto palette = createPalette (rules); auto palette = createPalette (rules);
@ -84,6 +83,7 @@ int CmdReportDay (
first_hour = std::max (first_hour - 1, 0); first_hour = std::max (first_hour - 1, 0);
last_hour = std::min (last_hour + 1, 23); last_hour = std::min (last_hour + 1, 23);
} }
// std::cout << "# hours: " << first_hour << " - " << last_hour << "\n";
// Render the axis. // Render the axis.
std::cout << '\n'; std::cout << '\n';
@ -93,10 +93,12 @@ int CmdReportDay (
// Each day is rendered separately. // Each day is rendered separately.
for (Datetime day = filter.range.start; day < filter.range.end; day++) for (Datetime day = filter.range.start; day < filter.range.end; day++)
{ {
// std::cout << "# day " << day.toISOLocalExtended () << "\n";
// Render the exclusion blocks. // Render the exclusion blocks.
Composite line1; Composite line1;
Composite line2; Composite line2;
renderExclusionBlocks (line1, line2, day, first_hour, last_hour, excluded, colorExc); renderExclusionBlocks (line1, line2, day, first_hour, last_hour, exclusions, colorExc);
for (auto& track : tracked) for (auto& track : tracked)
renderInterval (line1, line2, day, track, first_hour, palette, tag_colors); renderInterval (line1, line2, day, track, first_hour, palette, tag_colors);
@ -174,20 +176,23 @@ static void renderInterval (
Datetime eod {day}; Datetime eod {day};
eod++; eod++;
Range day_range (day, eod); Range day_range (day, eod);
Interval clipped {track}; Interval clipped = clip (track, day_range);
clipped.range = clipped.range.intersect (day_range);
// TODO track may have started days ago. // TODO track may have started days ago.
// std::cout << "# track " << track.dump () << "\n";
auto start_hour = clipped.range.start.hour (); auto start_hour = clipped.range.start.hour ();
auto start_min = clipped.range.start.minute (); auto start_min = clipped.range.start.minute ();
auto end_hour = clipped.range.end.hour (); auto end_hour = clipped.range.end.hour ();
auto end_min = clipped.range.end.minute (); auto end_min = clipped.range.end.minute ();
// std::cout << "# " << start_hour << "/" << start_min << " - " << end_hour << "/" << end_min << "\n";
auto start_block = quantizeTo15Minutes (start_min) / 15; auto start_block = quantizeTo15Minutes (start_min) / 15;
auto end_block = quantizeTo15Minutes (end_min == 0 ? 60 : end_min) / 15; auto end_block = quantizeTo15Minutes (end_min == 0 ? 60 : end_min) / 15;
// std::cout << "# blocks " << start_block << " - " << end_block << "\n";
int start_offset = (start_hour - first_hour) * 5 + start_block; int start_offset = (start_hour - first_hour) * 5 + start_block;
int end_offset = (end_hour - 1 - first_hour) * 5 + end_block; int end_offset = (end_hour - 1 - first_hour) * 5 + end_block;
// std::cout << "# offset " << start_offset << " - " << end_offset << "\n";
if (end_offset > start_offset) if (end_offset > start_offset)
{ {