Current time used as default publis time for materials and slides.

cgtuebingen · Apr 30, 2019 · 0bbbb5e · 0bbbb5e
1 parent 15bbaa9
commit 0bbbb5e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 27 deletions.
diff --git a/src/Pages/MaterialEditor.elm b/src/Pages/MaterialEditor.elm
@@ -108,28 +108,37 @@ type alias Model =
  }
 
 
-initModel : ( Model, Cmd Msg )
-initModel =
+initModel : SharedState -> ( Model, Cmd Msg )
+initModel sharedState =
  let
- ( publishedDatePicker, publishedDatePickerFx ) =
- DatePicker.init
+ publishedDatePicker =
+ DatePicker.initFromDate <| Date.fromPosix (Maybe.withDefault Time.utc sharedState.timezone) (Maybe.withDefault (Time.millisToPosix 0) sharedState.currentTime)
 
- ( lectureDatePicker, lectureDatePickerFx ) =
- DatePicker.init
+ lectureDatePicker =
+ DatePicker.initFromDate <| Date.fromPosix (Maybe.withDefault Time.utc sharedState.timezone) (Maybe.withDefault (Time.millisToPosix 0) sharedState.currentTime)
+
+ pickerTime =
+ DTU.pickerTimeFromPosix (Maybe.withDefault Time.utc sharedState.timezone) (Maybe.withDefault (Time.millisToPosix 0) sharedState.currentTime)
+
+ pickerDate =
+ Date.fromPosix (Maybe.withDefault Time.utc sharedState.timezone) (Maybe.withDefault (Time.millisToPosix 0) sharedState.currentTime)
+
+ currentTime =
+ Maybe.withDefault (Time.millisToPosix 0) sharedState.currentTime
  in
  ( { course_id = 0
  , id = 0
  , name = ""
- , publishedTimePicker = TimePicker.init Nothing
+ , publishedTimePicker = TimePicker.init <| Just pickerTime
  , publishedDatePicker = publishedDatePicker
- , publishedAtDate = Nothing
- , publishedAtTime = Nothing
- , publishedPosix = Nothing
- , lectureTimePicker = TimePicker.init Nothing
+ , publishedAtDate = Just pickerDate
+ , publishedAtTime = Just pickerTime
+ , publishedPosix = Just currentTime
+ , lectureTimePicker = TimePicker.init <| Just pickerTime
  , lectureDatePicker = lectureDatePicker
- , lectureAtDate = Nothing
- , lectureAtTime = Nothing
- , lecturePosix = Nothing
+ , lectureAtDate = Just pickerDate
+ , lectureAtTime = Just pickerTime
+ , lecturePosix = Just currentTime
  , utcOffsetPos = DTU.utcZeroOffsetIndex
  , materialResponse = NotAsked
  , createMaterial = True
@@ -142,28 +151,24 @@ initModel =
  , toasties = Toasty.initialState
  , deleteMaterialDialogState = False
  }
- , Cmd.batch
- [ Cmd.map PublishedDatePickerMsg publishedDatePickerFx
- , Cmd.map LectureDatePickerMsg lectureDatePickerFx
- , perform GetRealOffset
- ]
+ , perform GetRealOffset
  )
 
 
-initCreate : Int -> ( Model, Cmd Msg )
-initCreate courseId =
+initCreate : Int -> SharedState -> ( Model, Cmd Msg )
+initCreate courseId sharedModel =
  let
  ( model, cmd ) =
- initModel
+ initModel sharedModel
  in
  ( { model | course_id = courseId }, cmd )
 
 
-initEdit : Int -> Int -> ( Model, Cmd Msg )
-initEdit courseId id =
+initEdit : Int -> Int -> SharedState -> ( Model, Cmd Msg )
+initEdit courseId id sharedState =
  let
  ( model, cmd ) =
- initModel
+ initModel sharedState
  in
  ( { model
  | createMaterial = False

diff --git a/src/Routing/Router.elm b/src/Routing/Router.elm
@@ -354,10 +354,10 @@ navigateTo route sharedState model =
  SheetEditor.initEdit courseId id |> initWith SheetEditorModel SheetEditorMsg model NoUpdate
 
  CreateMaterialRoute courseId ->
- MaterialEditor.initCreate courseId |> initWith MaterialEditorModel MaterialEditorMsg model NoUpdate
+ MaterialEditor.initCreate courseId sharedState |> initWith MaterialEditorModel MaterialEditorMsg model NoUpdate
 
  EditMaterialRoute courseId id ->
- MaterialEditor.initEdit courseId id |> initWith MaterialEditorModel MaterialEditorMsg model NoUpdate
+ MaterialEditor.initEdit courseId id sharedState |> initWith MaterialEditorModel MaterialEditorMsg model NoUpdate
 
  SheetDetailRoute courseId id ->
  SheetDetail.init courseId id |> initWith SheetDetailModel SheetDetailMsg model NoUpdate