feat(course-visibility): account for visibility on AShowR

src/Handler/Allocation/Show.hs

@@ -3,6 +3,9 @@ module Handler.Allocation.Show
   ) where
 
 import Import
+
+import Utils.Course
+
 import Handler.Utils
   
 import Handler.Allocation.Register
@@ -39,6 +42,7 @@ getAShowR tid ssh ash = do
         E.&&. courseApplication E.?. CourseApplicationAllocation E.==. E.just (E.just $ E.val aId)
       E.on $ allocationCourse E.^. AllocationCourseCourse E.==. course E.^. CourseId
       E.where_ $ allocationCourse E.^. AllocationCourseAllocation E.==. E.val aId
+        E.&&. mayViewCourse muid now course
       E.orderBy [E.asc $ course E.^. CourseName]
       let hasTemplate = E.exists . E.from $ \courseAppInstructionFile ->
             E.where_ $ courseAppInstructionFile E.^. CourseAppInstructionFileCourse E.==. course E.^. CourseId
@@ -73,12 +77,14 @@ getAShowR tid ssh ash = do
     setTitleI shortTitle
 
     let courseWidgets = flip map courses $ \cEntry -> do
-          let Entity cid Course{..}  = cEntry ^. resultCourse
+          let Entity cid c@Course{..} = cEntry ^. resultCourse
               hasApplicationTemplate  = cEntry ^. resultHasTemplate
               mApp                    = cEntry ^? resultCourseApplication
               isRegistered            = cEntry ^. resultIsRegistered
+              courseVisible           = courseIsVisible' now c
           cID <- encrypt cid :: WidgetFor UniWorX CryptoUUIDCourse
           mayApply <- hasWriteAccessTo . AllocationR tid ssh ash $ AApplyR cID
+          mayEdit <- hasWriteAccessTo $ CourseR tid ssh courseShorthand CEditR
           isLecturer <- hasWriteAccessTo $ CourseR courseTerm courseSchool courseShorthand CEditR
           mApplyFormView <- liftHandler . for muid $ \uid -> generateFormPost . applicationForm (Just aId) cid uid $ ApplicationFormMode True mayApply isLecturer
           tRoute <- case mApp of

templates/allocation/show/course.hamlet

@@ -12,6 +12,8 @@ $if is _Just muid
       _{MsgAllocationNoApplication}
 <a .allocation-course__name href=@{CourseR courseTerm courseSchool courseShorthand CShowR} target="_blank">
   #{courseName}
+  $if not courseVisible && mayEdit
+    \ #{iconInvisible}
 $if hasApplicationTemplate || is _Just courseApplicationsInstructions
   <div .allocation-course__instructions-label .allocation__label>
     _{MsgCourseApplicationInstructionsApplication}