From 47c97652f2cd5435091f2d6063ea18c0a06bfc99 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 18 Sep 2018 17:16:17 +0200
Subject: [PATCH] Show degree & field number, if no name is available

---
 src/Handler/Profile.hs   | 12 ++++++++----
 templates/profile.hamlet | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 701f3ea4e..649c748ae 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -130,10 +130,14 @@ getProfileR = 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
-                        ,studyterms  E.^. StudyTermsName
-                        ,studyfeat   E.^. StudyFeaturesType
-                        ,studyfeat   E.^. StudyFeaturesSemester)
+                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
diff --git a/templates/profile.hamlet b/templates/profile.hamlet
index f5bfae509..2da1c9c78 100644
--- a/templates/profile.hamlet
+++ b/templates/profile.hamlet
@@ -48,12 +48,20 @@
               <th .table__th> Studienart
               <th .table__th> Semester
 
-            $forall (degree,field,fieldtype,semester) <- studies
+            $forall ((degree, degreeKey),(field, fieldKey),fieldtype,semester) <- studies
               <tr.table__row>
-                <td .table__td> #{display degree}
-                <td .table__td> #{display field}
-                <td .table__td> #{display fieldtype}
-                <td .table__td> #{display semester}
+                <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>#{display fieldtype}
+                <td .table__td>#{display semester}
 
     $if not $ null participant
       <dt .deflist__dt> Teilnehmer