Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX

ChangeLog.md

@@ -1,3 +1,7 @@
+  * Version 30.01.2019
+  
+    Designänderungen
+
   * Version 16.01.2019
 
     Links für Bequemlichkeiten hinzugefügt (z.B. aktuelles Übungsblatt)

src/Handler/Utils.hs

@@ -69,3 +69,8 @@ warnTermDays tid times = do
   forM_ warnholidays  $ warnI MsgDayIsAHoliday
   forM_ outoflecture  $ warnI MsgDayIsOutOfLecture
   forM_ outoftermdays $ warnI MsgDayIsOutOfTerm
+
+visibleWidget :: Bool -> Widget
+-- ^ @visibleWidget False@ is an icon that denotes that something™ is not visible
+visibleWidget True = mempty
+visibleWidget False = [whamlet|<i .fas .fa-eye-slash>|]

src/Handler/Utils/Submission.hs

@@ -130,7 +130,9 @@ assignSubmissions sid restriction = do
           props = getSum $ foldMap (Sum . fst) assignments
 
           toDeficit' (prop, assigned) = let
-              target = round $ fromInteger assigned' * (prop / props)
+              target
+                | props == 0 = 0
+                | otherwise  = round $ fromInteger assigned' * (prop / props)
             in target - assigned
 
     $logDebugS "assignSubmissions" $ "Previous submissions: " <> tshow prevSubs'

templates/adminTest.hamlet

@@ -36,3 +36,5 @@
       ^{modal "Klick mich für Content-Test" (Right "Test Inhalt für Modal")}
     <li>
       ^{modal "Email-Test" (Right emailWidget')}
+    <li>
+      ^{visibleWidget False}