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

Portability: Updated to make main re-entrant()

Browse source 
- New INSTALL instructions to emscripten, and AUTHORS for contribution.
This commit is contained in:
Mark Scannell 2018-01-31 19:45:07 -05:00 • committed by Paul Beckingham
parent cae3f06b7d
commit 7af6db4c17
112 changed files with 960 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/CmdTimesheet.cpp
View file

@ -37,8 +37,6 @@
#include <util.h>
#include <format.h>
extern Context context;
////////////////////////////////////////////////////////////////////////////////
CmdTimesheet::CmdTimesheet ()
{
@ -62,7 +60,7 @@ int CmdTimesheet::execute (std::string& output)
// Detect a filter.
bool hasFilter {false};
for (auto& a : context.cli2._args)
for (auto& a : Context::getContext ().cli2._args)
{
if (a.hasTag ("FILTER"))
{
@ -73,10 +71,10 @@ int CmdTimesheet::execute (std::string& output)
if (! hasFilter)
{
auto defaultFilter = context.config.get ("report.timesheet.filter");
auto defaultFilter = Context::getContext ().config.get ("report.timesheet.filter");
if (defaultFilter == "")
defaultFilter = "(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)";
context.cli2.addFilter (defaultFilter);
Context::getContext ().cli2.addFilter (defaultFilter);
}
// Apply filter to get a set of tasks.
@ -115,8 +113,8 @@ int CmdTimesheet::execute (std::string& output)
// Render the completed table.
Table table;
table.width (context.getWidth ());
if (context.config.getBoolean ("obfuscate"))
table.width (Context::getContext ().getWidth ());
if (Context::getContext ().config.getBoolean ("obfuscate"))
table.obfuscate ();
table.add ("Wk");
table.add ("Date");
@ -127,7 +125,7 @@ int CmdTimesheet::execute (std::string& output)
table.add ("Task");
setHeaderUnderline (table);
auto dateformat = context.config.get ("dateformat");
auto dateformat = Context::getContext ().config.get ("dateformat");
int previous_week = -1;
std::string previous_date = "";
@ -189,7 +187,7 @@ int CmdTimesheet::execute (std::string& output)
<< table.render ()
<< '\n';
if (context.verbose ("affected"))
if (Context::getContext ().verbose ("affected"))
out << format ("{1} completed, {2} started.", num_completed, num_started)
<< '\n';