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

TI-102: Fix interval flattening in CmdStart

Browse source 
- set correct range for exclusion retrieval
- report on added intervals not on entered
This commit is contained in:
Thomas Lauf 2018-01-19 15:32:21 +01:00
parent 238456aa0d
commit 986041dcba
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/commands/CmdStart.cpp
View file

@ -24,10 +24,8 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <cmake.h>
#include <commands.h>
#include <timew.h>
#include <Interval.h>
#include <iostream>
////////////////////////////////////////////////////////////////////////////////
@ -37,12 +35,10 @@ int CmdStart (
Database& database)
{
// Add a new open interval, which may have a defined start time.
auto filter = getFilter (cli);
auto holidays = subset (filter.range, getHolidays (rules));
auto exclusions = getAllExclusions (rules, filter.range);
auto filter = getFilter (cli);
auto latest = getLatestInterval (database);
// If the latest interval is open, close it.
auto latest = getLatestInterval (database);
if (latest.range.is_open ())
{
// If the new interval tags match those of the currently open interval, then
@ -64,13 +60,15 @@ int CmdStart (
// Update database.
database.deleteInterval (latest);
for (auto& interval : flatten (modified, exclusions))
validate (cli, rules, database, modified);
for (auto& interval : flatten (modified, getAllExclusions (rules, modified.range)))
{
database.addInterval (interval);
}
if (rules.getBoolean ("verbose"))
std::cout << intervalSummarize (database, rules, modified);
if (rules.getBoolean ("verbose"))
std::cout << intervalSummarize (database, rules, interval);
}
}
// Now add the new open interval.