Profile cleaned

2018-10-24 18:19:16 +02:00 · 2018-10-24 18:19:16 +02:00 · 028cc3586d
commit 028cc3586d
parent 600d06f75b
16 changed files with 124 additions and 110 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@ -4,6 +4,8 @@

    Hilfe Widget

+    Benachrichtigungen per eMail für einige Ereignisse
+
  * Version 18.09.2018

    Tooltips funktionieren auch ohne JavaScript
--- a/messages/uniworx/de.msg
+++ b/messages/uniworx/de.msg
@ -348,7 +348,7 @@ MailSheetSoonInactiveIntro courseName@Text termDesc@Text sheetName@SheetName: Ab
 MailSubjectSheetInactive csh@CourseShorthand sheetName@SheetName: Abgabfristt für #{sheetName} in #{csh} abgelaufen
 MailSheetInactiveIntro courseName@Text termDesc@Text sheetName@SheetName: Die Abgabefirst für #{sheetName} im Kurs #{courseName} (#{termDesc}) beendet.
 MailCorrectionsAssignedIntro courseName@Text termDesc@Text sheetName@SheetName n@Int: #{display n} Abgaben wurden Ihnen zur Korrektur für #{sheetName} im Kurs #{courseName} (#{termDesc}) zugeteilt.
-
+MailEditNotifications: Benachrichtigungen ein-/ausschalten
 MailSubjectSupport: Supportanfrage

 SheetTypeBonus: Bonus
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@ -882,7 +882,7 @@ defaultLinks = -- Define the menu items of the header.
      , menuItemAccessCallback' = return True
      }
  , NavbarRight $ MenuItem
-      { menuItemLabel = "Profil"
+      { menuItemLabel = "Einstellungen"
      , menuItemIcon = Just "cogs"
      , menuItemRoute = ProfileR
      , menuItemModal = False
@ -966,7 +966,7 @@ pageActions (HomeR) =
  ]
 pageActions (ProfileR) =
  [ PageActionPrime $ MenuItem
-      { menuItemLabel = "Gespeicherte Daten anzeigen"
+      { menuItemLabel = "Gespeicherte Daten"
      , menuItemIcon  = Just "book"
      , menuItemRoute = ProfileDataR
      , menuItemModal = False
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@ -115,47 +115,11 @@ postProfileR = do
    (FormFailure msgs) -> forM_ msgs $ (addMessage Warning) . toHtml
    _ -> return ()

-
-  (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$>
-            (E.select $ E.from $ \(adright `E.InnerJoin` school) -> do
-                E.where_ $ adright E.^. UserAdminUser E.==. E.val uid
-                E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId
-                return (school E.^. SchoolShorthand)
-            )
-            <*>
-            (E.select $ E.from $ \(lecright `E.InnerJoin` school) -> do
-                E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid
-                E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId
-                return (school E.^. SchoolShorthand)
-            )
-            <*>
-            (E.select $ E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do
-                E.on $ sheet E.^. SheetCourse E.==. course    E.^. CourseId
-                E.on $ sheet E.^. SheetId     E.==. corrector E.^. SheetCorrectorSheet
-                E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid
-                return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand)
-            )
-            <*>
-            (E.select $ E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> do
-                E.where_ $ studyfeat E.^. StudyFeaturesUser E.==. E.val uid
-                E.on $ studyfeat E.^. StudyFeaturesField  E.==. studyterms  E.^. StudyTermsId
-                E.on $ studyfeat E.^. StudyFeaturesDegree E.==. studydegree E.^. StudyDegreeId
-                return  ( ( studydegree E.^. StudyDegreeName
-                          , studydegree E.^. StudyDegreeKey
-                          )
-                        , ( studyterms  E.^. StudyTermsName
-                          , studyterms  E.^. StudyTermsKey
-                          )
-                        , studyfeat   E.^. StudyFeaturesType
-                        , studyfeat   E.^. StudyFeaturesSemester)
-            )
-  let formText  = Just MsgSettings
-      actionUrl = ProfileR
-      settingsForm = $(widgetFile "formPageI18n")
+  let formText  = Nothing :: Maybe UniWorXMessage
+      actionUrl = ProfileR      
  defaultLayout $ do
    setTitle . toHtml $ userIdent <> "'s User page"
-    $(widgetFile "profile")
-    $(widgetFile "dsgvDisclaimer")
+    $(widgetFile "formPageI18n")    

 postProfileDataR  :: Handler Html
 postProfileDataR = do
@ -233,6 +197,39 @@ getProfileDataR  :: Handler Html
 getProfileDataR = do
  (uid, User{..}) <- requireAuthPair
  --   mr <- getMessageRender
+  (admin_rights,lecturer_rights,lecture_corrector,studies) <- runDB $ (,,,) <$>
+    (E.select $ E.from $ \(adright `E.InnerJoin` school) -> do
+        E.where_ $ adright E.^. UserAdminUser E.==. E.val uid
+        E.on $ adright E.^. UserAdminSchool E.==. school E.^. SchoolId
+        return (school E.^. SchoolShorthand)
+    )
+    <*>
+    (E.select $ E.from $ \(lecright `E.InnerJoin` school) -> do
+        E.where_ $ lecright E.^. UserLecturerUser E.==. E.val uid
+        E.on $ lecright E.^. UserLecturerSchool E.==. school E.^. SchoolId
+        return (school E.^. SchoolShorthand)
+    )
+    <*>
+    (E.select $ E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do
+        E.on $ sheet E.^. SheetCourse E.==. course    E.^. CourseId
+        E.on $ sheet E.^. SheetId     E.==. corrector E.^. SheetCorrectorSheet
+        E.where_ $ corrector E.^. SheetCorrectorUser E.==. E.val uid
+        return (course E.^. CourseTerm, course E.^. CourseSchool, course E.^. CourseShorthand)
+    )
+    <*>
+    (E.select $ E.from $ \(studydegree `E.InnerJoin` studyfeat `E.InnerJoin` studyterms) -> do
+        E.where_ $ studyfeat E.^. StudyFeaturesUser E.==. E.val uid
+        E.on $ studyfeat E.^. StudyFeaturesField  E.==. studyterms  E.^. StudyTermsId
+        E.on $ studyfeat E.^. StudyFeaturesDegree E.==. studydegree E.^. StudyDegreeId
+        return  ( ( studydegree E.^. StudyDegreeName
+                    , studydegree E.^. StudyDegreeKey
+                    )
+                , ( studyterms  E.^. StudyTermsName
+                    , studyterms  E.^. StudyTermsKey
+                    )
+                , studyfeat   E.^. StudyFeaturesType
+                , studyfeat   E.^. StudyFeaturesSemester)
+    )
  -- Tabelle mit eigenen Kursen
  (hasRows, ownedCoursesTable) <- mkOwnedCoursesTable uid
  -- Tabelle mit allen Teilnehmer: Kurs (link), Datum
--- a/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
+++ b/src/Jobs/Handler/SendNotification/CorrectionsAssigned.hs
@ -22,8 +22,8 @@ dispatchNotificationCorrectionsAssigned  nUser nSheet jRecipient = do
  (Course{..}, Sheet{..}, nbrSubs) <- liftHandlerT . runDB $ do
    sheet <- getJust nSheet
    course <- belongsToJust sheetCourse sheet
-    nbrSubs <- count [ SubmissionSheet ==. nSheet
-                     , SubmissionRatingBy ==. Just nUser
+    nbrSubs <- count [ SubmissionSheet      ==. nSheet
+                     , SubmissionRatingBy   ==. Just nUser
                     , SubmissionRatingTime ==. Nothing
                     ]
    return (course, sheet, nbrSubs)
@ -38,4 +38,5 @@ dispatchNotificationCorrectionsAssigned  nUser nSheet jRecipient = do
        shn = sheetName

    addAlternatives $ do
-        providePreferredAlternative ($(ihamletFile "templates/mail/correctionsAssigned.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
+      let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
+      providePreferredAlternative ($(ihamletFile "templates/mail/correctionsAssigned.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
--- a/src/Jobs/Handler/SendNotification/SheetActive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetActive.hs
@ -33,4 +33,5 @@ dispatchNotificationSheetActive nSheet jRecipient = userMailT jRecipient $ do
      shn = sheetName

  addAlternatives $ do
+    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
    providePreferredAlternative ($(ihamletFile "templates/mail/sheetActive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
--- a/src/Jobs/Handler/SendNotification/SheetInactive.hs
+++ b/src/Jobs/Handler/SendNotification/SheetInactive.hs
@ -34,6 +34,7 @@ dispatchNotificationSheetSoonInactive nSheet jRecipient = userMailT jRecipient $
      shn = sheetName

  addAlternatives $ do
+    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
    providePreferredAlternative ($(ihamletFile "templates/mail/sheetSoonInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))

 dispatchNotificationSheetInactive :: SheetId -> UserId -> Handler ()
@ -52,5 +53,6 @@ dispatchNotificationSheetInactive nSheet jRecipient = userMailT jRecipient $ do
      shn = sheetName

  addAlternatives $ do
+    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
    providePreferredAlternative ($(ihamletFile "templates/mail/sheetInactive.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
    
--- a/src/Jobs/Handler/SendNotification/SubmissionRated.hs
+++ b/src/Jobs/Handler/SendNotification/SubmissionRated.hs
@ -55,4 +55,5 @@ dispatchNotificationSubmissionRated nSubmission jRecipient = userMailT jRecipien
      , "course-school" Aeson..= courseSchool
      ]
    -- provideAlternative $ \(MsgRenderer mr) -> ($(textFile "templates/mail/submissionRated.txt") :: TextUrl (Route UniWorX)) -- textFile does not support control statements
+    let editNotifications = $(ihamletFile "templates/mail/editNotifications.hamlet")
    providePreferredAlternative ($(ihamletFile "templates/mail/submissionRated.hamlet") :: HtmlUrlI18n UniWorXMessage (Route UniWorX))
--- a/templates/mail/correctionsAssigned.hamlet
+++ b/templates/mail/correctionsAssigned.hamlet
@ -15,3 +15,4 @@ $newline never
    <p>
      <a href=@{CorrectionsR}>
        _{MsgCorrectionsTitle}
+    ^{editNotifications}
--- a/templates/mail/editNotifications.hamlet
+++ b/templates/mail/editNotifications.hamlet
@ -0,0 +1,4 @@
+<p>      
+  <a href=@{ProfileR}>
+    _{MsgProfileHeading}
+  \ _{MsgMailEditNotifications}
--- a/templates/mail/sheetActive.hamlet
+++ b/templates/mail/sheetActive.hamlet
@ -15,3 +15,4 @@ $newline never
    <p>
      <a href=@{CSheetR tid ssh csh shn SShowR}>
        #{sheetName}
+    ^{editNotifications}
--- a/templates/mail/sheetInactive.hamlet
+++ b/templates/mail/sheetInactive.hamlet
@ -15,3 +15,4 @@ $newline never
    <p>
      <a href=@{CSheetR tid ssh csh shn SShowR}>
        #{sheetName}
+    ^{editNotifications}
--- a/templates/mail/sheetSoonInactive.hamlet
+++ b/templates/mail/sheetSoonInactive.hamlet
@ -15,3 +15,4 @@ $newline never
    <p>
      <a href=@{CSheetR tid ssh csh shn SShowR}>
        #{sheetName}
+    ^{editNotifications}
--- a/templates/mail/submissionRated.hamlet
+++ b/templates/mail/submissionRated.hamlet
@ -63,3 +63,4 @@ $newline never
          _{MsgRatingComment}
        <dd .comment>
          #{comment}
+    ^{editNotifications}
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@ -1,62 +1,2 @@
 <div .profile>
-
-  <dl .deflist.profile-dl>
-      <dt .deflist__dt> _{MsgName}
-      <dd .deflist__dd> ^{nameWidget userDisplayName userSurname}
-      $maybe matnr <- userMatrikelnummer
-        <dt .deflist__dt> _{MsgMatrikelNr}
-        <dd .deflist__dd> #{matnr}
-      <dt .deflist__dt> _{MsgEMail}
-      <dd .deflist__dd> #{display userEmail}
-      <dt .deflist__dt> _{MsgIdent}
-      <dd .deflist__dd> #{display userIdent}
-    $if not $ null admin_rights
-      <dt .deflist__dt> Administrator
-      <dd .deflist__dd>
-        <ul .list-ul>
-          $forall (E.Value institute) <- admin_rights
-            <li .list-ul__item>
-              <a href=@{SchoolShowR $ SchoolKey institute}>
-                #{display institute}
-    $if not $ null lecturer_rights
-      <dt .deflist__dt> Lehrberechtigt
-      <dd .deflist__dd>
-        <ul .list-ul>
-          $forall (E.Value institute) <- lecturer_rights
-            <li .list-ul__item>
-              <a href=@{SchoolShowR $ SchoolKey institute}>
-                #{display institute}
-    $if not $ null lecture_corrector
-      <dt .deflist__dt> Korrektor
-      <dd .deflist__dd>
-        <ul .list-ul>
-          $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector
-            <li .list-ul__item>
-              <a href=@{CourseR tid ssh csh CShowR}>#{display tid}-#{display ssh}-#{display csh}
-    $if not $ null studies
-      <dt .deflist__dt> Studiengänge
-      <dd .deflist__dd>
-        <div .scrolltable>
-          <table .table.table--striped.table--hover.table--condensed>
-            <tr .table__row>
-              <th .table__th> Abschluss
-              <th .table__th> Studiengang
-              <th .table__th> Studienart
-              <th .table__th> Semester
-
-            $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies
-              <tr.table__row>
-                <td .table__td>
-                  $maybe name <- E.unValue degree
-                    #{display name}
-                  $nothing
-                    #{display degreeKey}
-                <td .table__td>
-                  $maybe name <- E.unValue field
-                    #{display name}
-                  $nothing
-                    #{display fieldKey}
-                <td .table__td>_{E.unValue fieldtype}
-                <td .table__td>#{display semester}
-
  ^{settingsForm}
--- a/templates/profileData.hamlet
+++ b/templates/profileData.hamlet
@ -1,9 +1,70 @@
-<div .container>
-  $if hasRows
-    <div .container>
-      <h2> Eigene Kurse
+<div .profile>
+
+  <dl .deflist.profile-dl>
+      <dt .deflist__dt> _{MsgName}
+      <dd .deflist__dd> ^{nameWidget userDisplayName userSurname}
+      $maybe matnr <- userMatrikelnummer
+        <dt .deflist__dt> _{MsgMatrikelNr}
+        <dd .deflist__dd> #{matnr}
+      <dt .deflist__dt> _{MsgEMail}
+      <dd .deflist__dd> #{display userEmail}
+      <dt .deflist__dt> _{MsgIdent}
+      <dd .deflist__dd> #{display userIdent}
+    $if not $ null admin_rights
+      <dt .deflist__dt> Administrator
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall (E.Value institute) <- admin_rights
+            <li .list-ul__item>
+              <a href=@{SchoolShowR $ SchoolKey institute}>
+                #{display institute}
+    $if not $ null lecturer_rights
+      <dt .deflist__dt> Lehrberechtigt
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall (E.Value institute) <- lecturer_rights
+            <li .list-ul__item>
+              <a href=@{SchoolShowR $ SchoolKey institute}>
+                #{display institute}
+    $if not $ null lecture_corrector
+      <dt .deflist__dt> Korrektor
+      <dd .deflist__dd>
+        <ul .list-ul>
+          $forall (E.Value tid, E.Value ssh, E.Value csh) <- lecture_corrector
+            <li .list-ul__item>
+              <a href=@{CourseR tid ssh csh CShowR}>#{display tid}-#{display ssh}-#{display csh}
+    $if not $ null studies
+      <dt .deflist__dt> Studiengänge
+      <dd .deflist__dd>
+        <div .scrolltable>
+          <table .table.table--striped.table--hover.table--condensed>
+            <tr .table__row>
+              <th .table__th> Abschluss
+              <th .table__th> Studiengang
+              <th .table__th> Studienart
+              <th .table__th> Semester
+
+            $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies
+              <tr.table__row>
+                <td .table__td>
+                  $maybe name <- E.unValue degree
+                    #{display name}
+                  $nothing
+                    #{display degreeKey}
+                <td .table__td>
+                  $maybe name <- E.unValue field
+                    #{display name}
+                  $nothing
+                    #{display fieldKey}
+                <td .table__td>_{E.unValue fieldtype}
+                <td .table__td>#{display semester}
+
+  <div .container>
+    $if hasRows
      <div .container>
-        ^{ownedCoursesTable}
+        <h2> Eigene Kurse
+        <div .container>
+          ^{ownedCoursesTable}

  <div .container>
    <h2> Kursanmeldungen