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

fix(icons): fix some botched icon definitions, for real

Browse Source
This commit is contained in:
Steffen Jost 2024-12-02 18:12:53 +01:00 committed by Sarah Vaupel
parent 6d583fe8c4
commit e53be8ddf9
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Handler/School/DayTasks.hs
View File

@ -501,7 +501,7 @@ mkDailyTable isAdmin ssh nd dcrs = getDayTutorials ssh (nd,nd) >>= \case
| primComp /= bookComp | primComp /= bookComp
, Just (unCompanyKey -> csh) <- primComp , Just (unCompanyKey -> csh) <- primComp
= cell (iconTooltip [whamlet|_{MsgAvsPrimaryCompany}: ^{companyWidget True (csh, csh, False)}|] = cell (iconTooltip [whamlet|_{MsgAvsPrimaryCompany}: ^{companyWidget True (csh, csh, False)}|]
(Just IconCompanyWarning) True) (Just IconCompany) True)
<> spacerCell <> spacerCell
<> bookLink <> bookLink
| otherwise = bookLink | otherwise = bookLink
@ -532,8 +532,8 @@ mkDailyTable isAdmin ssh nd dcrs = getDayTutorials ssh (nd,nd) >>= \case
, colUserNameModalHdr MsgCourseParticipant ForProfileDataR , colUserNameModalHdr MsgCourseParticipant ForProfileDataR
, colUserMatriclenr isAdmin , colUserMatriclenr isAdmin
, sortable (Just "card-no") (i18nCell MsgAvsCardNo) $ \(preview $ resultUserAvs . _userAvsLastCardNo . _Just -> cn :: Maybe AvsFullCardNo) -> cellMaybe (textCell . tshowAvsFullCardNo) cn , sortable (Just "card-no") (i18nCell MsgAvsCardNo) $ \(preview $ resultUserAvs . _userAvsLastCardNo . _Just -> cn :: Maybe AvsFullCardNo) -> cellMaybe (textCell . tshowAvsFullCardNo) cn
, colParticipantPermitField
, colParticipantEyeExamField , colParticipantEyeExamField
, colParticipantPermitField
, colParticipantNoteField , colParticipantNoteField
, colAttendanceField dday , colAttendanceField dday
, colAttendanceNoteField dday , colAttendanceNoteField dday
@ -674,6 +674,7 @@ postSchoolDayR ssh nd = do
memcachedByInvalidate (CacheKeySuggsParticipantNote ssh tid) $ Proxy @(OptionListCacheable Text) memcachedByInvalidate (CacheKeySuggsParticipantNote ssh tid) $ Proxy @(OptionListCacheable Text)
memcachedByInvalidate (CacheKeySuggsAttendanceNote ssh tid) $ Proxy @(OptionListCacheable Text) memcachedByInvalidate (CacheKeySuggsAttendanceNote ssh tid) $ Proxy @(OptionListCacheable Text)
-- audit log? Currently decided against. -- audit log? Currently decided against.
memcachedByInvalidate (CacheKeyTutorialCheckResults ssh nd) $ Proxy @DayCheckResults
addMessageI Success $ MsgTutorialParticipantsDayEdits dday addMessageI Success $ MsgTutorialParticipantsDayEdits dday
redirect $ SchoolR ssh $ SchoolDayR nd redirect $ SchoolR ssh $ SchoolDayR nd
@ -766,8 +767,8 @@ dcr2widget' mcn DayCheckResult{..} = mconcat [avsChk, apronChk, bookChk, permitC
avsChk = guardMonoid (not dcAvsKnown) $ mkTooltip IconUserUnknown (text2widget "AVS Abfrage fehlgeschlagen") avsChk = guardMonoid (not dcAvsKnown) $ mkTooltip IconUserUnknown (text2widget "AVS Abfrage fehlgeschlagen")
apronChk = guardMonoid (not dcApronAccess) $ mkTooltip IconUserBadge (text2widget "Kein gültiger Ausweis mit Vorfeld-Zugang gefunden") apronChk = guardMonoid (not dcApronAccess) $ mkTooltip IconUserBadge (text2widget "Kein gültiger Ausweis mit Vorfeld-Zugang gefunden")
bookChk = guardMonoid (not dcBookingFirmOk) $ mkTooltip IconCompanyWarning [whamlet|Für buchende Firma #{maybeMonoid mcn} liegt kein gültiger Ausweis vor|] bookChk = guardMonoid (not dcBookingFirmOk) $ mkTooltip IconCompanyWarning [whamlet|Für buchende Firma #{maybeMonoid mcn} liegt kein gültiger Ausweis vor|]
permitChk | isNothing dcEyeFitsPermit = mkTooltip IconGlasses (text2widget "Sehtest oder Führerschein fehlen noch") permitChk | isNothing dcEyeFitsPermit = mkTooltip IconFileMissing (text2widget "Sehtest oder Führerschein fehlen noch")
| dcEyeFitsPermit == Just False = mkTooltip IconFileMissing (text2widget "Sehtest und Führerschein passen nicht zusammen") | dcEyeFitsPermit == Just False = mkTooltip IconGlasses (text2widget "Sehtest und Führerschein passen nicht zusammen")
| otherwise = mempty | otherwise = mempty

12
src/Utils/Icon.hs
View File

@ -29,19 +29,13 @@ type WidgetSiteless = forall site. WidgetFor site ()
-- We collect all used icons here for an overview. -- We collect all used icons here for an overview.
-- For consistency, some conditional icons are also provided, having suffix True/False -- For consistency, some conditional icons are also provided, having suffix True/False
{- How to add icons:
- edit utils/rename-fa.json by adding "our-name": "fa-name"
- make sure to only use fontawesome v6.6.0 free icons
- delete directory node_modules
-}
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
-- IMPORTANT: -- IMPORTANT:
-- All icons must be manually registered within the following files: -- All icons must be manually registered within the following files:
-- - src/Utils/Icon.hs -- - src/Utils/Icon.hs
-- - assets/icon-src/fontawesome.json -- - assets/icon-src/fontawesome.json by adding "our-name": "fa-name"
-- - frontend/src/icons.scss -- - frontend/src/icons.scss by adding "our-name"
-- We only use fontawesome v6.6.0 free icons in regular and solid
--------------------------------------------------------------------------- ---------------------------------------------------------------------------
data Icon data Icon
= IconNew = IconNew