minor refactor

src/Handler/Firm.hs

@@ -298,7 +298,7 @@ mkFirmAllTable isAdmin uid = do
                 )
             )
           , single ("foreign-supervisor", FilterColumn $ \row (getLast -> criterion) -> 
-              -- let checkSuper = do
+              -- let checkSuper = do -- expensive
               --       usrSpr <- E.from $ E.table @UserSupervisor
               --       E.where_ $ E.notExists (do
               --           spr <- E.from $  E.table @UserCompany

src/Handler/Utils/Communication.hs

@@ -239,25 +239,27 @@ commR CommunicationRoute{..} =  do
   recipientsListMsg <- messageI Info MsgCommRecipientsList
 
   $logWarnS "COMM" "Communication handler some definitions done"
-  attachmentsMaxSize <- getsYesod $ view _appCommunicationAttachmentsMaxSize
+  -- attachmentsMaxSize <- getsYesod $ view _appCommunicationAttachmentsMaxSize
-  let attachmentField = genericFileField $ return FileField
+  -- let attachmentField = genericFileField $ return FileField
-        { fieldIdent = Nothing
+  --       { fieldIdent = Nothing
-        , fieldUnpackZips = FileFieldUserOption True False
+  --       , fieldUnpackZips = FileFieldUserOption True False
-        , fieldMultiple = True
+  --       , fieldMultiple = True
-        , fieldRestrictExtensions = Nothing
+  --       , fieldRestrictExtensions = Nothing
-        , fieldAdditionalFiles = _FileReferenceFileReferenceTitleMap # Map.empty
+  --       , fieldAdditionalFiles = _FileReferenceFileReferenceTitleMap # Map.empty
-        , fieldMaxFileSize = Nothing, fieldMaxCumulativeSize = attachmentsMaxSize
+  --       , fieldMaxFileSize = Nothing, fieldMaxCumulativeSize = attachmentsMaxSize
-        , fieldAllEmptyOk = True
+  --       , fieldAllEmptyOk = True
-        }
+  --       }
   $logWarnS "COMM" "Communication handler some parameters done"   -- SEEN
   ((commRes,commWdgt),commEncoding) <- runFormPost . identifyForm FIDCommunication . withButtonForm' universeF . renderAForm FormStandard $ Communication
     <$> recipientAForm
     <*  aformMessage recipientsListMsg
-    <*> ( CommunicationContent
+    <*> (pure (CommunicationContent (Just "subject") (text2Html "body") Set.empty) :: AForm Handler CommunicationContent)   
-            <$> aopt textField (fslI MsgCommSubject & addAttr "uw-enter-as-tab" "") Nothing
+    -- <*> ( CommunicationContent
-            <*> (markupOutput <$> areq htmlField (fslI MsgCommBody) Nothing)
+    --         <$> aopt textField (fslI MsgCommSubject & addAttr "uw-enter-as-tab" "") Nothing
-            <*> fmap fold (aopt (convertFieldM (runConduit . (.| C.foldMap Set.singleton)) yieldMany attachmentField) (fslI MsgCommAttachments & setTooltip MsgCommAttachmentsTip) Nothing)
+    --         <*> (markupOutput <$> areq htmlField (fslI MsgCommBody) Nothing)
-        )  
+    --         <*> fmap fold (aopt (convertFieldM (runConduit . (.| C.foldMap Set.singleton)) yieldMany attachmentField) 
+    --                           (fslI MsgCommAttachments & setTooltip MsgCommAttachmentsTip) Nothing)
+    --     )  
   $logWarnS "COMM" "Communication handler run form post done"   -- NOT SEEN ANYMORE
   formResult commRes $ \case
     (comm, BtnCommunicationSend) -> do

src/Jobs/Handler/SendNotification/Qualification.hs

@@ -81,7 +81,7 @@ dispatchNotificationQualificationExpired nQualification jRecipient = do
               $logInfoS  "LMS" $ "Notified " <> tshow encRecipient <> " about expired qualification " <> qname
             else
               $logErrorS "LMS" $ "Failed to notify " <> tshow encRecipient <> " about expired qualification " <> qname
-        else  $logErrorS "LMS" $ "Suppressed repeated notification " <> tshow encRecipient <> " about expired qualification " <> qname
+        else  $logInfoS  "LMS" $ "Suppressed repeated notification " <> tshow encRecipient <> " about expired qualification " <> qname
     _ ->  $logErrorS "LMS" $ "Failed to notify " <> tshow encRecipient <> " about expired qualification " <> tshow nQualification