Villefort 0.1.2.3 → 0.1.2.4

raw patch · 6 files changed

+11/−7 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

Main.hs +1/−3
README.md +2/−1
Villefort.cabal +1/−1
data/todo.db binary
src/Villefort/Daily.hs +6/−1
src/Villefort/Time.hs +1/−1

Main.hs view

@@ -4,6 +4,4 @@ import Villefort.Definitions  main :: IO ()-main = villefort def -  -+main = villefort def

README.md view

@@ -2,7 +2,8 @@ Villefort is a time managment system written in Haskell.
 
 ## Version 1.2.3
-- Hopefully the weekly algorithm actually works now.
+- Fixed bug in weekly time reports
+
 
 [default config](https://github.com/Chrisr850/Villefort/blob/master/src/Villefort/Config.hs)

Villefort.cabal view

@@ -1,5 +1,5 @@ name:                Villefort-version:             0.1.2.3+version:             0.1.2.4 synopsis: Villefort is a task manager and time tracker written in haskell. description: Villefort is a browser based time tracker. homepage:            https://github.com/Chrisr850/Villefort#readme

data/todo.db view

binary file changed (16384 → 20480 bytes)

src/Villefort/Daily.hs view

@@ -7,8 +7,10 @@ import Villefort.Todo import Villefort.Summary import Villefort.Config+ import Control.Monad.Reader import Control.Monad.IO.Class+ import Data.Time import Data.Time.Calendar.WeekDate import Data.List@@ -37,6 +39,9 @@   t z   where t  = (\x -> getSubWeek (show $ x !! 0) (show $ x !! 1)) ++-- "2017-10-30"+-- ""2017-11-03" getThisWeek :: (MonadReader VConfig m, MonadIO m) => m [[String]] getThisWeek = do   z <- liftIO $ getDatesOfThisWeek@@ -47,7 +52,7 @@ genTabs = do   z <- getThisWeek   t <- getPrevWeek-  return $ makeTable ["Subject","Last week","This week"] $ n $ spec1 t z+  return $ makeTable ["Subject","Last week ","This week "] $ n $ spec1 t z

src/Villefort/Time.hs view

@@ -55,7 +55,7 @@ getDatesOfPrevWeek = do   start <- addDays (-6) <$> getStartOfWeek   currentDay <- getDay-  return $ [start ,last $ take (currentDay+1) $ scanl next start [1,1 .. ]]+  return $ [start ,last $ take 7 $ scanl next start [1,1 .. ]]   where next s   x = addDays (x) s  getDatesOfThisWeek :: IO [Day]