course user info shows study terms and matriclenr

models/courses

@@ -51,7 +51,7 @@ CourseParticipant                      -- course enrolement
 CourseUserNote                 -- lecturers of a specific course may share a text note on each enrolled student
     course       CourseId
     user         UserId
-    note         Text          -- arbitrary user-defined text; visible only to lecturer of this course
+    note         Html          -- arbitrary user-defined text; visible only to lecturer of this course
     UniqueCourseUserNote user course
 CourseUserNoteEdit             -- who edited a participants course note when
     user         UserId

src/Handler/Course.hs

@@ -29,6 +29,7 @@ import qualified Data.Map as Map
 
 import qualified Database.Esqueleto as E
 
+import Text.Blaze.Html.Renderer.Text (renderHtml)
 
 -- NOTE: Outdated way to use dbTable; see ProfileDataR Handler for a more recent method.
 type CourseTableData = DBRow (Entity Course, Int, Bool, Entity School)
@@ -835,9 +836,11 @@ postCUserR tid ssh csh uCId = do
   dozentId <- requireAuthId
   uid <- decrypt uCId
   -- DB reads
-  (cid, User{..}, thisUniqueNote, noteText, noteEdits ) <- runDB $ do
+  (cid, User{..}, thisUniqueNote, noteText, noteEdits, studies ) <- runDB $ do
     cid  <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    -- Abfrage Benutzerdaten
     user <- get404 uid
+    -- Abfrage Teilnehmernotiz
     let thisUniqueNote = UniqueCourseUserNote uid cid
     mbNoteEnt <- getBy thisUniqueNote
     (noteText,noteEdits) <- case mbNoteEnt of
@@ -850,7 +853,14 @@ postCUserR tid ssh csh uCId = do
           E.limit 1 -- more will be shown, if changed here
           return (edit E.^. CourseUserNoteEditTime, usr E.^. UserEmail, usr E.^. UserDisplayName, usr E.^. UserSurname)
         return (Just courseUserNoteNote, $(unValueN 4) <$> noteEdits)
-    return (cid,user,thisUniqueNote,noteText,noteEdits)
+    -- Abfrage Studiengänge
+    studies <- 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  (studyfeat, studydegree, studyterms)
+
+    return (cid,user,thisUniqueNote,noteText,noteEdits,studies)
   let editByWgt = [whamlet|
           $forall (etime,_eemail,ename,_esurname) <- noteEdits
             <br>
@@ -858,32 +868,67 @@ postCUserR tid ssh csh uCId = do
         |] -- _{MsgLastEdit} ^{formatTimeW SelFormatDateTime etime} ^{nameWidget ename esurname}
 
   ((noteRes, noteView), noteEnctype) <- runFormPost . identifyForm FIDcUserNote . renderAForm FormStandard $
-      (aopt (annotateField editByWgt textField) (fslpI MsgCourseUserNote "Text" & setTooltip MsgCourseUserNoteTooltip) $ Just noteText)
+      (aopt (annotateField editByWgt htmlField') (fslpI MsgCourseUserNote "Html" & setTooltip MsgCourseUserNoteTooltip) $ Just noteText)
       <*  submitButton
   formResult noteRes $ \mbNote -> (do
-    let note = foldMap id mbNote -- Maybe Text to maybe empty Text
     now <- liftIO getCurrentTime
-    if null note
+    case mbNote of
-      then do
+      Nothing -> do
         runDB $ do
           -- must delete all edits due to foreign key constraints, which does not make sense -> refactor!
           maybeM (return ()) (\nk -> deleteWhere [CourseUserNoteEditNote ==. nk]) (getKeyBy thisUniqueNote)
           deleteBy thisUniqueNote
         addMessageI Info MsgCourseUserNoteDeleted
-      else do
+        redirect currentRoute -- reload page after post
+      _ | (renderHtml <$> mbNote) == (renderHtml <$> noteText) -> return() -- no changes
+      (Just note) -> do
         runDB $ do
           (Entity noteKey _) <- upsertBy thisUniqueNote (CourseUserNote cid uid note) [CourseUserNoteNote =. note]
           void . insert $ CourseUserNoteEdit dozentId now noteKey
         addMessageI Success MsgCourseUserNoteSaved
+        redirect currentRoute -- reload page after post
     )
 
 
-
   -- USE src/utils/Form.formResult
   defaultLayout -- TODO
     [whamlet|
       <h2>^{nameWidget userDisplayName userSurname}
-      #{mailtoHtml userEmail}
+      <section>
+        <div .profile>
+          <dl .deflist.profile-dl>
+              <dt .deflist__dt> _{MsgEMail}
+              <dd .deflist__dd> #{mailtoHtml userEmail}
+              <dt .deflist__dt> _{MsgMatrikelNr}
+              <dd .deflist__dd>
+                $maybe matnr <- userMatrikelnummer
+                  #{matnr}
+                $nothing
+                  Keine eingetragene Matrikelnummer
+              <dt .deflist__dt> Studiengänge
+              <dd .deflist__dd>
+                $if null studies
+                  Nicht eingeschrieben
+                $else
+                  <div .scrolltable>
+                    <table .table.table--striped.table--hover.table--condensed>
+                      <tr .table__row>
+                        <th .table__th> Studiengang
+                        <th .table__th> Abschluss
+                        <th .table__th> Studienart
+                        <th .table__th> Semester
+                        <th .table__th> Aktiv
+                        <th .table__th> Update
+                      $forall ((Entity _ StudyFeatures{..}), (Entity _ degree), (Entity _ field)) <- studies
+                        $with _ <- notUsedT studyFeaturesUser
+                        <tr.table__row>
+                          <td .table__td>_{field}#{notUsedT studyFeaturesField}
+                          <td .table__td>_{degree}#{notUsedT studyFeaturesDegree}
+                          <td .table__td>_{studyFeaturesType}
+                          <td .table__td>#{display studyFeaturesSemester}
+                          <td .table__td>#{hasTickmark studyFeaturesValid}
+                          <td .table__td>^{formatTimeW SelFormatDate studyFeaturesUpdated}
+
       <section>
         <a id="note-form">
         <form method=post action=@{currentRoute}#note-form enctype=#{noteEnctype}>

templates/profileData.hamlet

@@ -7,7 +7,7 @@
         <dt .deflist__dt> _{MsgMatrikelNr}
         <dd .deflist__dd> #{matnr}
       <dt .deflist__dt> _{MsgEMail}
-      <dd .deflist__dd> #{display userEmail}
+      <dd .deflist__dd> #{mailtoHtml userEmail}
       <dt .deflist__dt> _{MsgIdent}
       <dd .deflist__dd> #{display userIdent}
       <dt .deflist__dt> _{MsgLastLogin}
@@ -52,7 +52,6 @@
               <th .table__th> Aktiv
               <th .table__th> Update
 
-
             $forall ((Entity _ StudyFeatures{..}), (Entity _ degree), (Entity _ field)) <- studies
               $with _ <- notUsedT studyFeaturesUser
               <tr.table__row>