GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Added coloring of dates with scheduled tasks

Browse source 
Color can be changed using color.calendar.scheduled
This commit is contained in:
sebu06 2021-07-18 19:03:26 +02:00 • committed by Tomas Babej
parent 90bc7f4b23
commit 3d61966831
4 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/Context.cpp
View file

@ -227,6 +227,7 @@ std::string configurationDefaults =
"color.calendar.due.today=color15 on color1\n"
"color.calendar.due=color0 on color1\n"
"color.calendar.holiday=color0 on color11\n"
"color.calendar.scheduled=rgb013 on color15\n"
"color.calendar.overdue=color0 on color9\n"
"color.calendar.today=color15 on rgb013\n"
"color.calendar.weekend=on color235\n"

61
src/commands/CmdCalendar.cpp
View file

@ -290,6 +290,7 @@ int CmdCalendar::execute (std::string& output)
Color color_overdue (config.get ("color.calendar.overdue"));
Color color_weekend (config.get ("color.calendar.weekend"));
Color color_holiday (config.get ("color.calendar.holiday"));
Color color_scheduled (config.get ("color.calendar.scheduled"));
Color color_weeknumber (config.get ("color.calendar.weeknumber"));
if (Context::getContext ().color () && config.getBoolean ("calendar.legend"))
@ -307,6 +308,8 @@ int CmdCalendar::execute (std::string& output)
<< color_duetoday.colorize ("due-today")
<< ", "
<< color_overdue.colorize ("overdue")
<< ", "
<< color_scheduled.colorize ("scheduled")
<< ", ";
// If colorizing holidays, print legend
@ -528,6 +531,7 @@ std::string CmdCalendar::renderMonths (
Color color_overdue (config.get ("color.calendar.overdue"));
Color color_weekend (config.get ("color.calendar.weekend"));
Color color_holiday (config.get ("color.calendar.holiday"));
Color color_scheduled (config.get ("color.calendar.scheduled"));
Color color_weeknumber (config.get ("color.calendar.weeknumber"));
// Loop through months to be added on this line.
@ -573,7 +577,7 @@ std::string CmdCalendar::renderMonths (
if (config.get ("calendar.holidays") != "none")
{
auto dateFormat = config.get ("dateformat.holiday");
for (auto& hol : config)
for (auto& hol : config)
{
if (hol.first.substr (0, 8) == "holiday.")
{
@ -603,40 +607,55 @@ std::string CmdCalendar::renderMonths (
if (today.sameDay (date))
cellColor.blend (color_today);
// colorize due tasks
// colorize due and scheduled tasks
if (config.get ("calendar.details") != "none")
{
config.set ("due", 0);
config.set ("scheduled", 0);
// if a date has a task that is due on that day, the due color
// takes precedence over the scheduled color
bool coloredWithDue = false;
for (auto& task : all)
{
auto status = task.getStatus ();
if ((status == Task::pending ||
status == Task::waiting ) &&
!task.hasTag ("nocal") &&
task.has ("due"))
!task.hasTag ("nocal"))
{
std::string due = task.get ("due");
Datetime duedmy (strtol (due.c_str(), nullptr, 10));
if(task.has("scheduled") && !coloredWithDue) {
std::string scheduled = task.get ("scheduled");
Datetime scheduleddmy (strtol (scheduled.c_str(), nullptr, 10));
if (duedmy.sameDay (date))
{
switch (task.getDateState ("due"))
if (scheduleddmy.sameDay (date))
{
case Task::dateNotDue:
break;
cellColor.blend(color_scheduled);
}
}
if(task.has("due")) {
std::string due = task.get ("due");
Datetime duedmy (strtol (due.c_str(), nullptr, 10));
case Task::dateAfterToday:
cellColor.blend (color_due);
break;
if (duedmy.sameDay (date))
{
coloredWithDue = true;
switch (task.getDateState ("due"))
{
case Task::dateNotDue:
break;
case Task::dateLaterToday:
cellColor.blend (color_duetoday);
break;
case Task::dateAfterToday:
cellColor.blend (color_due);
break;
case Task::dateEarlierToday:
case Task::dateBeforeToday:
cellColor.blend (color_overdue);
break;
case Task::dateLaterToday:
cellColor.blend (color_duetoday);
break;
case Task::dateEarlierToday:
case Task::dateBeforeToday:
cellColor.blend (color_overdue);
break;
}
}
}
}

1
src/commands/CmdShow.cpp
View file

@ -98,6 +98,7 @@ int CmdShow::execute (std::string& output)
" color.calendar.due"
" color.calendar.due.today"
" color.calendar.holiday"
" color.calendar.scheduled"
" color.calendar.overdue"
" color.calendar.today"
" color.calendar.weekend"