mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
- Integrated Damian Glenny's changes
This commit is contained in:
Paul Beckingham
parent
c393d47cdf
commit
d1ef0d17d5
1 changed files with 134 additions and 63 deletions
197
src/task.cpp
197
src/task.cpp
|
|
@ -240,7 +240,6 @@ int main (int argc, char** argv)
|
||||||
std::vector <std::string> args;
|
std::vector <std::string> args;
|
||||||
for (int i = 1; i < argc; ++i)
|
for (int i = 1; i < argc; ++i)
|
||||||
args.push_back (argv[i]);
|
args.push_back (argv[i]);
|
||||||
|
|
||||||
std::string command;
|
std::string command;
|
||||||
T task;
|
T task;
|
||||||
parse (args, command, task, conf);
|
parse (args, command, task, conf);
|
||||||
|
|
@ -382,7 +381,6 @@ void handleTags (const TDB& tdb, T& task, Config& conf)
|
||||||
else
|
else
|
||||||
std::cout << "No tags."
|
std::cout << "No tags."
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
@ -1387,7 +1385,7 @@ void handleReportSummary (const TDB& tdb, T& task, Config& conf)
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// A summary of the most important pending tasks.
|
// A summary of the most important pending tasks.
|
||||||
//
|
//
|
||||||
// For every project, pull important tasks to present as an 'immediate' task
|
// For every project, pull important tasks to present as an 'immediate' task
|
||||||
// list. This hides the overwhelming quantity of other tasks.
|
// list. This hides the overwhelming quantity of other tasks.
|
||||||
//
|
//
|
||||||
// Present at most three tasks for every project. Select the tasks using
|
// Present at most three tasks for every project. Select the tasks using
|
||||||
|
|
@ -1607,7 +1605,7 @@ time_t monthlyEpoch (const std::string& date)
|
||||||
time_t epoch;
|
time_t epoch;
|
||||||
d2.toEpoch (epoch);
|
d2.toEpoch (epoch);
|
||||||
return epoch;
|
return epoch;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -1839,73 +1837,122 @@ void handleReportUsage (const TDB& tdb, T& task, Config& conf)
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
std::string renderMonth (
|
std::string renderMonths (
|
||||||
int month,
|
int firstMonth,
|
||||||
int year,
|
int firstYear,
|
||||||
const Date& today,
|
const Date& today,
|
||||||
std::vector <T>& all,
|
std::vector <T>& all,
|
||||||
Config& conf)
|
Config& conf)
|
||||||
{
|
{
|
||||||
Table table;
|
Table table;
|
||||||
table.setDateFormat (conf.get ("dateformat", "m/d/Y"));
|
table.setDateFormat (conf.get ("dateformat", "m/d/Y"));
|
||||||
table.addColumn (" ");
|
int monthsPerLine = (conf.get ("monthsperline", 1));
|
||||||
table.addColumn ("Su");
|
|
||||||
table.addColumn ("Mo");
|
|
||||||
table.addColumn ("Tu");
|
|
||||||
table.addColumn ("We");
|
|
||||||
table.addColumn ("Th");
|
|
||||||
table.addColumn ("Fr");
|
|
||||||
table.addColumn ("Sa");
|
|
||||||
|
|
||||||
table.setColumnUnderline (1);
|
// Build table for the number of months to be displayed.
|
||||||
table.setColumnUnderline (2);
|
for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
|
||||||
table.setColumnUnderline (3);
|
|
||||||
table.setColumnUnderline (4);
|
|
||||||
table.setColumnUnderline (5);
|
|
||||||
table.setColumnUnderline (6);
|
|
||||||
table.setColumnUnderline (7);
|
|
||||||
|
|
||||||
table.setColumnJustification (0, Table::right);
|
|
||||||
table.setColumnJustification (1, Table::right);
|
|
||||||
table.setColumnJustification (2, Table::right);
|
|
||||||
table.setColumnJustification (3, Table::right);
|
|
||||||
table.setColumnJustification (4, Table::right);
|
|
||||||
table.setColumnJustification (5, Table::right);
|
|
||||||
table.setColumnJustification (6, Table::right);
|
|
||||||
table.setColumnJustification (7, Table::right);
|
|
||||||
|
|
||||||
int days = Date::daysInMonth (month, year);
|
|
||||||
int row = table.addRow ();
|
|
||||||
for (int d = 1; d <= days; ++d)
|
|
||||||
{
|
{
|
||||||
Date temp (month, d, year);
|
table.addColumn (" ");
|
||||||
int dow = temp.dayOfWeek ();
|
table.addColumn ("Su");
|
||||||
|
table.addColumn ("Mo");
|
||||||
|
table.addColumn ("Tu");
|
||||||
|
table.addColumn ("We");
|
||||||
|
table.addColumn ("Th");
|
||||||
|
table.addColumn ("Fr");
|
||||||
|
table.addColumn ("Sa");
|
||||||
|
|
||||||
table.addCell (row, dow + 1, d);
|
table.setColumnUnderline (i + 1);
|
||||||
|
table.setColumnUnderline (i + 2);
|
||||||
|
table.setColumnUnderline (i + 3);
|
||||||
|
table.setColumnUnderline (i + 4);
|
||||||
|
table.setColumnUnderline (i + 5);
|
||||||
|
table.setColumnUnderline (i + 6);
|
||||||
|
table.setColumnUnderline (i + 7);
|
||||||
|
|
||||||
if (conf.get ("color", true) &&
|
table.setColumnJustification (i + 0, Table::right);
|
||||||
today.day () == d &&
|
table.setColumnJustification (i + 1, Table::right);
|
||||||
today.month () == month &&
|
table.setColumnJustification (i + 2, Table::right);
|
||||||
today.year () == year)
|
table.setColumnJustification (i + 3, Table::right);
|
||||||
table.setCellFg (row, dow + 1, Text::cyan);
|
table.setColumnJustification (i + 4, Table::right);
|
||||||
|
table.setColumnJustification (i + 5, Table::right);
|
||||||
|
table.setColumnJustification (i + 6, Table::right);
|
||||||
|
table.setColumnJustification (i + 7, Table::right);
|
||||||
|
}
|
||||||
|
|
||||||
std::vector <T>::iterator it;
|
// Set number of days per month, months to render, and years to render.
|
||||||
for (it = all.begin (); it != all.end (); ++it)
|
std::vector<int> years;
|
||||||
|
std::vector<int> months;
|
||||||
|
std::vector<int> daysInMonth;
|
||||||
|
int thisYear = firstYear;
|
||||||
|
int thisMonth = firstMonth;
|
||||||
|
for (int i = 0 ; i < monthsPerLine ; i++)
|
||||||
|
{
|
||||||
|
if (thisMonth < 13)
|
||||||
{
|
{
|
||||||
Date due (::atoi (it->getAttribute ("due").c_str ()));
|
years.push_back (thisYear);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
thisMonth -= 12;
|
||||||
|
years.push_back (++thisYear);
|
||||||
|
}
|
||||||
|
months.push_back (thisMonth);
|
||||||
|
daysInMonth.push_back (Date::daysInMonth (thisMonth++, thisYear));
|
||||||
|
}
|
||||||
|
|
||||||
|
int row = table.addRow ();
|
||||||
|
|
||||||
|
// Loop through months to be added on this line.
|
||||||
|
for (int c = 0 ; c < monthsPerLine ; c++)
|
||||||
|
{
|
||||||
|
// Reset row counter for subsequent months
|
||||||
|
if (c != 0)
|
||||||
|
row = 0;
|
||||||
|
|
||||||
|
// Loop through days in month and add to table.
|
||||||
|
for (int d = 1; d <= daysInMonth.at (c); ++d)
|
||||||
|
{
|
||||||
|
Date temp (months.at (c), d, years.at (c));
|
||||||
|
int dow = temp.dayOfWeek ();
|
||||||
|
int thisCol = dow + 1 + (8 * c);
|
||||||
|
|
||||||
|
table.addCell (row, thisCol, d);
|
||||||
|
|
||||||
if (conf.get ("color", true) &&
|
if (conf.get ("color", true) &&
|
||||||
due.day () == d &&
|
today.day () == d &&
|
||||||
due.month () == month &&
|
today.month () == months.at (c) &&
|
||||||
due.year () == year)
|
today.year () == years.at (c))
|
||||||
|
table.setCellFg (row, thisCol, Text::cyan);
|
||||||
|
|
||||||
|
std::vector <T>::iterator it;
|
||||||
|
for (it = all.begin (); it != all.end (); ++it)
|
||||||
{
|
{
|
||||||
table.setCellFg (row, dow + 1, Text::black);
|
Date due (::atoi (it->getAttribute ("due").c_str ()));
|
||||||
table.setCellBg (row, dow + 1, due < today ? Text::on_red : Text::on_yellow);
|
|
||||||
|
if (conf.get ("color", true) &&
|
||||||
|
due.day () == d &&
|
||||||
|
due.month () == months.at (c) &&
|
||||||
|
due.year () == years.at (c))
|
||||||
|
{
|
||||||
|
table.setCellFg (row, thisCol, Text::black);
|
||||||
|
table.setCellBg (row, thisCol, due < today ? Text::on_red : Text::on_yellow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for end of week, and...
|
||||||
|
if (dow == 6 && d < daysInMonth.at (c))
|
||||||
|
{
|
||||||
|
// ... Add a row if required, or...
|
||||||
|
if (c == 0)
|
||||||
|
{
|
||||||
|
row = table.addRow ();
|
||||||
|
}
|
||||||
|
// ... Reuse existing row.
|
||||||
|
else
|
||||||
|
{
|
||||||
|
row++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dow == 6 && d < days)
|
|
||||||
row = table.addRow ();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return table.render ();
|
return table.render ();
|
||||||
|
|
@ -1943,19 +1990,42 @@ void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
|
||||||
|
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
std::string output;
|
std::string output;
|
||||||
|
|
||||||
|
int monthsPerLine = (conf.get ("monthsperline", 1));
|
||||||
|
|
||||||
while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
|
while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
|
||||||
{
|
{
|
||||||
std::cout << Date::monthName (mFrom)
|
int nextM = mFrom;
|
||||||
<< " "
|
int nextY = yFrom;
|
||||||
<< yFrom
|
|
||||||
|
// Print month headers (cheating on the width settings, yes)
|
||||||
|
for (int i = 0 ; i < monthsPerLine ; i++)
|
||||||
|
{
|
||||||
|
std::string month = Date::monthName (nextM);
|
||||||
|
std::cout << month
|
||||||
|
<< " "
|
||||||
|
<< std::setw(23 // one month's output width
|
||||||
|
- month.length ()// month name length
|
||||||
|
- 1)// spacer character
|
||||||
|
<< std::left
|
||||||
|
<< nextY;
|
||||||
|
|
||||||
|
if (++nextM > 12)
|
||||||
|
{
|
||||||
|
nextM = 1;
|
||||||
|
nextY++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::cout << std::endl
|
||||||
<< optionalBlankLine (conf)
|
<< optionalBlankLine (conf)
|
||||||
<< optionalBlankLine (conf)
|
<< renderMonths (mFrom, yFrom, today, pending, conf)
|
||||||
<< renderMonth (mFrom, yFrom, today, pending, conf)
|
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
|
||||||
if (++mFrom == 13)
|
mFrom += monthsPerLine;
|
||||||
|
if (mFrom > 12)
|
||||||
{
|
{
|
||||||
mFrom = 1;
|
mFrom -= 12;
|
||||||
++yFrom;
|
++yFrom;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2265,7 +2335,9 @@ void handleReportStats (const TDB& tdb, T& task, Config& conf)
|
||||||
std::cout << "Task deleted every " << formatSeconds ((latest - earliest) / deletedT) << std::endl;
|
std::cout << "Task deleted every " << formatSeconds ((latest - earliest) / deletedT) << std::endl;
|
||||||
|
|
||||||
if (pendingT || completedT)
|
if (pendingT || completedT)
|
||||||
std::cout << "Average time pending " << formatSeconds ((int) ((daysPending / (pendingT + completedT)) * 86400)) << std::endl;
|
std::cout << "Average time pending "
|
||||||
|
<< formatSeconds ((int) ((daysPending / (pendingT + completedT)) * 86400))
|
||||||
|
<< std::endl;
|
||||||
|
|
||||||
if (totalT)
|
if (totalT)
|
||||||
{
|
{
|
||||||
|
|
@ -2821,4 +2893,3 @@ void nag (const TDB& tdb, T& task, Config& conf)
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue