fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source 
Fixes #322
This commit is contained in:
Gregor Kleen 2019-03-26 23:09:31 +01:00
parent 31f635793d
commit 4a77be4f3c
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
messages/uniworx/de.msg
View File

@ -446,6 +446,7 @@ RedundantCandidatesRemoved n@Int: #{show n} bereits #{pluralDE n "bekannter Kand
CandidatesInferred n@Int: #{show n} neue #{pluralDE n "Studiengangszuordnung" "Studiengangszuordnungen"} inferiert CandidatesInferred n@Int: #{show n} neue #{pluralDE n "Studiengangszuordnung" "Studiengangszuordnungen"} inferiert
NoCandidatesInferred: Keine neuen Studienganszuordnungen inferiert NoCandidatesInferred: Keine neuen Studienganszuordnungen inferiert
StudyTermIsNew: Neu StudyTermIsNew: Neu
StudyFeatureConflict: Es wurden Konflikte in der Studiengang-Zuordnung gefunden
MailTestFormEmail: Email-Addresse MailTestFormEmail: Email-Addresse
MailTestFormLanguages: Spracheinstellungen MailTestFormLanguages: Spracheinstellungen

26
src/Handler/Admin.hs
View File

@ -288,24 +288,28 @@ postAdminFeaturesR = do
, formSubmit = FormNoSubmit , formSubmit = FormNoSubmit
} }
(infConflicts,infAccepted) <- case btnResult of (infConflicts,infAccepted) <- case btnResult of
(FormSuccess ButtonInferStudyTerms) -> do FormSuccess ButtonInferStudyTerms -> do
(infConflicts,infAmbiguous,infRedundant,infAccepted) <- Candidates.inferHandler (infConflicts, infAmbiguous, infRedundant, infAccepted) <- Candidates.inferHandler
unless (null infAmbiguous) $ addMessageI Info $ MsgAmbiguousCandidatesRemoved $ length infAmbiguous unless (null infAmbiguous) . addMessageI Info . MsgAmbiguousCandidatesRemoved $ length infAmbiguous
unless (null infRedundant) $ addMessageI Info $ MsgRedundantCandidatesRemoved $ length infRedundant unless (null infRedundant) . addMessageI Info . MsgRedundantCandidatesRemoved $ length infRedundant
if null infAccepted if
then addMessageI Info MsgNoCandidatesInferred | null infAccepted
else addMessageI Success $ MsgCandidatesInferred $ length infAccepted -> addMessageI Info MsgNoCandidatesInferred
return (infConflicts,infAccepted) | otherwise
_other -> (,[]) <$> runDB Candidates.conflicts -> addMessageI Success . MsgCandidatesInferred $ length infAccepted
unless (null infConflicts) $ addMessage Warning "KONFLIKTE vorhanden" --TODO i18n return (infConflicts, infAccepted)
_other -> (, []) <$> runDB Candidates.conflicts
( (degreeResult,degreeTable) ( (degreeResult,degreeTable)
, (studyTermsResult,studytermsTable) , (studyTermsResult,studytermsTable)
, ((),candidateTable)) <- runDB $ (,,) , ((), candidateTable)) <- runDB $ (,,)
<$> mkDegreeTable <$> mkDegreeTable
<*> mkStudytermsTable (Set.fromList $ map (StudyTermsKey' . fst) infAccepted) <*> mkStudytermsTable (Set.fromList $ map (StudyTermsKey' . fst) infAccepted)
<*> mkCandidateTable <*> mkCandidateTable
-- This needs to happen after calls to `dbTable` so they can short-circuit correctly
unless (null infConflicts) $ addMessageI Warning MsgStudyFeatureConflict
let degreeResult' :: FormResult (Map (Key StudyDegree) (Maybe Text, Maybe Text)) let degreeResult' :: FormResult (Map (Key StudyDegree) (Maybe Text, Maybe Text))
degreeResult' = degreeResult <&> getDBFormResult degreeResult' = degreeResult <&> getDBFormResult
(\row -> ( row ^. _dbrOutput . _entityVal . _studyDegreeName (\row -> ( row ^. _dbrOutput . _entityVal . _studyDegreeName