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

messages/uniworx/de.msg

@@ -439,6 +439,8 @@ AccessibleSince: Verfügbar seit
 
 
 Corrected: Korrigiert
+CorrectionAchievedPoints: Erzielte Punkte
+CorrectionAchievedPass: Bestanden
 FileCorrected: Korrigiert (Dateien)
 FileCorrectedDeleted: Korrigiert (gelöscht)
 RatingUpdated: Korrektur gespeichert

src/Handler/Corrections.hs

@@ -1062,17 +1062,13 @@ assignHandler tid ssh csh rawSids = do
   -- process form
   currentRoute <- getCurrentRoute
   ((btnResult, btnWdgt), btnEnctype) <- runFormPost $ identifyForm FIDAssignSubmissions buttonForm
-  assignmentStatus <- case btnResult of
-      FormSuccess BtnSubmissionsAssign -> do -- Button was pressed, assign and report
-          -- Assign submissions
-          runDB $ (\f -> foldM f Map.empty sids) $
-            \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
-          -- Too much important information for an alert. Display proper info page instead
-      other -> do
-          formFailure2Alerts other -- show possible allerts
-          return Map.empty -- no assignments performed
+  assignmentStatus <- fmap (fromMaybe Map.empty) . formResultMaybe btnResult $ \BtnSubmissionsAssign ->
+      -- Assign submissions
+      fmap Just . runDB $ (\f -> foldM f Map.empty sids) $
+        \acc sid -> flip (Map.insert sid) acc <$> assignSubmissions sid Nothing
+      -- Too much important information for an alert message. Display proper info page instead
   let btnForm = wrapForm btnWdgt def
-                { formAction = SomeRoute <$> currentRoute
+                { formAction = SomeRoute <$> currentRoute -- TODO: should be a modal route
                 , formEncoding = btnEnctype
                 , formSubmit = FormNoSubmit
                 }

templates/widgets/grading-summary/grading-summary.hamlet

@@ -15,11 +15,11 @@ $# --
         <th>
           $# empty cell for row headers
         $maybe _ <- hasMarkedPasses
-          <th .table__th colspan=2>_{MsgCorrected}
+          <th .table__th colspan=2>_{MsgCorrectionAchievedPass}
         $maybe _ <- hasPasses
           <th .table__th>_{MsgSheetGradingPassing'}
         $maybe _ <- hasMarkedPoints
-          <th .table__th colspan=2>_{MsgCorrected}
+          <th .table__th colspan=2>_{MsgCorrectionAchievedPoints}
         $maybe _ <- hasPoints
           <th .table__th>_{MsgSheetGradingPoints'}
         <th .table__th>_{MsgSheetGradingCount'}