diff --git a/src/Handler/News.hs b/src/Handler/News.hs index 75b79009d..54b761d8c 100644 --- a/src/Handler/News.hs +++ b/src/Handler/News.hs @@ -7,10 +7,6 @@ import Handler.Utils.News import Handler.SystemMessage --- TODO: deprecated -import Handler.Utils.Schedule.Types (ScheduleOffset(..)) -import Handler.Utils.Schedule.Week - import qualified Data.Map as Map import Database.Esqueleto.Utils.TH import qualified Database.Esqueleto as E @@ -22,6 +18,10 @@ import qualified Data.Conduit.Lift as C import qualified Data.HashMap.Strict as HashMap +-- TODO: deprecated +import Utils.Schedule.Types (ScheduleOffset(..)) +import Utils.Schedule.Week + getNewsR :: Handler Html getNewsR = do diff --git a/src/Utils/Schedule/Types.hs b/src/Utils/Schedule/Types.hs index 4392a61e4..9fe8bdf9f 100644 --- a/src/Utils/Schedule/Types.hs +++ b/src/Utils/Schedule/Types.hs @@ -5,6 +5,8 @@ module Utils.Schedule.Types import Import import Utils.Schedule.Types.ScheduleEntry as Utils.Schedule.Types +import Utils.Schedule.Types.ScheduleView as Utils.Schedule.Types +import Utils.Schedule.Types.ScheduleOffset as Utils.Schedule.Types import Utils.Schedule.Types.ScheduleOptions as Utils.Schedule.Types diff --git a/src/Utils/Schedule/Types/ScheduleOptions.hs b/src/Utils/Schedule/Types/ScheduleOptions.hs index daafccc8f..bb80204d5 100644 --- a/src/Utils/Schedule/Types/ScheduleOptions.hs +++ b/src/Utils/Schedule/Types/ScheduleOptions.hs @@ -4,7 +4,7 @@ module Utils.Schedule.Types.ScheduleOptions , ScheduleOptions(..) ) where -import Import.NoModel +import Import import Utils.Form import Utils.Schedule.Types.ScheduleOffset diff --git a/src/Utils/Schedule/Types/ScheduleView.hs b/src/Utils/Schedule/Types/ScheduleView.hs index 3de254067..818a0b385 100644 --- a/src/Utils/Schedule/Types/ScheduleView.hs +++ b/src/Utils/Schedule/Types/ScheduleView.hs @@ -11,9 +11,7 @@ data ScheduleView = ScheduleViewWeek instance Bounded ScheduleView where minBound = maxBound maxBound = ScheduleViewWeek - instance Finite ScheduleView - instance Universe ScheduleView derivePathPiece ''ScheduleView (camelToPathPiece' 1) "_"