Code Cleanup
- Consistent scheme for printing project change information: always shows the progress estimation and add a notification that the project has changed if the number of tasks is changed.
This commit is contained in:
committed by
Paul Beckingham
parent
7f1d8c3682
commit
1668aef66b
@@ -85,7 +85,7 @@ int CmdAnnotate::execute (std::string& output)
|
|||||||
++count;
|
++count;
|
||||||
feedback_affected (STRING_CMD_ANNO_TASK, *task);
|
feedback_affected (STRING_CMD_ANNO_TASK, *task);
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
context.footnote (onProjectChange (*task, true));
|
context.footnote (onProjectChange (*task, false));
|
||||||
|
|
||||||
// Annotate siblings.
|
// Annotate siblings.
|
||||||
if (task->has ("parent"))
|
if (task->has ("parent"))
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ int CmdAppend::execute (std::string& output)
|
|||||||
++count;
|
++count;
|
||||||
feedback_affected (STRING_CMD_APPEND_TASK, *task);
|
feedback_affected (STRING_CMD_APPEND_TASK, *task);
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
projectChanges[task->get ("project")] = onProjectChange (*task, true);
|
projectChanges[task->get ("project")] = onProjectChange (*task, false);
|
||||||
|
|
||||||
// Append to siblings.
|
// Append to siblings.
|
||||||
if (task->has ("parent"))
|
if (task->has ("parent"))
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ int CmdDelete::execute (std::string& output)
|
|||||||
feedback_unblocked (*task);
|
feedback_unblocked (*task);
|
||||||
dependencyChainOnComplete (*task);
|
dependencyChainOnComplete (*task);
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
projectChanges[task->get ("project")] = onProjectChange (*task, true);
|
projectChanges[task->get ("project")] = onProjectChange (*task);
|
||||||
|
|
||||||
// Delete siblings.
|
// Delete siblings.
|
||||||
if (task->has ("parent"))
|
if (task->has ("parent"))
|
||||||
|
|||||||
@@ -121,6 +121,8 @@ int CmdDenotate::execute (std::string& output)
|
|||||||
++count;
|
++count;
|
||||||
context.tdb2.modify (*task);
|
context.tdb2.modify (*task);
|
||||||
feedback_affected (format (STRING_CMD_DENO_FOUND, anno));
|
feedback_affected (format (STRING_CMD_DENO_FOUND, anno));
|
||||||
|
if (context.verbose ("project"))
|
||||||
|
context.footnote (onProjectChange (*task, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ int CmdDone::execute (std::string& output)
|
|||||||
nagged = nag (*task);
|
nagged = nag (*task);
|
||||||
dependencyChainOnComplete (*task);
|
dependencyChainOnComplete (*task);
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
projectChanges[task->get ("project")] = onProjectChange (*task, false);
|
projectChanges[task->get ("project")] = onProjectChange (*task);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ int CmdDuplicate::execute (std::string& output)
|
|||||||
std::cout << format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
|
std::cout << format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
|
||||||
|
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
projectChanges[task->get ("project")] = onProjectChange (*task, false);
|
projectChanges[task->get ("project")] = onProjectChange (*task);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ int CmdPrepend::execute (std::string& output)
|
|||||||
++count;
|
++count;
|
||||||
feedback_affected (STRING_CMD_PREPEND_TASK, *task);
|
feedback_affected (STRING_CMD_PREPEND_TASK, *task);
|
||||||
if (context.verbose ("project"))
|
if (context.verbose ("project"))
|
||||||
projectChanges[task->get ("project")] = onProjectChange (*task, true);
|
projectChanges[task->get ("project")] = onProjectChange (*task, false);
|
||||||
|
|
||||||
// Prepend to siblings.
|
// Prepend to siblings.
|
||||||
if (task->has ("parent"))
|
if (task->has ("parent"))
|
||||||
|
|||||||
@@ -459,7 +459,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
|
|||||||
std::string onProjectChange (Task& task1, Task& task2)
|
std::string onProjectChange (Task& task1, Task& task2)
|
||||||
{
|
{
|
||||||
if (task1.get ("project") == task2.get ("project"))
|
if (task1.get ("project") == task2.get ("project"))
|
||||||
return onProjectChange (task1);
|
return onProjectChange (task1, false);
|
||||||
|
|
||||||
std::string messages1 = onProjectChange (task1);
|
std::string messages1 = onProjectChange (task1);
|
||||||
std::string messages2 = onProjectChange (task2);
|
std::string messages2 = onProjectChange (task2);
|
||||||
|
|||||||
Reference in New Issue
Block a user