From 0cacc2a7e457d3a07fd60724751f5efc8203299f Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 15 Mar 2009 12:42:03 +0000
Subject: [PATCH] test and bugfix for multi-day timelog session splitting

---
 Ledger/TimeLog.hs | 12 ++++++++++--
 NOTES             |  1 -
 Tests.hs          | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/Ledger/TimeLog.hs b/Ledger/TimeLog.hs
index 7900c4338..bc72e11a0 100644
--- a/Ledger/TimeLog.hs
+++ b/Ledger/TimeLog.hs
@@ -23,10 +23,18 @@ instance Show TimeLog where
 
 -- | Convert time log entries to ledger entries. When there is no
 -- clockout, add one with the provided current time. Sessions crossing
--- midnight are split to give accurate per-day totals.
+-- midnight are split into days to give accurate per-day totals.
 entriesFromTimeLogEntries :: LocalTime -> [TimeLogEntry] -> [Entry]
 entriesFromTimeLogEntries _ [] = []
-entriesFromTimeLogEntries t [i] = [entryFromTimeLogInOut i (TimeLogEntry 'o' t "")]
+entriesFromTimeLogEntries t [i]
+    | odate > idate = [entryFromTimeLogInOut i o'] ++ entriesFromTimeLogEntries t [i',o]
+    | otherwise = [entryFromTimeLogInOut i o]
+    where
+      o = TimeLogEntry 'o' t ""
+      (itime,otime) = (tldatetime i,tldatetime o)
+      (idate,odate) = (localDay itime,localDay otime)
+      o' = o{tldatetime=itime{localDay=idate, localTimeOfDay=TimeOfDay 23 59 59}}
+      i' = i{tldatetime=itime{localDay=addDays 1 idate, localTimeOfDay=midnight}}
 entriesFromTimeLogEntries t (i:o:rest)
     | odate > idate = [entryFromTimeLogInOut i o'] ++ entriesFromTimeLogEntries t (i':o:rest)
     | otherwise = [entryFromTimeLogInOut i o] ++ entriesFromTimeLogEntries t rest
diff --git a/NOTES b/NOTES
index 8c70ea141..103c64b7b 100644
--- a/NOTES
+++ b/NOTES
@@ -10,7 +10,6 @@ clever tricks like the plague." --Edsger Dijkstra
 
 * to do
 ** errors
-*** timelog report for today with no entries ignores an open session from yesterday
 *** not catching some unbalanced entries, two ways:
 **** 1
 1/1 test1
diff --git a/Tests.hs b/Tests.hs
index 850ede982..d30b078d9 100644
--- a/Tests.hs
+++ b/Tests.hs
@@ -5,6 +5,8 @@
 module Tests
 where
 import qualified Data.Map as Map
+import Data.Time.Format
+import System.Locale (defaultTimeLocale)
 import Text.ParserCombinators.Parsec
 import Test.HUnit
 import Test.HUnit.Tools (assertRaises, runVerboseTests)
@@ -294,6 +296,20 @@ tests = [
     [Period "in 2008"] `gives` "DateSpan (Just 2008-01-01) (Just 2009-01-01)"
     [Begin "2005", End "2007",Period "in 2008"] `gives` "DateSpan (Just 2008-01-01) (Just 2009-01-01)"
 
+  ,"entriesFromTimeLogEntries" ~: do
+     today <- getCurrentDay
+     let
+         clockin t a = TimeLogEntry 'i' t a
+         clockout t = TimeLogEntry 'o' t ""
+         yesterday = prevday today
+         mktime d s = LocalTime d $ fromMaybe midnight $ parseTime defaultTimeLocale "%H:%M:%S" s
+         noon = LocalTime today midday
+         ts `gives` ss = (map edescription $ entriesFromTimeLogEntries noon ts) `is` ss
+     [] `gives` []
+     [clockin (mktime today "00:00:00") ""] `gives` ["00:00-12:00"]
+     [clockin (mktime yesterday "23:00:00") ""] `gives` ["23:00-23:59","00:00-12:00"]
+     [clockin (mktime (addDays (-2) today) "23:00:00") ""] `gives` ["23:00-23:59","00:00-23:59","00:00-12:00"]
+
   ,"expandAccountNames" ~: do
     expandAccountNames ["assets:cash","assets:checking","expenses:vacation"] `is`
      ["assets","assets:cash","assets:checking","expenses","expenses:vacation"]