mirror of
https://github.com/GothenburgBitFactory/timewarrior.git
synced 2025-07-07 20:06:39 +02:00
Extract chart rendering into own class
This commit is contained in:
Thomas Lauf
parent
cc0136a73a
commit
365ae27e49
5 changed files with 719 additions and 598 deletions
|
|
@ -6,6 +6,7 @@ include_directories (${CMAKE_SOURCE_DIR}
|
|||
${TIMEW_INCLUDE_DIRS})
|
||||
|
||||
set (timew_SRCS CLI.cpp CLI.h
|
||||
Chart.cpp Chart.h
|
||||
Database.cpp Database.h
|
||||
Datafile.cpp Datafile.h
|
||||
Exclusion.cpp Exclusion.h
|
||||
|
|
|
|||
629
src/Chart.cpp
Normal file
629
src/Chart.cpp
Normal file
|
|
@ -0,0 +1,629 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright 2019, Thomas Lauf, Paul Beckingham, Federico Hernandez.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included
|
||||
// in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
//
|
||||
// https://www.opensource.org/licenses/mit-license.php
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <shared.h>
|
||||
#include <commands.h>
|
||||
#include <Duration.h>
|
||||
#include <Composite.h>
|
||||
#include <Chart.h>
|
||||
#include <format.h>
|
||||
#include <cassert>
|
||||
#include <timew.h>
|
||||
#include <Chart.h>
|
||||
|
||||
void Chart::render (
|
||||
const Interval &filter,
|
||||
const std::vector<Interval> &tracked,
|
||||
const std::vector<Range> &exclusions,
|
||||
const std::map<Datetime, std::string> &holidays,
|
||||
const std::map<std::string, Color> &tag_colors,
|
||||
const Color &color_today,
|
||||
const Color &color_holiday,
|
||||
const Color &color_label,
|
||||
const Color &color_exclusion,
|
||||
const bool show_intervals,
|
||||
const bool determine_hour_range,
|
||||
const bool with_ids,
|
||||
const bool with_summary,
|
||||
const bool with_holidays,
|
||||
const bool with_totals,
|
||||
const bool with_month,
|
||||
const bool with_week,
|
||||
const bool with_day,
|
||||
const bool with_weekday,
|
||||
const bool with_internal_axis,
|
||||
const int minutes_per_char,
|
||||
const int spacing,
|
||||
const int num_lines)
|
||||
{
|
||||
// Determine hours shown.
|
||||
auto hour_range = determine_hour_range
|
||||
? determineHourRange (filter, tracked)
|
||||
: std::make_pair (0, 23);
|
||||
|
||||
int first_hour = hour_range.first;
|
||||
int last_hour = hour_range.second;
|
||||
|
||||
debug (format ("Day range is from {1}:00 - {2}:00", first_hour, last_hour));
|
||||
|
||||
const auto chars_per_hour = 60 / minutes_per_char;
|
||||
const auto cell_size = chars_per_hour + spacing;
|
||||
|
||||
const auto indent_size = getIndentSize (with_month, with_week, with_day, with_weekday);
|
||||
const auto indent = std::string (indent_size, ' ');
|
||||
const auto padding_size = indent_size + ((last_hour - first_hour + 1) * (cell_size)) + 1;
|
||||
|
||||
std::cout << '\n';
|
||||
|
||||
// Render the axis.
|
||||
if (!with_internal_axis)
|
||||
{
|
||||
std::cout << indent
|
||||
<< Chart::renderAxis (
|
||||
first_hour,
|
||||
last_hour,
|
||||
color_label,
|
||||
color_today,
|
||||
cell_size,
|
||||
with_totals);
|
||||
}
|
||||
|
||||
// For rendering labels on edge detection.
|
||||
Datetime previous{0};
|
||||
|
||||
// Each day is rendered separately.
|
||||
time_t total_work = 0;
|
||||
|
||||
for (Datetime day = filter.start; day < filter.end; day++)
|
||||
{
|
||||
// Render the exclusion blocks.
|
||||
|
||||
// Add an empty string with no color, to reserve width, so this function
|
||||
// can simply concatenate to lines[i].str ().
|
||||
int total_width = (last_hour - first_hour + 1) * (cell_size) - 1;
|
||||
std::vector<Composite> lines (num_lines);
|
||||
for (int i = 0; i < num_lines; ++i)
|
||||
{
|
||||
lines[i].add (std::string (total_width, ' '), 0, Color ());
|
||||
}
|
||||
|
||||
Chart::renderExclusionBlocks (lines, day, first_hour, last_hour, exclusions, minutes_per_char, spacing,
|
||||
color_exclusion, color_label, with_internal_axis);
|
||||
|
||||
time_t work = 0;
|
||||
if (!show_intervals)
|
||||
{
|
||||
for (auto &track : tracked)
|
||||
{
|
||||
time_t interval_work = 0;
|
||||
Chart::renderInterval (lines, day, track, tag_colors, first_hour, interval_work, with_ids, minutes_per_char,
|
||||
spacing);
|
||||
work += interval_work;
|
||||
}
|
||||
}
|
||||
|
||||
auto now = Datetime ();
|
||||
auto color_day = getDayColor (day, now, holidays, color_today, color_holiday);
|
||||
|
||||
auto labelMonth = with_month ? Chart::renderMonth (previous, day) : "";
|
||||
auto labelWeek = with_week ? Chart::renderWeek (previous, day) : "";
|
||||
auto labelWeekday = with_weekday ? Chart::renderWeekday (day, color_day) : "";
|
||||
auto labelDay = with_day ? Chart::renderDay (day, color_day) : "";
|
||||
|
||||
std::cout << labelMonth
|
||||
<< labelWeek
|
||||
<< labelWeekday
|
||||
<< labelDay
|
||||
<< lines[0].str ();
|
||||
|
||||
if (lines.size () > 1)
|
||||
{
|
||||
for (unsigned int i = 1; i < lines.size (); ++i)
|
||||
{
|
||||
std::cout << "\n"
|
||||
<< indent
|
||||
<< lines[i].str ();
|
||||
}
|
||||
}
|
||||
|
||||
std::cout << (with_totals ? Chart::renderTotal (work) : "")
|
||||
<< '\n';
|
||||
|
||||
previous = day;
|
||||
total_work += work;
|
||||
}
|
||||
|
||||
std::cout << (with_totals ? Chart::renderSubTotal (total_work, std::string (padding_size, ' ')) : "")
|
||||
<< (with_holidays ? Chart::renderHolidays (holidays) : "")
|
||||
<< (with_summary ? Chart::renderSummary (indent, filter, exclusions, tracked, show_intervals) : "");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
unsigned long Chart::getIndentSize (
|
||||
const bool with_month,
|
||||
const bool with_week,
|
||||
const bool with_day,
|
||||
const bool with_weekday)
|
||||
{
|
||||
return (with_month ? 4 : 0) +
|
||||
(with_week ? 4 : 0) +
|
||||
(with_day ? 3 : 0) +
|
||||
(with_weekday ? 4 : 0);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Scan all tracked intervals, looking for the earliest and latest hour into
|
||||
// which an interval extends.
|
||||
std::pair<int, int> Chart::determineHourRange (
|
||||
const Interval &filter,
|
||||
const std::vector<Interval> &tracked)
|
||||
{
|
||||
// Default to the full day.
|
||||
auto first_hour = 0;
|
||||
auto last_hour = 23;
|
||||
|
||||
// If there is no data,
|
||||
// show the whole day.
|
||||
if (!tracked.empty ())
|
||||
{
|
||||
// Get the extreme time range for the filtered data.
|
||||
first_hour = 23;
|
||||
last_hour = 0;
|
||||
|
||||
for (Datetime day = filter.start; day < filter.end; day++)
|
||||
{
|
||||
auto day_range = getFullDay (day);
|
||||
|
||||
for (auto &track : tracked)
|
||||
{
|
||||
if (day_range.overlaps (track))
|
||||
{
|
||||
Interval clipped = clip (track, day_range);
|
||||
if (track.is_open ())
|
||||
{
|
||||
clipped.end = Datetime ();
|
||||
}
|
||||
|
||||
if (clipped.start.hour () < first_hour)
|
||||
{
|
||||
first_hour = clipped.start.hour ();
|
||||
}
|
||||
|
||||
if (!clipped.is_open () && clipped.end.hour () > last_hour)
|
||||
{
|
||||
last_hour = clipped.end.hour ();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (first_hour == 23 && last_hour == 0)
|
||||
{
|
||||
first_hour = Datetime ().hour ();
|
||||
last_hour = std::min (first_hour + 1, 23);
|
||||
}
|
||||
else
|
||||
{
|
||||
first_hour = std::max (first_hour - 1, 0);
|
||||
last_hour = std::min (last_hour + 1, 23);
|
||||
}
|
||||
}
|
||||
|
||||
return std::make_pair (first_hour, last_hour);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderAxis (
|
||||
const int first_hour,
|
||||
const int last_hour,
|
||||
const Color &colorLabel,
|
||||
const Color &colorToday,
|
||||
const int cell_size,
|
||||
const bool with_totals)
|
||||
{
|
||||
std::stringstream out;
|
||||
auto current_hour = Datetime ().hour ();
|
||||
|
||||
for (int hour = first_hour; hour <= last_hour; hour++)
|
||||
{
|
||||
if (hour == current_hour)
|
||||
{
|
||||
out << colorToday.colorize (leftJustify (hour, cell_size));
|
||||
}
|
||||
else
|
||||
{
|
||||
out << colorLabel.colorize (leftJustify (hour, cell_size));
|
||||
}
|
||||
}
|
||||
|
||||
if (with_totals)
|
||||
{
|
||||
out << " " << colorLabel.colorize ("Total");
|
||||
}
|
||||
|
||||
out << '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderMonth (const Datetime &previous, const Datetime &day)
|
||||
{
|
||||
const auto show_month = previous.month () != day.month ();
|
||||
|
||||
std::stringstream out;
|
||||
|
||||
out << (show_month ? Datetime::monthNameShort (day.month ()) : " ")
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes trailing separator space.
|
||||
std::string Chart::renderWeek (const Datetime &previous, const Datetime &day)
|
||||
{
|
||||
const auto show_week = previous.week () != day.week ();
|
||||
|
||||
std::stringstream out;
|
||||
|
||||
out << (show_week ? leftJustify (format ("W{1}", day.week ()), 3) : " ")
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Today should be highlighted.
|
||||
// Includes trailing separator space.
|
||||
std::string Chart::renderWeekday (Datetime &day, const Color &color)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
out << color.colorize (Datetime::dayNameShort (day.dayOfWeek ()))
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderDay (Datetime &day, const Color &color)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
out << color.colorize (rightJustify (day.day (), 2))
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
Color Chart::getDayColor (
|
||||
const Datetime &day,
|
||||
const Datetime &now,
|
||||
const std::map<Datetime, std::string> &holidays,
|
||||
const Color &colorToday,
|
||||
const Color &colorHoliday)
|
||||
{
|
||||
if (day.sameDay (now))
|
||||
{
|
||||
return colorToday;
|
||||
}
|
||||
|
||||
for (auto &entry : holidays)
|
||||
{
|
||||
if (day.sameDay (entry.first))
|
||||
{
|
||||
return colorHoliday;
|
||||
}
|
||||
}
|
||||
|
||||
return Color{};
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderTotal (time_t work)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
if (work)
|
||||
{
|
||||
int hours = work / 3600;
|
||||
int minutes = (work % 3600) / 60;
|
||||
std::cout << " "
|
||||
<< std::setw (3) << std::setfill (' ') << hours
|
||||
<< ':'
|
||||
<< std::setw (2) << std::setfill ('0') << minutes;
|
||||
}
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderSubTotal (
|
||||
time_t total_work,
|
||||
const std::string &padding)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
int hours = total_work / 3600;
|
||||
int minutes = (total_work % 3600) / 60;
|
||||
|
||||
out << padding
|
||||
<< Color ("underline").colorize (" ")
|
||||
<< '\n'
|
||||
<< padding
|
||||
<< std::setw (3) << std::setfill (' ') << hours
|
||||
<< ':'
|
||||
<< std::setw (2) << std::setfill ('0') << minutes
|
||||
<< '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
void Chart::renderExclusionBlocks (
|
||||
std::vector<Composite> &lines,
|
||||
const Datetime &day,
|
||||
int first_hour,
|
||||
int last_hour,
|
||||
const std::vector<Range> &excluded,
|
||||
const int minutes_per_char,
|
||||
const int spacing,
|
||||
const Color &color_exclusion,
|
||||
const Color &color_label,
|
||||
const bool with_internal_axis)
|
||||
{
|
||||
const auto chars_per_hour = 60 / minutes_per_char;
|
||||
const auto cell_width = chars_per_hour + spacing;
|
||||
|
||||
// Render the exclusion blocks.
|
||||
for (int hour = first_hour; hour <= last_hour; hour++)
|
||||
{
|
||||
// Construct a range representing a single 'hour', of 'day'.
|
||||
Range r (Datetime (day.year (), day.month (), day.day (), hour, 0, 0),
|
||||
Datetime (day.year (), day.month (), day.day (), hour + 1, 0, 0));
|
||||
|
||||
if (with_internal_axis)
|
||||
{
|
||||
auto label = format ("{1}", hour);
|
||||
int offset = (hour - first_hour) * cell_width;
|
||||
lines[0].add (label, offset, color_label);
|
||||
}
|
||||
|
||||
for (auto &exc : excluded)
|
||||
{
|
||||
if (exc.overlaps (r))
|
||||
{
|
||||
// Determine which of the character blocks included.
|
||||
auto sub_hour = exc.intersect (r);
|
||||
auto start_block = quantizeToNMinutes (sub_hour.start.minute (), minutes_per_char) / minutes_per_char;
|
||||
auto end_block =
|
||||
quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), minutes_per_char) /
|
||||
minutes_per_char;
|
||||
|
||||
int offset = (hour - first_hour) * cell_width + start_block;
|
||||
int width = end_block - start_block;
|
||||
std::string block (width, ' ');
|
||||
|
||||
for (auto &line : lines)
|
||||
{
|
||||
line.add (block, offset, color_exclusion);
|
||||
}
|
||||
|
||||
if (with_internal_axis)
|
||||
{
|
||||
auto label = format ("{1}", hour);
|
||||
if (start_block == 0 &&
|
||||
width >= static_cast <int> (label.length ()))
|
||||
{
|
||||
lines[0].add (label, offset, color_exclusion);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
void Chart::renderInterval (
|
||||
std::vector<Composite> &lines,
|
||||
const Datetime &day,
|
||||
const Interval &track,
|
||||
const std::map<std::string, Color> &tag_colors,
|
||||
const int first_hour,
|
||||
time_t &work,
|
||||
const bool with_ids,
|
||||
const int minutes_per_char,
|
||||
const int spacing)
|
||||
{
|
||||
Datetime now;
|
||||
|
||||
// Ignore any track that doesn't overlap with day.
|
||||
auto day_range = getFullDay (day);
|
||||
if (!day_range.overlaps (track) || (track.is_open () && day > now))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// If the track is open and day is today, then closed the track now, otherwise
|
||||
// it will be rendered until midnight.
|
||||
Interval clipped = clip (track, day_range);
|
||||
if (track.is_open ())
|
||||
{
|
||||
if (day_range.start.sameDay (now))
|
||||
{
|
||||
clipped.end = now;
|
||||
}
|
||||
else
|
||||
{
|
||||
clipped.end = day_range.end;
|
||||
}
|
||||
}
|
||||
|
||||
auto start_mins = (clipped.start.hour () - first_hour) * 60 + clipped.start.minute ();
|
||||
auto end_mins = (clipped.end.hour () - first_hour) * 60 + clipped.end.minute ();
|
||||
|
||||
if (clipped.end.hour () == 0)
|
||||
{
|
||||
end_mins +=
|
||||
(clipped.end.day () + (clipped.end.month () - clipped.start.month () - 1) * clipped.start.day ()) * 24 * 60;
|
||||
}
|
||||
|
||||
work = clipped.total ();
|
||||
|
||||
auto start_block = quantizeToNMinutes (start_mins, minutes_per_char) / minutes_per_char;
|
||||
auto end_block =
|
||||
quantizeToNMinutes (end_mins == start_mins ? start_mins + 60 : end_mins, minutes_per_char) / minutes_per_char;
|
||||
|
||||
int start_offset = start_block + (spacing * (start_mins / 60));
|
||||
int end_offset = end_block + (spacing * (end_mins / 60));
|
||||
|
||||
if (end_offset > start_offset)
|
||||
{
|
||||
// Determine color of interval.
|
||||
Color colorTrack = intervalColor (track.tags (), tag_colors);
|
||||
|
||||
// Properly format the tags within the space.
|
||||
std::string label;
|
||||
if (with_ids)
|
||||
{
|
||||
label = format ("@{1}", track.id);
|
||||
}
|
||||
|
||||
for (auto &tag : track.tags ())
|
||||
{
|
||||
if (!label.empty ())
|
||||
{
|
||||
label += ' ';
|
||||
}
|
||||
|
||||
label += tag;
|
||||
}
|
||||
|
||||
auto width = end_offset - start_offset;
|
||||
|
||||
if (width)
|
||||
{
|
||||
std::vector<std::string> text_lines;
|
||||
wrapText (text_lines, label, width, false);
|
||||
|
||||
for (unsigned int i = 0; i < lines.size (); ++i)
|
||||
{
|
||||
if (i < text_lines.size ())
|
||||
{
|
||||
lines[i].add (leftJustify (text_lines[i], width), start_offset, colorTrack);
|
||||
}
|
||||
else
|
||||
{
|
||||
lines[i].add (std::string (width, ' '), start_offset, colorTrack);
|
||||
}
|
||||
}
|
||||
|
||||
// An open interval gets a "+" in the bottom right corner
|
||||
if (track.is_open ())
|
||||
{
|
||||
lines.back ().add ("+", start_offset + width - 1, colorTrack);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderHolidays (const std::map<Datetime, std::string> &holidays)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
for (auto &entry : holidays)
|
||||
{
|
||||
out << entry.first.toString ("Y-M-D")
|
||||
<< " "
|
||||
<< entry.second
|
||||
<< '\n';
|
||||
}
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string Chart::renderSummary (
|
||||
const std::string &indent,
|
||||
const Interval &filter,
|
||||
const std::vector<Range> &exclusions,
|
||||
const std::vector<Interval> &tracked,
|
||||
bool blank)
|
||||
{
|
||||
std::stringstream out;
|
||||
time_t total_unavailable = 0;
|
||||
|
||||
for (auto &exclusion : exclusions)
|
||||
{
|
||||
if (filter.overlaps (exclusion))
|
||||
{
|
||||
total_unavailable += filter.intersect (exclusion).total ();
|
||||
}
|
||||
}
|
||||
|
||||
time_t total_worked = 0;
|
||||
|
||||
if (!blank)
|
||||
{
|
||||
for (auto &interval : tracked)
|
||||
{
|
||||
if (filter.overlaps (interval))
|
||||
{
|
||||
Interval clipped = clip (interval, filter);
|
||||
if (interval.is_open ())
|
||||
{
|
||||
clipped.end = Datetime ();
|
||||
}
|
||||
|
||||
total_worked += clipped.total ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
auto total_available = filter.total () - total_unavailable;
|
||||
assert (total_available >= 0);
|
||||
auto total_remaining = total_available - total_worked;
|
||||
|
||||
out << '\n'
|
||||
<< indent << "Tracked "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_worked).formatHours () << '\n';
|
||||
|
||||
if (total_remaining >= 0)
|
||||
{
|
||||
out << indent << "Available "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_remaining).formatHours () << '\n';
|
||||
}
|
||||
|
||||
out << indent << "Total "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_available).formatHours () << '\n'
|
||||
<< '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
70
src/Chart.h
Normal file
70
src/Chart.h
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright 2019, Thomas Lauf, Paul Beckingham, Federico Hernandez.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights
|
||||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the Software is
|
||||
// furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included
|
||||
// in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
// SOFTWARE.
|
||||
//
|
||||
// https://www.opensource.org/licenses/mit-license.php
|
||||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef INCLUDED_CHART
|
||||
#define INCLUDED_CHART
|
||||
|
||||
#include <Composite.h>
|
||||
#include <Interval.h>
|
||||
#include <map>
|
||||
|
||||
class Chart
|
||||
{
|
||||
public:
|
||||
Chart() = default;
|
||||
|
||||
static void render (const Interval&, const std::vector <Interval>&, const std::vector <Range>&, const std::map <Datetime, std::string>&, const std::map <std::string, Color>&, const Color&, const Color&, const Color&, const Color&, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, int, int, int);
|
||||
|
||||
static unsigned long getIndentSize (bool, bool, bool, bool);
|
||||
|
||||
static std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&);
|
||||
|
||||
static std::string renderAxis (int, int, const Color&, const Color&, int, bool);
|
||||
|
||||
static std::string renderMonth (const Datetime&, const Datetime&);
|
||||
|
||||
static std::string renderWeek (const Datetime&, const Datetime&);
|
||||
|
||||
static std::string renderWeekday (Datetime&, const Color&);
|
||||
|
||||
static std::string renderDay (Datetime&, const Color&);
|
||||
|
||||
static Color getDayColor (const Datetime&, const Datetime&, const std::map <Datetime, std::string>&, const Color&, const Color&);
|
||||
|
||||
static std::string renderTotal (time_t);
|
||||
|
||||
static std::string renderSubTotal (time_t, const std::string&);
|
||||
|
||||
static void renderExclusionBlocks (std::vector<Composite>&, const Datetime&, int, int, const std::vector<Range>&, int, int, const Color&, const Color&, bool);
|
||||
|
||||
static void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, const std::map<std::string, Color>&, int, time_t&, bool, int, int);
|
||||
|
||||
static std::string renderHolidays (const std::map <Datetime, std::string>&);
|
||||
|
||||
static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -24,40 +24,20 @@
|
|||
//
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include <Composite.h>
|
||||
#include <Duration.h>
|
||||
#include <Range.h>
|
||||
#include <Chart.h>
|
||||
#include <commands.h>
|
||||
#include <timew.h>
|
||||
#include <shared.h>
|
||||
#include <format.h>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <cassert>
|
||||
|
||||
int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&);
|
||||
static std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&);
|
||||
static std::string renderAxis (int, int, const Color&, const Color&, int, bool);
|
||||
static std::string renderMonth (const Datetime&, const Datetime&);
|
||||
static std::string renderWeek (const Datetime&, const Datetime&);
|
||||
static std::string renderWeekday (Datetime&, const Color&);
|
||||
static std::string renderDay (Datetime&, const Color&);
|
||||
static std::string renderTotal (time_t);
|
||||
static std::string renderSubTotal (time_t, const std::string&);
|
||||
static void renderExclusionBlocks (std::vector<Composite>&, const Datetime&, int, int, const std::vector<Range>&, int, int, const Color&, const Color&, bool);
|
||||
static void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, const std::map<std::string, Color>&, int, time_t&, bool, int, int);
|
||||
std::string renderHolidays (const std::map <Datetime, std::string>&);
|
||||
|
||||
static void render (const Interval&, const std::vector <Interval>&, const std::vector <Range>&, const std::map <Datetime, std::string>&, const std::map <std::string, Color>&, const Color&, const Color&, const Color&, const Color&, bool, bool, bool, bool, bool,bool, bool, bool, bool, bool, bool, int, int, int);
|
||||
|
||||
static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool);
|
||||
|
||||
unsigned long getIndentSize (bool, bool, bool, bool);
|
||||
int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&);
|
||||
|
||||
std::map <Datetime, std::string> createHolidayMap (Rules&, Interval&);
|
||||
|
||||
static Color getDayColor (const Datetime&, const Datetime&, const std::map <Datetime, std::string>&, const Color&, const Color&);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
int CmdChartDay (
|
||||
const CLI& cli,
|
||||
|
|
@ -165,130 +145,11 @@ int renderChart (
|
|||
auto axis_type = rules.get ("reports." + type + ".axis");
|
||||
const auto with_internal_axis = axis_type == "internal";
|
||||
|
||||
render (filter, tracked, exclusions, holidays, tag_colors, color_today, color_holiday, color_label, color_exclusion, show_intervals, determine_hour_range, with_ids, with_summary, with_holidays, with_totals, with_month, with_week, with_day, with_weekday, with_internal_axis, minutes_per_char, spacing, num_lines);
|
||||
Chart::render (filter, tracked, exclusions, holidays, tag_colors, color_today, color_holiday, color_label, color_exclusion, show_intervals, determine_hour_range, with_ids, with_summary, with_holidays, with_totals, with_month, with_week, with_day, with_weekday, with_internal_axis, minutes_per_char, spacing, num_lines);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void render (
|
||||
const Interval& filter,
|
||||
const std::vector <Interval>& tracked,
|
||||
const std::vector <Range>& exclusions,
|
||||
const std::map <Datetime, std::string>& holidays,
|
||||
const std::map <std::string, Color>& tag_colors,
|
||||
const Color& color_today,
|
||||
const Color& color_holiday,
|
||||
const Color& color_label,
|
||||
const Color& color_exclusion,
|
||||
const bool show_intervals,
|
||||
const bool determine_hour_range,
|
||||
const bool with_ids,
|
||||
const bool with_summary,
|
||||
const bool with_holidays,
|
||||
const bool with_totals,
|
||||
const bool with_month,
|
||||
const bool with_week,
|
||||
const bool with_day,
|
||||
const bool with_weekday,
|
||||
const bool with_internal_axis,
|
||||
const int minutes_per_char,
|
||||
const int spacing,
|
||||
const int num_lines)
|
||||
{
|
||||
// Determine hours shown.
|
||||
auto hour_range = determine_hour_range
|
||||
? determineHourRange (filter, tracked)
|
||||
: std::make_pair (0, 23);
|
||||
|
||||
int first_hour = hour_range.first;
|
||||
int last_hour = hour_range.second;
|
||||
|
||||
debug (format ("Day range is from {1}:00 - {2}:00", first_hour, last_hour));
|
||||
|
||||
const auto chars_per_hour = 60 / minutes_per_char;
|
||||
const auto cell_size = chars_per_hour + spacing;
|
||||
|
||||
const auto indent_size = getIndentSize (with_month, with_week, with_day, with_weekday);
|
||||
const auto indent = std::string (indent_size, ' ');
|
||||
const auto padding_size = indent_size + ((last_hour - first_hour + 1) * (cell_size)) + 1;
|
||||
|
||||
std::cout << '\n';
|
||||
|
||||
// Render the axis.
|
||||
if (!with_internal_axis)
|
||||
{
|
||||
std::cout << indent
|
||||
<< renderAxis (
|
||||
first_hour,
|
||||
last_hour,
|
||||
color_label,
|
||||
color_today,
|
||||
cell_size,
|
||||
with_totals);
|
||||
}
|
||||
|
||||
// For rendering labels on edge detection.
|
||||
Datetime previous {0};
|
||||
|
||||
// Each day is rendered separately.
|
||||
time_t total_work = 0;
|
||||
|
||||
for (Datetime day = filter.start; day < filter.end; day++)
|
||||
{
|
||||
// Render the exclusion blocks.
|
||||
|
||||
// Add an empty string with no color, to reserve width, so this function
|
||||
// can simply concatenate to lines[i].str ().
|
||||
int total_width = (last_hour - first_hour + 1) * (cell_size) - 1;
|
||||
std::vector <Composite> lines (num_lines);
|
||||
for (int i = 0; i < num_lines; ++i)
|
||||
lines[i].add (std::string (total_width, ' '), 0, Color ());
|
||||
|
||||
renderExclusionBlocks (lines, day, first_hour, last_hour, exclusions, minutes_per_char, spacing, color_exclusion, color_label, with_internal_axis);
|
||||
|
||||
time_t work = 0;
|
||||
if (! show_intervals)
|
||||
{
|
||||
for (auto& track : tracked)
|
||||
{
|
||||
time_t interval_work = 0;
|
||||
renderInterval (lines, day, track, tag_colors, first_hour, interval_work, with_ids, minutes_per_char, spacing);
|
||||
work += interval_work;
|
||||
}
|
||||
}
|
||||
|
||||
auto now = Datetime ();
|
||||
auto color_day = getDayColor (day, now, holidays, color_today, color_holiday);
|
||||
|
||||
auto labelMonth = with_month ? renderMonth (previous, day) : "";
|
||||
auto labelWeek = with_week ? renderWeek (previous, day) : "";
|
||||
auto labelWeekday = with_weekday ? renderWeekday (day, color_day) : "";
|
||||
auto labelDay = with_day ? renderDay (day, color_day) : "";
|
||||
|
||||
std::cout << labelMonth
|
||||
<< labelWeek
|
||||
<< labelWeekday
|
||||
<< labelDay
|
||||
<< lines[0].str ();
|
||||
|
||||
if (lines.size () > 1)
|
||||
for (unsigned int i = 1; i < lines.size (); ++i)
|
||||
std::cout << "\n"
|
||||
<< indent
|
||||
<< lines[i].str ();
|
||||
|
||||
std::cout << (with_totals ? renderTotal (work) : "")
|
||||
<< '\n';
|
||||
|
||||
previous = day;
|
||||
total_work += work;
|
||||
}
|
||||
|
||||
std::cout << (with_totals ? renderSubTotal (total_work, std::string (padding_size, ' ')) : "")
|
||||
<< (with_holidays ? renderHolidays (holidays) : "")
|
||||
<< (with_summary ? renderSummary (indent, filter, exclusions, tracked, show_intervals) : "");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::map <Datetime, std::string> createHolidayMap (Rules &rules, Interval &filter)
|
||||
{
|
||||
|
|
@ -323,459 +184,3 @@ std::map <Datetime, std::string> createHolidayMap (Rules &rules, Interval &filte
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
unsigned long getIndentSize (
|
||||
const bool with_month,
|
||||
const bool with_week,
|
||||
const bool with_day,
|
||||
const bool with_weekday)
|
||||
{
|
||||
return (with_month ? 4 : 0) +
|
||||
(with_week ? 4 : 0) +
|
||||
(with_day ? 3 : 0) +
|
||||
(with_weekday ? 4 : 0);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Scan all tracked intervals, looking for the earliest and latest hour into
|
||||
// which an interval extends.
|
||||
static std::pair <int, int> determineHourRange (
|
||||
const Interval& filter,
|
||||
const std::vector <Interval>& tracked)
|
||||
{
|
||||
// Default to the full day.
|
||||
auto first_hour = 0;
|
||||
auto last_hour = 23;
|
||||
|
||||
// If there is no data,
|
||||
// show the whole day.
|
||||
if (! tracked.empty ())
|
||||
{
|
||||
// Get the extreme time range for the filtered data.
|
||||
first_hour = 23;
|
||||
last_hour = 0;
|
||||
|
||||
for (Datetime day = filter.start; day < filter.end; day++)
|
||||
{
|
||||
auto day_range = getFullDay (day);
|
||||
|
||||
for (auto& track : tracked)
|
||||
{
|
||||
if (day_range.overlaps (track))
|
||||
{
|
||||
Interval clipped = clip (track, day_range);
|
||||
if (track.is_open ())
|
||||
{
|
||||
clipped.end = Datetime ();
|
||||
}
|
||||
|
||||
if (clipped.start.hour () < first_hour)
|
||||
{
|
||||
first_hour = clipped.start.hour ();
|
||||
}
|
||||
|
||||
if (! clipped.is_open () && clipped.end.hour () > last_hour)
|
||||
{
|
||||
last_hour = clipped.end.hour ();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (first_hour == 23 && last_hour == 0)
|
||||
{
|
||||
first_hour = Datetime ().hour ();
|
||||
last_hour = std::min (first_hour + 1, 23);
|
||||
}
|
||||
else
|
||||
{
|
||||
first_hour = std::max (first_hour - 1, 0);
|
||||
last_hour = std::min (last_hour + 1, 23);
|
||||
}
|
||||
}
|
||||
|
||||
return std::make_pair (first_hour, last_hour);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderAxis (
|
||||
const int first_hour,
|
||||
const int last_hour,
|
||||
const Color &colorLabel,
|
||||
const Color &colorToday,
|
||||
const int cell_size,
|
||||
const bool with_totals)
|
||||
{
|
||||
std::stringstream out;
|
||||
auto current_hour = Datetime ().hour ();
|
||||
|
||||
for (int hour = first_hour; hour <= last_hour; hour++)
|
||||
{
|
||||
if (hour == current_hour)
|
||||
{
|
||||
out << colorToday.colorize (leftJustify (hour, cell_size));
|
||||
}
|
||||
else
|
||||
{
|
||||
out << colorLabel.colorize (leftJustify (hour, cell_size));
|
||||
}
|
||||
}
|
||||
|
||||
if (with_totals)
|
||||
{
|
||||
out << " " << colorLabel.colorize ("Total");
|
||||
}
|
||||
|
||||
out << '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderMonth (const Datetime &previous, const Datetime &day)
|
||||
{
|
||||
const auto show_month = previous.month () != day.month ();
|
||||
|
||||
std::stringstream out;
|
||||
|
||||
out << (show_month ? Datetime::monthNameShort (day.month ()) : " ")
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Includes trailing separator space.
|
||||
static std::string renderWeek (const Datetime &previous, const Datetime &day)
|
||||
{
|
||||
const auto show_week = previous.week () != day.week ();
|
||||
|
||||
std::stringstream out;
|
||||
|
||||
out << (show_week ? leftJustify (format ("W{1}", day.week ()), 3) : " ")
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Today should be highlighted.
|
||||
// Includes trailing separator space.
|
||||
static std::string renderWeekday (Datetime& day, const Color& color)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
out << color.colorize (Datetime::dayNameShort (day.dayOfWeek ()))
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderDay (Datetime& day, const Color& color)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
out << color.colorize (rightJustify (day.day (), 2))
|
||||
<< ' ';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
Color getDayColor (
|
||||
const Datetime& day,
|
||||
const Datetime& now,
|
||||
const std::map <Datetime, std::string>& holidays,
|
||||
const Color& colorToday,
|
||||
const Color& colorHoliday)
|
||||
{
|
||||
if (day.sameDay (now))
|
||||
{
|
||||
return colorToday;
|
||||
}
|
||||
|
||||
for (auto& entry : holidays)
|
||||
{
|
||||
if (day.sameDay (entry.first))
|
||||
{
|
||||
return colorHoliday;
|
||||
}
|
||||
}
|
||||
|
||||
return Color {};
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderTotal (time_t work)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
if (work)
|
||||
{
|
||||
int hours = work / 3600;
|
||||
int minutes = (work % 3600) / 60;
|
||||
std::cout << " "
|
||||
<< std::setw (3) << std::setfill (' ') << hours
|
||||
<< ':'
|
||||
<< std::setw (2) << std::setfill ('0') << minutes;
|
||||
}
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderSubTotal (
|
||||
time_t total_work,
|
||||
const std::string& padding)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
int hours = total_work / 3600;
|
||||
int minutes = (total_work % 3600) / 60;
|
||||
|
||||
out << padding
|
||||
<< Color ("underline").colorize (" ")
|
||||
<< '\n'
|
||||
<< padding
|
||||
<< std::setw (3) << std::setfill (' ') << hours
|
||||
<< ':'
|
||||
<< std::setw (2) << std::setfill ('0') << minutes
|
||||
<< '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
static void renderExclusionBlocks (
|
||||
std::vector <Composite>& lines,
|
||||
const Datetime& day,
|
||||
int first_hour,
|
||||
int last_hour,
|
||||
const std::vector <Range>& excluded,
|
||||
const int minutes_per_char,
|
||||
const int spacing,
|
||||
const Color& color_exclusion,
|
||||
const Color& color_label,
|
||||
const bool with_internal_axis)
|
||||
{
|
||||
const auto chars_per_hour = 60 / minutes_per_char;
|
||||
const auto cell_width = chars_per_hour + spacing;
|
||||
|
||||
// Render the exclusion blocks.
|
||||
for (int hour = first_hour; hour <= last_hour; hour++)
|
||||
{
|
||||
// Construct a range representing a single 'hour', of 'day'.
|
||||
Range r (Datetime (day.year (), day.month (), day.day (), hour, 0, 0),
|
||||
Datetime (day.year (), day.month (), day.day (), hour + 1, 0, 0));
|
||||
|
||||
if (with_internal_axis)
|
||||
{
|
||||
auto label = format ("{1}", hour);
|
||||
int offset = (hour - first_hour) * cell_width;
|
||||
lines[0].add (label, offset, color_label);
|
||||
}
|
||||
|
||||
for (auto& exc : excluded)
|
||||
{
|
||||
if (exc.overlaps (r))
|
||||
{
|
||||
// Determine which of the character blocks included.
|
||||
auto sub_hour = exc.intersect (r);
|
||||
auto start_block = quantizeToNMinutes (sub_hour.start.minute (), minutes_per_char) / minutes_per_char;
|
||||
auto end_block = quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), minutes_per_char) / minutes_per_char;
|
||||
|
||||
int offset = (hour - first_hour) * cell_width + start_block;
|
||||
int width = end_block - start_block;
|
||||
std::string block (width, ' ');
|
||||
|
||||
for (auto& line : lines)
|
||||
line.add (block, offset, color_exclusion);
|
||||
|
||||
if (with_internal_axis)
|
||||
{
|
||||
auto label = format ("{1}", hour);
|
||||
if (start_block == 0 &&
|
||||
width >= static_cast <int> (label.length ()))
|
||||
lines[0].add (label, offset, color_exclusion);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static void renderInterval (
|
||||
std::vector <Composite>& lines,
|
||||
const Datetime& day,
|
||||
const Interval& track,
|
||||
const std::map <std::string, Color>& tag_colors,
|
||||
const int first_hour,
|
||||
time_t& work,
|
||||
const bool with_ids,
|
||||
const int minutes_per_char,
|
||||
const int spacing)
|
||||
{
|
||||
Datetime now;
|
||||
|
||||
// Ignore any track that doesn't overlap with day.
|
||||
auto day_range = getFullDay (day);
|
||||
if (! day_range.overlaps (track) || (track.is_open () && day > now))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// If the track is open and day is today, then closed the track now, otherwise
|
||||
// it will be rendered until midnight.
|
||||
Interval clipped = clip (track, day_range);
|
||||
if (track.is_open ())
|
||||
{
|
||||
if (day_range.start.sameDay (now))
|
||||
{
|
||||
clipped.end = now;
|
||||
}
|
||||
else
|
||||
{
|
||||
clipped.end = day_range.end;
|
||||
}
|
||||
}
|
||||
|
||||
auto start_mins = (clipped.start.hour () - first_hour) * 60 + clipped.start.minute ();
|
||||
auto end_mins = (clipped.end.hour () - first_hour) * 60 + clipped.end.minute ();
|
||||
|
||||
if (clipped.end.hour () == 0)
|
||||
{
|
||||
end_mins += (clipped.end.day() + (clipped.end.month () - clipped.start.month () - 1) * clipped.start.day ()) * 24 * 60;
|
||||
}
|
||||
|
||||
work = clipped.total ();
|
||||
|
||||
auto start_block = quantizeToNMinutes (start_mins, minutes_per_char) / minutes_per_char;
|
||||
auto end_block = quantizeToNMinutes (end_mins == start_mins ? start_mins + 60 : end_mins, minutes_per_char) / minutes_per_char;
|
||||
|
||||
int start_offset = start_block + (spacing * (start_mins / 60));
|
||||
int end_offset = end_block + (spacing * (end_mins / 60));
|
||||
|
||||
if (end_offset > start_offset)
|
||||
{
|
||||
// Determine color of interval.
|
||||
Color colorTrack = intervalColor (track.tags (), tag_colors);
|
||||
|
||||
// Properly format the tags within the space.
|
||||
std::string label;
|
||||
if (with_ids)
|
||||
{
|
||||
label = format ("@{1}", track.id);
|
||||
}
|
||||
|
||||
for (auto& tag : track.tags ())
|
||||
{
|
||||
if (! label.empty ())
|
||||
{
|
||||
label += ' ';
|
||||
}
|
||||
|
||||
label += tag;
|
||||
}
|
||||
|
||||
auto width = end_offset - start_offset;
|
||||
if (width)
|
||||
{
|
||||
std::vector <std::string> text_lines;
|
||||
wrapText (text_lines, label, width, false);
|
||||
|
||||
for (unsigned int i = 0; i < lines.size (); ++i)
|
||||
{
|
||||
if (i < text_lines.size ())
|
||||
{
|
||||
lines[i].add (leftJustify (text_lines[i], width), start_offset, colorTrack);
|
||||
}
|
||||
else
|
||||
{
|
||||
lines[i].add (std::string (width, ' '), start_offset, colorTrack);
|
||||
}
|
||||
}
|
||||
|
||||
// An open interval gets a "+" in the bottom right corner
|
||||
if (track.is_open ())
|
||||
{
|
||||
lines.back ().add ("+", start_offset + width - 1, colorTrack);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string renderHolidays (const std::map <Datetime, std::string>& holidays)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
for (auto& entry : holidays)
|
||||
{
|
||||
out << entry.first.toString ("Y-M-D")
|
||||
<< " "
|
||||
<< entry.second
|
||||
<< '\n';
|
||||
}
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
static std::string renderSummary (
|
||||
const std::string& indent,
|
||||
const Interval& filter,
|
||||
const std::vector <Range>& exclusions,
|
||||
const std::vector <Interval>& tracked,
|
||||
bool blank)
|
||||
{
|
||||
std::stringstream out;
|
||||
time_t total_unavailable = 0;
|
||||
|
||||
for (auto& exclusion : exclusions)
|
||||
{
|
||||
if (filter.overlaps (exclusion))
|
||||
{
|
||||
total_unavailable += filter.intersect (exclusion).total ();
|
||||
}
|
||||
}
|
||||
|
||||
time_t total_worked = 0;
|
||||
|
||||
if (! blank)
|
||||
{
|
||||
for (auto& interval : tracked)
|
||||
{
|
||||
if (filter.overlaps (interval))
|
||||
{
|
||||
Interval clipped = clip (interval, filter);
|
||||
if (interval.is_open ())
|
||||
{
|
||||
clipped.end = Datetime ();
|
||||
}
|
||||
|
||||
total_worked += clipped.total ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
auto total_available = filter.total () - total_unavailable;
|
||||
assert (total_available >= 0);
|
||||
auto total_remaining = total_available - total_worked;
|
||||
|
||||
out << '\n'
|
||||
<< indent << "Tracked "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_worked).formatHours () << '\n';
|
||||
|
||||
if (total_remaining >= 0)
|
||||
{
|
||||
out << indent << "Available "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_remaining).formatHours () << '\n';
|
||||
}
|
||||
|
||||
out << indent << "Total "
|
||||
<< std::setw (13) << std::setfill (' ') << Duration (total_available).formatHours () << '\n'
|
||||
<< '\n';
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -189,3 +189,19 @@ int CmdSummary (
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
std::string renderHolidays (const std::map<Datetime, std::string> &holidays)
|
||||
{
|
||||
std::stringstream out;
|
||||
|
||||
for (auto &entry : holidays)
|
||||
{
|
||||
out << entry.first.toString ("Y-M-D")
|
||||
<< " "
|
||||
<< entry.second
|
||||
<< '\n';
|
||||
}
|
||||
|
||||
return out.str ();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue