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

CmdStart: Stop previous interval at given start time

Browse source 
- End time of previous open interval now set to start time given on
  cmd line in CmdStart.
This commit is contained in:
Michael Meier 2016-07-03 12:39:56 +02:00 • committed by Paul Beckingham
parent 3be4e442bf
commit 07e777b62c
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/commands/CmdStart.cpp
View file

@ -45,8 +45,11 @@ int CmdStart (
auto latest = getLatestInterval (database); auto latest = getLatestInterval (database);
if (latest.range.is_open ()) if (latest.range.is_open ())
{ {
// Stop it. // Stop it, at the given start time, if applicable.
Interval modified {latest}; Interval modified {latest};
if (filter.range.start.toEpoch () != 0)
modified.range.end = filter.range.start;
else
modified.range.end = Datetime (); modified.range.end = Datetime ();
// Update database. // Update database.

10
test/start.t
View file

@ -79,6 +79,16 @@ class TestStart(TestCase):
self.assertIn("Recorded foo", out) self.assertIn("Recorded foo", out)
self.assertIn("Tracking bar", out) self.assertIn("Tracking bar", out)
def test_start_with_open_interval_timed(self):
"""Test timed start with already open interval, which should be auto-stopped
at given datetime"""
self.t("start 2016-01-01T00:00:00 foo")
code, out, err = self.t("start 2016-01-01T01:00:00 bar")
self.assertIn("Recorded foo", out)
self.assertIn("Tracking bar", out)
self.assertIn("Ended 01:00:00",out)
if __name__ == "__main__": if __name__ == "__main__":
from simpletap import TAPTestRunner from simpletap import TAPTestRunner
unittest.main(testRunner=TAPTestRunner()) unittest.main(testRunner=TAPTestRunner())