refactor(schedule): move utils

src/Handler/News.hs

@@ -7,8 +7,9 @@ import Handler.Utils.News
 
 import Handler.SystemMessage
 
-import Utils.Schedule.Types (ScheduleOffset(..))
-import Utils.Schedule.Week
+-- TODO: deprecated
+import Handler.Utils.Schedule.Types (ScheduleOffset(..))
+import Handler.Utils.Schedule.Week
 
 import qualified Data.Map as Map
 import Database.Esqueleto.Utils.TH

src/Handler/Schedule.hs

@@ -6,9 +6,8 @@ import Import
 
 import Handler.Utils.Form
 
--- TODO: move Utils.Schedule to Handler.Utils.Schedule?
-import Utils.Schedule.Types
-import Utils.Schedule.Week
+import Handler.Utils.Schedule.Types
+import Handler.Utils.Schedule.Week
 
 
 getScheduleR, postScheduleR :: Handler Html

src/Handler/Utils/Schedule.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule
+module Handler.Utils.Schedule
   ( fetchActiveTerms, fetchCourseEvents, fetchTutorials, fetchExamOccurrences
   ) where
 
@@ -10,7 +10,7 @@ import qualified Database.Esqueleto.Utils as E
 import Utils.Course
 import Utils.Tutorial
 
-import Utils.Schedule.Types
+import Handler.Utils.Schedule.Types
 
 
 fetchActiveTerms :: MonadHandler m => ReaderT SqlBackend m [E.Value TermId]

src/Handler/Utils/Schedule/Types.hs

@@ -1,12 +1,12 @@
-module Utils.Schedule.Types
-  ( module Utils.Schedule.Types
+module Handler.Utils.Schedule.Types
+  ( module Handler.Utils.Schedule.Types
   ) where
 
 import Import
 
-import Utils.Schedule.Types.ScheduleEntry        as Utils.Schedule.Types
-import Utils.Schedule.Types.ScheduleOptions      as Utils.Schedule.Types
-import Utils.Schedule.Types.ButtonScheduleOffset as Utils.Schedule.Types
+import Handler.Utils.Schedule.Types.ScheduleEntry        as Handler.Utils.Schedule.Types
+import Handler.Utils.Schedule.Types.ScheduleOptions      as Handler.Utils.Schedule.Types
+import Handler.Utils.Schedule.Types.ButtonScheduleOffset as Handler.Utils.Schedule.Types
 
 
 -- TODO: replace Info types with one joined type and fetch info in one single runDB

src/Handler/Utils/Schedule/Types/ButtonScheduleOffset.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule.Types.ButtonScheduleOffset
+module Handler.Utils.Schedule.Types.ButtonScheduleOffset
   ( ButtonScheduleOffset
   , schedOffsetBtn, schedBtnOffset, schedBtnContent
   , ButtonScheduleOffsetWeek(..)
@@ -10,7 +10,7 @@ import Import
 
 import Utils.Form
 
-import Utils.Schedule.Types.ScheduleOptions
+import Handler.Utils.Schedule.Types.ScheduleOptions
 
 
 class (PathPiece button, Button UniWorX button) => ButtonScheduleOffset button where

src/Handler/Utils/Schedule/Types/ScheduleEntry.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule.Types.ScheduleEntry
+module Handler.Utils.Schedule.Types.ScheduleEntry
   ( ScheduleEntry(..)
   ) where
 

src/Handler/Utils/Schedule/Types/ScheduleOptions.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule.Types.ScheduleOptions
+module Handler.Utils.Schedule.Types.ScheduleOptions
   ( ScheduleOptions(..)
   , ScheduleView(..)
   , ScheduleOffset(..)

src/Handler/Utils/Schedule/Week.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule.Week
+module Handler.Utils.Schedule.Week
   ( weekSchedule
   ) where
 
@@ -13,9 +13,9 @@ import qualified Database.Esqueleto as E
 
 import Handler.Utils.DateTime (formatTimeRangeW, formatTimeW)
 
-import Utils.Schedule
-import Utils.Schedule.Types
-import Utils.Schedule.Week.TimeSlot
+import Handler.Utils.Schedule
+import Handler.Utils.Schedule.Types
+import Handler.Utils.Schedule.Week.TimeSlot
 
 
 weekSchedule :: UserId -> ScheduleOffset -> Widget

src/Handler/Utils/Schedule/Week/TimeSlot.hs

@@ -1,4 +1,4 @@
-module Utils.Schedule.Week.TimeSlot
+module Handler.Utils.Schedule.Week.TimeSlot
   ( TimeSlot(..)
   , timeSlot
   , timeSlotsFromTo