casr-logbook 0.6.8 → 0.6.9

raw patch · 3 files changed

+12/−7 lines, 3 files

Files

• casr-logbook.cabal +1/−1
• changelog +4/−0
• src/Data/Aviation/Casr/Logbook/Types/Command.hs +7/−6

@@ -1,5 +1,5 @@ name:               casr-logbook-version:            0.6.8+version:            0.6.9 license:            OtherLicense license-file:       LICENSE author:             Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>

@@ -1,3 +1,7 @@+0.6.9++* Fix bug in command hours+ 0.6.8  * Include instructing in command total hours

@@ -11,13 +11,14 @@ ) where  import Control.Applicative-    ( Applicative((*>)), Alternative((<|>)) )+    ( Alternative((<|>)) ) import Control.Lens     ( Prism', preview, makeClassyPrisms, isn't, prism', (#) ) import Data.Aviation.Casr.Logbook.Types.Aviator(Aviator) import Data.Aviation.Casr.Logbook.Types.Instruction ( Instruction )-import Data.Bool ( Bool(..), not )+import Data.Bool ( Bool(..) ) import Data.Eq(Eq)+import Data.Functor ( Functor((<$)), (<$>) ) import Data.Maybe(Maybe(Just, Nothing)) import Data.Ord(Ord) import Prelude(Show)@@ -50,8 +51,8 @@   AsCommand c =>   c   -> Bool-isAeronauticalHours c =-  not (isn't _ApprovedSolo c)+isAeronauticalHours =+  isn't _ApprovedSolo  _InCommandIncludingInstructing ::   AsCommand c =>@@ -66,6 +67,6 @@     )     (       \c ->-        preview _InCommand c *> Nothing <|>-        preview _InCommandIncludingInstructing c+        (Nothing <$ preview _InCommand c) <|>+        (Just <$> preview _InCommandInstructing c)     )