List PROJECT column with worktime --more (#57)

soywod · Dec 13, 2022 · d118e0e · d118e0e
1 parent efacf65
commit d118e0e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.5] - 2022-12-13
+
+- Also list PROJECT column with `worktime --more`
+
 ## [1.0.4] - 2021-07-08
 
 ### Added

diff --git a/lib/Unfog/Procedure/Handler.hs b/lib/Unfog/Procedure/Handler.hs
@@ -7,7 +7,7 @@ import Unfog.Response
 import qualified Unfog.State as State
 
 showVersion :: Arg.JsonOpt -> IO ()
-showVersion jsonOpt = send rtype $ VersionResponse "1.0.4"
+showVersion jsonOpt = send rtype $ VersionResponse "1.0.5"
   where
     rtype = parseResponseType jsonOpt
 

diff --git a/lib/Unfog/Response.hs b/lib/Unfog/Response.hs
@@ -173,7 +173,7 @@ showDailyWtimeText _ dwtimes = render $ head : body ++ foot
 showFullDailyWtimeText :: UTCTime -> [DailyWorktime] -> String
 showFullDailyWtimeText _ dwtimes = render $ head : body ++ foot
   where
-    head = map (underline . bold . cell) ["DATE", "ID", "DESC", "WORKTIME"]
+    head = map (underline . bold . cell) ["DATE", "ID", "PROJECT", "DESC", "WORKTIME"]
     body = concatMap rows dwtimes
 
     rows dwtime = map rows' (snd dwtime) ++ subtotal
@@ -189,6 +189,7 @@ showFullDailyWtimeText _ dwtimes = render $ head : body ++ foot
         rows' wtime =
           [ cell $ fst dwtime,
             red $ cell $ getWtimeId wtime,
+            blue $ cell $ fromMaybe "" $ getWtimeProj wtime,
             cell $ getWtimeDesc wtime,
             yellow $ cell $ showFullDuration $ getWtimeDuration wtime
           ]

diff --git a/lib/Unfog/Worktime.hs b/lib/Unfog/Worktime.hs
@@ -9,6 +9,7 @@ import Unfog.Task
 
 data Worktime = Worktime
   { getWtimeId :: Id,
+    getWtimeProj :: Project,
     getWtimeDesc :: Desc,
     getWtimeDuration :: Duration
   }
@@ -32,14 +33,14 @@ buildWtimePerDay now idLength from to = sortOn fst . foldl buildWtimePerDay' []
   where
     buildWtimePerDay' wtimes task = filter (\(_, wtimes) -> sum (map getWtimeDuration wtimes) > 0) $ mergeDailyWtimes wtimes $ concatMap (wtimePerDay wtime) $ zip starts' stops'
       where
-        wtime = Worktime (shortenId idLength $ getId task) (getDesc task) 0
+        wtime = Worktime (shortenId idLength $ getId task) (getProject task) (getDesc task) 0
         starts' = map (clampTime from to) $ getStarts task
         stops' = map (clampTime from to) $ getStops task ++ [now | isJust $ getActive task]
 
 wtimePerDay :: Worktime -> (UTCTime, UTCTime) -> [DailyWorktime]
-wtimePerDay (Worktime id desc _) (start, stop)
-  | stop < endOfDay = [(day, [Worktime id desc $ realToFrac $ diffUTCTime stop start])]
-  | otherwise = (day, [Worktime id desc $ realToFrac $ diffUTCTime endOfDay start]) : wtimePerDay (Worktime id desc 0) (nextDay, stop)
+wtimePerDay (Worktime id project desc _) (start, stop)
+  | stop < endOfDay = [(day, [Worktime id project desc $ realToFrac $ diffUTCTime stop start])]
+  | otherwise = (day, [Worktime id project desc $ realToFrac $ diffUTCTime endOfDay start]) : wtimePerDay (Worktime id project desc 0) (nextDay, stop)
   where
     day = show currDay
     currDay = utctDay start
@@ -55,9 +56,9 @@ mergeDailyWtimes = foldl mergeWtimes'
         (bday, foldl mergeWtimes avals bvals) : filter ((/=) bday . fst) a
 
 mergeWtimes :: [Worktime] -> Worktime -> [Worktime]
-mergeWtimes xvals (Worktime yid ydesc ywtime) =
+mergeWtimes xvals (Worktime yid yproject ydesc ywtime) =
   case find ((==) yid . getWtimeId) xvals of
-    Nothing -> Worktime yid ydesc ywtime : xvals
-    Just aval -> Worktime yid ydesc (getWtimeDuration aval + ywtime) : without yid xvals
+    Nothing -> Worktime yid yproject ydesc ywtime : xvals
+    Just aval -> Worktime yid yproject ydesc (getWtimeDuration aval + ywtime) : without yid xvals
   where
     without val = filter ((/=) val . getWtimeId)