casr-logbook 0.1.2 → 0.1.3

raw patch · 7 files changed

+48/−3 lines, 7 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• casr-logbook.cabal +1/−1
• changelog +8/−0
• src/Data/Aviation/Casr/Logbook/Command.hs +12/−0
• src/Data/Aviation/Casr/Logbook/DayNight.hs +8/−0
• src/Data/Aviation/Casr/Logbook/FlightPath.hs +8/−0
• src/Data/Aviation/Casr/Logbook/SimulatorFlight.hs +3/−1
• src/Data/Aviation/Casr/Logbook/TimeAmount.hs +8/−1

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

@@ -1,3 +1,11 @@+0.1.3++* Fix `SimulatorFlight` to include flight time.+* Add `totalDayNight` function.+* Add `getInstructingPic` function.+* Add `timeAmountBy10` function.+* Add `flightPathList` function.+ 0.1.2  * Expose lensy values.

@@ -4,11 +4,13 @@ module Data.Aviation.Casr.Logbook.Command(   Command(..) , AsCommand(..)+, getInstructingPic ) where  import Control.Lens(makeClassyPrisms) import Data.Aviation.Casr.Logbook.Aviator(Aviator) import Data.Eq(Eq)+import Data.Maybe(Maybe(Just, Nothing)) import Data.Ord(Ord) import Prelude(Show) @@ -19,3 +21,13 @@   deriving (Eq, Ord, Show)  makeClassyPrisms ''Command++getInstructingPic ::+  Command+  -> Maybe Aviator+getInstructingPic (ICUS a) =+  Just a+getInstructingPic (Dual a) =+  Just a+getInstructingPic InCommand =+  Nothing

@@ -6,6 +6,7 @@ , HasDayNight(..) , day , night+, totalDayNight ) where  import Control.Lens(makeClassy)@@ -13,6 +14,7 @@ import Data.Digit(Digit) import Data.Eq(Eq) import Data.Int(Int)+import Data.Monoid(mappend) import Data.Ord(Ord) import Prelude(Show) @@ -37,3 +39,9 @@   -> DayNight night h p =   DayNight zerotimeamount (TimeAmount h p)++totalDayNight ::+  DayNight+  -> TimeAmount+totalDayNight (DayNight d n) =+  d `mappend` n

@@ -7,12 +7,14 @@ , directflightpath , directcircuit , pointsatdate+, flightPathList ) where  import Control.Lens(makeClassy) import Data.Aviation.Casr.Logbook.FlightPoint(FlightPoint, pointatdate) import Data.Eq(Eq) import Data.Functor((<$>))+import Data.List((++)) import Data.Ord(Ord) import Data.String(String) import Data.Time(Day)@@ -51,3 +53,9 @@     (pointatdate x d)     ((\s -> pointatdate s d) <$> i)     (pointatdate y d)++flightPathList ::+  FlightPath+  -> [FlightPoint]+flightPathList (FlightPath s x e) =+  s : x ++ [e]

@@ -23,7 +23,8 @@   , _simulatorflighttime :: Time   , _simulatortype :: String   , _simulatorothercrew :: [Aviator]-  , _instrumentsimulatorTimeAmount :: TimeAmount+  , _simulatorTime :: TimeAmount+  , _instrumentsimulatorTime :: TimeAmount   } deriving (Eq, Ord, Show)     makeClassy ''SimulatorFlight@@ -33,6 +34,7 @@   -> Day   -> String   -> [Aviator]+  -> TimeAmount   -> TimeAmount   -> SimulatorFlight dayonlysimulator n d =

@@ -7,6 +7,7 @@ , parttimeamount , zerotimeamount , addtimeamount+, timeAmountBy10 ) where  import Control.Lens(makeClassy, ( # ))@@ -15,7 +16,7 @@ import Data.Int(Int) import Data.Monoid(Monoid(mempty, mappend)) import Data.Ord(Ord)-import Prelude(Show, Num((+)))+import Prelude(Show, Num((+), (*)))  data TimeAmount =   TimeAmount {@@ -43,6 +44,12 @@ TimeAmount f1 p1 `addtimeamount` TimeAmount f2 p2 =   let (h, q) = p1 /+/ p2   in  TimeAmount (f1 + f2 + digit # h) q ++timeAmountBy10 ::+  TimeAmount+  -> Int+timeAmountBy10 (TimeAmount a b) =+  a * 10 + digit # b  instance Monoid TimeAmount where   mempty =