From 6fe311ee78519240db4862fb3264fe1548b98286 Mon Sep 17 00:00:00 2001
From: SJost <jost@tcs.ifi.lmu.de>
Date: Thu, 22 Mar 2018 19:49:33 +0100
Subject: [PATCH] Sheet edit times und fillDB angepasst

---
 fill-db.hs           | 5 +++--
 models               | 6 +-----
 src/Handler/Sheet.hs | 9 ++-------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/fill-db.hs b/fill-db.hs
index d90c8af28..26114a88f 100755
--- a/fill-db.hs
+++ b/fill-db.hs
@@ -98,8 +98,9 @@ main = db $ do
   void . insert $ DegreeCourse ifiBsc ffp
   void . insert $ DegreeCourse ifiMsc ffp
   void . insert $ Lecturer gkleen ffp
-  void . insert $ Corrector gkleen ffp (ByProportion 1)
-  void . insert $ Sheet ffp "Blatt 1" Nothing NotGraded Nothing now now Nothing Nothing now now gkleen gkleen
+  insert_ $ Corrector gkleen ffp (ByProportion 1)
+  sheetkey <- insert $ Sheet ffp "Blatt 1" Nothing NotGraded NoGroups Nothing Nothing now now Nothing Nothing
+  insert_ $ SheetEdit gkleen sheetkey now
   -- EIP
   eip <- insert Course
     { courseName = "Einführung in die Programmierung"
diff --git a/models b/models
index 5c73fe32e..d07c3f9bd 100644
--- a/models
+++ b/models
@@ -103,14 +103,10 @@ Sheet
     activeTo        UTCTime
     hintFrom        UTCTime Maybe
     solutionFrom    UTCTime Maybe
-    created         UTCTime  -- delete
-    changed         UTCTime  -- delete
-    createdBy       UserId   -- delete
-    changedBy       UserId   -- delete
     CourseSheet courseId name
 SheetEdit
-    sheet           SheetId
     user            UserId
+    sheet           SheetId
     time            UTCTime
 SheetFile
     sheetId         SheetId
diff --git a/src/Handler/Sheet.hs b/src/Handler/Sheet.hs
index 8496c26af..ad336b12d 100644
--- a/src/Handler/Sheet.hs
+++ b/src/Handler/Sheet.hs
@@ -278,8 +278,6 @@ getSheetEditR tid csh shn = do
         }
   let action newSheet = do
         replaceRes <- myReplaceUnique sid $ newSheet
-                        { sheetCreated   = sheetCreated
-                        , sheetCreatedBy = sheetChangedBy }
         case replaceRes of
           Nothing     -> return $ Just sid
           (Just _err) -> return $ Nothing -- More specific error message for edit old sheet could go here
@@ -297,8 +295,8 @@ handleSheetEdit tid csh template dbAction = do
   case res of
     (FormSuccess SheetForm{..}) -> do
       saveOkay <- runDB $ do
-        cid <- getKeyBy404 $ CourseTermShort tid csh
         actTime <- liftIO getCurrentTime
+        cid <- getKeyBy404 $ CourseTermShort tid csh
         let newSheet = Sheet
               { sheetCourseId     = cid
               , sheetName         = sfName
@@ -311,10 +309,6 @@ handleSheetEdit tid csh template dbAction = do
               , sheetActiveTo     = sfActiveTo
               , sheetHintFrom     = sfHintFrom
               , sheetSolutionFrom = sfSolutionFrom
-              , sheetCreated      = actTime  -- dbAction adjusts this for replacement, TODO: eigene Tabelle für changedBy
-              , sheetChanged      = actTime
-              , sheetCreatedBy    = aid      -- dbAction adjusts this for replacement
-              , sheetChangedBy    = aid
               }
         mbsid <- dbAction newSheet
         case mbsid of
@@ -323,6 +317,7 @@ handleSheetEdit tid csh template dbAction = do
             whenIsJust sfSheetF    $ insertSheetFile sid SheetExercise
             whenIsJust sfHintF     $ insertSheetFile sid SheetHint
             whenIsJust sfSolutionF $ insertSheetFile sid SheetSolution
+            insert_ $ SheetEdit aid sid actTime
             addMessageI "info" $ MsgSheetEditOk tident csh sfName
             return True
       when saveOkay $ redirect $ CSheetR tid csh $ SheetShowR sfName -- redirect must happen outside of runDB