diff --git a/src/Handler/School/DayTasks.hs b/src/Handler/School/DayTasks.hs index 584654635..295dc703a 100644 --- a/src/Handler/School/DayTasks.hs +++ b/src/Handler/School/DayTasks.hs @@ -501,7 +501,7 @@ mkDailyTable isAdmin ssh nd dcrs = getDayTutorials ssh (nd,nd) >>= \case | primComp /= bookComp , Just (unCompanyKey -> csh) <- primComp = cell (iconTooltip [whamlet|_{MsgAvsPrimaryCompany}: ^{companyWidget True (csh, csh, False)}|] - (Just IconCompanyWarning) True) + (Just IconCompany) True) <> spacerCell <> bookLink | otherwise = bookLink @@ -532,8 +532,8 @@ mkDailyTable isAdmin ssh nd dcrs = getDayTutorials ssh (nd,nd) >>= \case , colUserNameModalHdr MsgCourseParticipant ForProfileDataR , colUserMatriclenr isAdmin , sortable (Just "card-no") (i18nCell MsgAvsCardNo) $ \(preview $ resultUserAvs . _userAvsLastCardNo . _Just -> cn :: Maybe AvsFullCardNo) -> cellMaybe (textCell . tshowAvsFullCardNo) cn - , colParticipantPermitField , colParticipantEyeExamField + , colParticipantPermitField , colParticipantNoteField , colAttendanceField dday , colAttendanceNoteField dday @@ -674,6 +674,7 @@ postSchoolDayR ssh nd = do memcachedByInvalidate (CacheKeySuggsParticipantNote ssh tid) $ Proxy @(OptionListCacheable Text) memcachedByInvalidate (CacheKeySuggsAttendanceNote ssh tid) $ Proxy @(OptionListCacheable Text) -- audit log? Currently decided against. + memcachedByInvalidate (CacheKeyTutorialCheckResults ssh nd) $ Proxy @DayCheckResults addMessageI Success $ MsgTutorialParticipantsDayEdits dday 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") 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|] - permitChk | isNothing dcEyeFitsPermit = mkTooltip IconGlasses (text2widget "Sehtest oder Führerschein fehlen noch") - | dcEyeFitsPermit == Just False = mkTooltip IconFileMissing (text2widget "Sehtest und Führerschein passen nicht zusammen") + permitChk | isNothing dcEyeFitsPermit = mkTooltip IconFileMissing (text2widget "Sehtest oder Führerschein fehlen noch") + | dcEyeFitsPermit == Just False = mkTooltip IconGlasses (text2widget "Sehtest und Führerschein passen nicht zusammen") | otherwise = mempty diff --git a/src/Utils/Icon.hs b/src/Utils/Icon.hs index 8ca8485ce..aa7576c22 100644 --- a/src/Utils/Icon.hs +++ b/src/Utils/Icon.hs @@ -29,19 +29,13 @@ type WidgetSiteless = forall site. WidgetFor site () -- We collect all used icons here for an overview. -- 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: -- All icons must be manually registered within the following files: -- - src/Utils/Icon.hs --- - assets/icon-src/fontawesome.json --- - frontend/src/icons.scss +-- - assets/icon-src/fontawesome.json by adding "our-name": "fa-name" +-- - frontend/src/icons.scss by adding "our-name" +-- We only use fontawesome v6.6.0 free icons in regular and solid --------------------------------------------------------------------------- data Icon = IconNew