Villefort 0.1.2.2 → 0.1.2.3
raw patch · 3 files changed
+9/−7 lines, 3 filesPVP: minor bump suggested
API additions: PVP suggests at least a minor version bump
API changes (from Hackage documentation)
+ Villefort.Daily: n :: [[a]] -> [[a]]
Files
- README.md +2/−3
- Villefort.cabal +1/−1
- src/Villefort/Daily.hs +6/−3
README.md view
@@ -1,9 +1,8 @@ # Villefort Villefort is a time managment system written in Haskell. -## Version 1.2.2 -- Rewrote the weekly sorting by category algorithm so that it actually workds -- Fix weekly page error. +## Version 1.2.3 +- Hopefully the weekly algorithm actually works now. [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.2+version: 0.1.2.3 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
src/Villefort/Daily.hs view
@@ -47,7 +47,7 @@ genTabs = do z <- getThisWeek t <- getPrevWeek- return $ makeTable ["Subject","Last week","This week"] $ spec1 z t+ return $ makeTable ["Subject","Last week","This week"] $ n $ spec1 t z @@ -56,8 +56,8 @@ elem1 x y= any (\z -> z !! 0 == x) y diff1 = map (\q -> elem1 q x) set diff2 = map (\q -> elem1 q y) set- set1 = zipWithPadding " " [" "] set x- set2 = zipWithPadding " " [" "] set y+ set1 = zipWithPadding " " [" ","0"] set x+ set2 = zipWithPadding " " [" ","0"] set y main = (map (\q -> z (fst q) (snd q) ) $ zip diff1 set1, map (\q -> z (fst q) (snd q) ) $ zip diff2 set2) @@ -76,3 +76,6 @@ merge1 [] ys = ys merge1 (x:xs) (y:ys) = x : y : merge xs ys ++n (x:y:xs) = [(x ++ [(y !! 1)])] ++ n xs+n [] = []