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

Merge branch '328-formular-zum-kontakt-mit-kursteilnehmern' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 328-formular-zum-kontakt-mit-kursteilnehmern

Browse Source
This commit is contained in:
Gregor Kleen 2019-04-16 15:38:39 +02:00
commit 28486657ea
3 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
messages/uniworx/de.msg
View File

@ -739,7 +739,7 @@ NavigationFavourites: Favoriten
CommSubject: Betreff
CommRecipients: Empfänger
CommDuplicateRecipients recipients@TextList: #{pluralDE (length recipients) "Doppelter" "Doppelte"} Empfänger: #{intercalate ", " recipients}
CommDuplicateRecipients n@Int: #{tshow n} #{pluralDE n "doppelter" "doppelte"} Empfänger ignoriert
CommSuccess n@Int: Nachricht wurde an #{tshow n} Empfänger versandt
CommCourseHeading: Kursmitteilung

34
src/Handler/Utils/Communication.hs
View File

@ -80,31 +80,35 @@ commR CommunicationRoute{..} = do
[ pure ( AddRecipientGroups
, Set.unions <$> apreq (multiSelectField . return $ mkOptionList
[ Option (mr g) (Set.fromList $ map (Right . entityKey . snd) recs) (toPathPiece g) | (g,recs) <- Map.toList suggestedRecipients ]
) ("" & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
) (fslI AddRecipientGroups & addName (nudge . toPathPiece $ AddRecipientGroups)) Nothing
)
, do
(g,recs) <- Map.toList suggestedRecipients
return ( AddRecipientGroup g
, Set.unions <$> apreq (multiSelectField . return $ mkOptionList
[ Option userDisplayName (Set.singleton $ Right rid) (toPathPiece cid) | (cid, Entity rid User{..}) <- recs ]
) ("" & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
) (fslI (AddRecipientGroup g) & addName (nudge . toPathPiece $ AddRecipientGroup g)) Nothing
)
, pure ( AddRecipientCustom
, Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField ("" & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
, Set.fromList . map (Left . CI.mk) <$> apreq multiEmailField (fslI AddRecipientCustom & addName (nudge $ toPathPiece AddRecipientCustom)) Nothing )
]
(addRes, addWdgt) <- multiActionM addOptions ("" & addName (nudge "select")) Nothing csrf
(addRes, addWdgt) <- multiActionM addOptions ("foobar" & addName (nudge "select")) Nothing csrf
-- lookupUserDisplayName :: UserId -> UserDisplayName
lookupUserDisplayName <- liftHandlerT . runDB $ do
let uids = toListOf (_FormSuccess . folded . _Right) addRes
names <- forM uids getJustEntity
return $ \uid -> case filter ((== uid) . entityKey) names of
[Entity _ User{..}] -> userDisplayName
_other -> error "UserId lookpup failed"
let addRes' = addRes <&> \newSet oldMap -> if
| collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
, not $ Set.null collisions ->
FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
| otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
-- lookupUserDisplayName <- liftHandlerT . runDB $ do
-- let uids = toListOf (_FormSuccess . folded . _Right) addRes
-- names <- forM uids getJustEntity
-- return $ \uid -> case filter ((== uid) . entityKey) names of
-- [Entity _ User{..}] -> userDisplayName
-- _other -> error "UserId lookpup failed"
let addRes' = addRes <&> \newSet oldMap ->
-- if
-- | collisions <- newSet `Set.intersection` Set.fromList (Map.elems oldMap)
-- , not $ Set.null collisions ->
-- -- FormFailure [ mr . MsgCommDuplicateRecipients . map (either CI.original lookupUserDisplayName) $ Set.toList collisions ]
-- FormFailure [ mr . MsgCommDuplicateRecipients $ Set.size collisions ]
-- | otherwise -> FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList newSet
let freshSet = newSet `Set.difference` Set.fromList (Map.elems oldMap)
in FormSuccess . Map.fromList . zip [maybe 0 (succ . fst) (Map.lookupMax oldMap)..] $ Set.toList freshSet
addWdgt' = mconcat [ toWidget csrf, addWdgt, fvInput submitView ]
return (addRes', addWdgt')

6
static/js/utils/asyncTable.js
View File

@ -135,7 +135,7 @@
if (tableFilterForm) {
gatherTableFilterInputs(tableFilterForm);
addTableFilterEventListeners();
addTableFilterEventListeners(tableFilterForm);
}
}
@ -157,7 +157,7 @@
});
}
function addTableFilterEventListeners() {
function addTableFilterEventListeners(tableFilterForm) {
tableFilterInputs.search.forEach(function(input) {
var debouncedInput = debounce(function() {
if (input.value.length === 0 || input.value.length > 2) {
@ -188,7 +188,7 @@
});
});
element.addEventListener('submit', function(event) {
tableFilterForm.addEventListener('submit', function(event) {
event.preventDefault();
updateFromTableFilter();
});