casr-logbook 0.6.0 → 0.6.1

raw patch · 4 files changed

+28/−4 lines, 4 files

Files

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

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

@@ -1,3 +1,7 @@+0.6.1++* Update to instruction for flight time report.+ 0.6.0  * Add instruction to flight time report.

@@ -10,14 +10,16 @@ , noif_dualonlyflight , commandonlyflight , noif_commandonlyflight+, instructionflight ) where  import Control.Category((.)) import Control.Lens(makeClassy) import Data.Aviation.Casr.Logbook.Types.Aircraft(Aircraft, HasAircraft(aircraft))-import Data.Aviation.Casr.Logbook.Types.Command(Command(ICUS, Dual, InCommand))+import Data.Aviation.Casr.Logbook.Types.Command ( Command(..) ) import Data.Aviation.Casr.Logbook.Types.DayNight(DayNight, HasDayNight(dayNight)) import Data.Aviation.Casr.Logbook.Types.FlightPath(FlightPath, HasFlightPath(flightPath))+import Data.Aviation.Casr.Logbook.Types.Instruction ( Instruction ) import Data.Aviation.Casr.Logbook.Types.Aviator(Aviator) import Data.Aviation.Casr.Logbook.Types.TimeAmount(TimeAmount, zerotimeamount) import Data.Eq(Eq)@@ -49,7 +51,7 @@ instance HasFlightPath AircraftFlight where   flightPath =     flightpath . flightPath-    + icusonlyflight ::   String   -> Aircraft@@ -130,6 +132,24 @@     n     a     InCommand+    t+    p+    []+    i++instructionflight ::+  String+  -> Aircraft+  -> Instruction+  -> DayNight+  -> FlightPath+  -> TimeAmount+  -> AircraftFlight+instructionflight n a s t p i =+  AircraftFlight+    n+    a+    (InCommandInstructing s)     t     p     []

@@ -9,7 +9,7 @@  import Control.Lens(makeClassyPrisms) import Data.Aviation.Casr.Logbook.Types.Aviator(Aviator)-import Data.Aviation.Casr.Logbook.Types.Instruction+import Data.Aviation.Casr.Logbook.Types.Instruction ( Instruction ) import Data.Eq(Eq) import Data.Maybe(Maybe(Just, Nothing)) import Data.Ord(Ord)