casr-logbook-meta-html 0.0.1 → 0.0.2
raw patch · 3 files changed
+10/−42 lines, 3 filesdep ~casr-logbook-metaPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: casr-logbook-meta
API changes (from Hackage documentation)
- Data.Aviation.Casr.Logbook.Meta.Html: aircraftUsageCost :: HasAircraftFlight s => s -> AircraftUsageExpense -> Int
- Data.Aviation.Casr.Logbook.Meta.Html: briefingCost :: HasBriefing s => s -> BriefingExpense -> Int
- Data.Aviation.Casr.Logbook.Meta.Html: simulatorFlightCost :: HasSimulatorFlight s => s -> SimulatorFlightExpense -> Int
Files
casr-logbook-meta-html.cabal view
@@ -1,5 +1,5 @@ name: casr-logbook-meta-html-version: 0.0.1+version: 0.0.2 license: OtherLicense license-file: LICENSE author: Tony Morris <ʇǝu˙sıɹɹoɯʇ@ןןǝʞsɐɥ>@@ -34,7 +34,7 @@ build-depends: base < 5 && >= 4.8 , casr-logbook >= 0.1.3 && < 0.2- , casr-logbook-meta >= 0.0.2 && < 0.2+ , casr-logbook-meta >= 0.0.3 && < 0.2 , lucid >= 2.9 && < 3 , lens >= 4.1 && < 5 , text >= 1.2 && < 1.3
changelog view
@@ -1,3 +1,7 @@+0.0.2++* Use `casr-logbook-meta-0.0.3`.+ 0.0.1 * Initial release
src/Data/Aviation/Casr/Logbook/Meta/Html.hs view
@@ -26,9 +26,6 @@ , htmlSimulatorFlightMeta , htmlExamMeta , htmlBriefingMeta- , aircraftUsageCost- , briefingCost- , simulatorFlightCost , showCentsAsDollars , showThousandCentsAsDollars , showHundredCentsAsDollars@@ -36,21 +33,12 @@ ) where import Control.Category((.), id)-import Control.Lens((^.)) import Control.Monad(when) import Data.Aviation.Casr.Logbook (- instrumentsimulatorTime- , timeAmountBy10- , briefingTimeAmount- , daynight- , totalDayNight- , AircraftFlight+ AircraftFlight , SimulatorFlight , Briefing , Exam- , HasSimulatorFlight- , HasAircraftFlight- , HasBriefing ) import Data.Aviation.Casr.Logbook.Meta( AircraftFlightExpense(ExpenseAircraftUsage, ExpenseAircraftLanding)@@ -71,6 +59,9 @@ , VideoType(YouTube, Vimeo, Bambuser) , Visualisation(Doarama) , linkVideoType+ , aircraftUsageCost+ , simulatorFlightCost+ , briefingCost ) import Data.Bool(not) import Data.Foldable(mapM_, null)@@ -372,33 +363,6 @@ mapM_ (li_ [class_ "expense"] . htmlBriefingExpense b) q) s ------aircraftUsageCost ::- HasAircraftFlight s =>- s- -> AircraftUsageExpense- -> Int-aircraftUsageCost fl (AircraftUsageExpense perhour _) =- let z = totalDayNight (fl ^. daynight)- in timeAmountBy10 z * perhour--briefingCost ::- HasBriefing s =>- s- -> BriefingExpense- -> Int-briefingCost br (BriefingExpense perhour _) =- let z = br ^. briefingTimeAmount- in timeAmountBy10 z * perhour--simulatorFlightCost ::- HasSimulatorFlight s =>- s- -> SimulatorFlightExpense- -> Int-simulatorFlightCost sf (SimulatorFlightExpense perhour _) =- let z = sf ^. instrumentsimulatorTime- in timeAmountBy10 z * perhour showCentsAsDollars :: Int