chore(firm): add switch supervisor status

messages/uniworx/categories/firm/de-de-formal.msg

@@ -16,7 +16,7 @@ FirmActResetSuperKeep: Bisherige Ansprechpartner der Firmenangehörigen zusätzl
 FirmActResetMutualSupervision: Ansprechpartner beaufsichtigen sich gegenseitig
 FirmActAddSupersvisors: Ansprechpartner hinzufügen
 FirmActAddSupersEmpty: Es konnten keine Ansprechpartner hinzugefügt werden
-FirmActAddSupersSet n@Int64 postal@(Maybe Bool): #{n} Standardansprechpartner eingetragen #{maybeBoolMessage postal "" "und auf Briefversand geschaltet" "und Benachrichtigungen per Email gesetzt"}, aber nicht nicht aktiviert.
+FirmActAddSupersSet n@Int64 postal@(Maybe Bool): #{n} Standardansprechpartner geändert #{maybeBoolMessage postal "" "und auf Briefversand geschaltet" "und Benachrichtigungen per Email gesetzt"}, aber nicht nicht aktiviert.
 RemoveSupervisors ndef@Int64 nact@Int64: #{ndef} Standard Ansprechpartner entfernt#{bool ", aber noch nicht deaktiviert" (", " <> tshow nact <> " aktive Ansprechpartnerbeziehungen gelöscht") (nact > 0)}
 FirmActChangeContactUser: Kontaktinformationen von allen Firmenangehörigen ändern
 FirmActChangeContactFirm: Kontaktinformationen der Firma ändern
@@ -32,7 +32,9 @@ FirmUserActMkSuper: Zum Firmenansprechpartner ernennen
 FirmUserActChangeContact: Kontaktinformationen für ausgewählte Firmenangehörige ändern
 FirmResetSupervision rem@Int64 set@Int64: #{tshow set} Ansprechpartner gesetzt#{bool mempty (", " <> tshow rem <> " zuvor gelöscht") (rem > 0)}
 FirmSuperActNotify: Mitteilung versenden
-FirmSuperActRMSuperDef: Standard Firmenansprechpartner entfernen
+FirmSuperActSwitchSuper: Standard Firmenansprechpartner abändern
+FirmSuperActSwitchSuperInfo: Betrifft keine firmenfremden Ansprechpartner und ändert keine aktiven individuellen Ansprechpartnerbeziehungen. Gegebenfalls im Anschluss die Funktion "Ansprechpartner auf Firmenstandard zurücksetzen" nutzen.
+FirmSuperActRMSuperDef: Firmenansprechpartner entfernen
 FirmSuperActRMSuperActive: Auch aktive Ansprechpartnerbeziehungen innerhalb dieser Firma beenden
 FirmsNotification: Firmen E-Mail versenden
 FirmNotification fsh@CompanyShorthand: E-Mail an #{fsh} senden

messages/uniworx/categories/firm/en-eu.msg

@@ -16,7 +16,7 @@ FirmActResetSuperKeep: Additionally keep existing supervisors of company associa
 FirmActResetMutualSupervision: Supervisors supervise each other
 FirmActAddSupersvisors: Add supervisors
 FirmActAddSupersEmpty: No supervisors added
-FirmActAddSupersSet n postal: #{n} default company supervisors set #{maybeBoolMessage postal "" "and switched to postal notifications" "and switched to email notifications"}, but not yet activated.
+FirmActAddSupersSet n postal: #{n} default company supervisors changed #{maybeBoolMessage postal "" "and switched to postal notifications" "and switched to email notifications"}, but not yet activated.
 RemoveSupervisors ndef nact: #{ndef} default supervisors removed#{bool ", but not yet deactivated" (" and " <> tshow nact <> " active supervisions terminated") (nact > 0)}
 FirmActChangeContactUser: Change contact data for all company associates
 FirmActChangeContactFirm: Change company contact data
@@ -32,7 +32,9 @@ FirmResetSupervision rem set: #{tshow set} supervisors set#{bool mempty (", " <>
 FirmUserActChangeContact: Change contact data for selected company associates
 FirmUserActMkSuper: Mark as company supervisor
 FirmSuperActNotify: Send message
-FirmSuperActRMSuperDef: Remove as default supervisor
+FirmSuperActSwitchSuper: Change default company supervisor
+FirmSuperActSwitchSuperInfo: Does not affect company-external supervisors and does not change any active individal supervisions. Additionally use reset action, if desired.
+FirmSuperActRMSuperDef: Remove default supervisor
 FirmSuperActRMSuperActive: Also remove active supervisions within this company
 FirmsNotification: Send company notification e-mail
 FirmNotification fsh: Send e-mail to #{fsh}

src/Handler/Firm.hs

@@ -913,6 +913,7 @@ postFirmUsersR fsh = do
 -- Firm Supervisors Table
 
 data FirmSuperAction = FirmSuperActNotify
+                     | FirmSuperActSwitchSuper
                      | FirmSuperActRMSuperDef
 
   deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic)
@@ -922,6 +923,10 @@ nullaryPathPiece ''FirmSuperAction $ camelToPathPiece' 3
 embedRenderMessage ''UniWorX ''FirmSuperAction id
 
 data FirmSuperActionData = FirmSuperActNotifyData
+                         | FirmSuperActSwitchSuperData 
+                            { firmSuperActSwitchSuper   :: Maybe Bool
+                            , firmSuperActSwitchReroute :: Maybe Bool
+                            }
                          | FirmSuperActRMSuperDefData
                             { firmSuperActRMSuperActive :: Maybe Bool }
 
@@ -968,6 +973,7 @@ instance HasUser SuperCompanyTableData where
 
 mkFirmSuperTable :: Bool -> CompanyId -> DB (FormResult (FirmSuperActionData, Set UserId), Widget)
 mkFirmSuperTable isAdmin cid = do
+  msgSupervisorUnchanged <- messageI Info MsgFirmSuperActSwitchSuperInfo
   let
     -- fsh = unCompanyKey cid
     resultDBTable = DBTable{..}
@@ -1032,6 +1038,10 @@ mkFirmSuperTable isAdmin cid = do
         acts :: Map FirmSuperAction (AForm Handler FirmSuperActionData)
         acts = mconcat
           [ guardMonoid isAdmin $ singletonMap FirmSuperActNotify $ pure FirmSuperActNotifyData
+          , singletonMap FirmSuperActSwitchSuper $ FirmSuperActSwitchSuperData
+              <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgTableIsDefaultSupervisor)  (Just $ Just True)
+              <*> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgTableIsDefaultReroute)     (Nothing)
+              <*  aformMessage msgSupervisorUnchanged
           , singletonMap FirmSuperActRMSuperDef $ FirmSuperActRMSuperDefData
               <$> aopt checkBoxField (fslI MsgFirmSuperActRMSuperActive) (Just $ Just True)
           ]
@@ -1079,7 +1089,7 @@ postFirmSupersR fsh = do
     (FirmSuperActRMSuperDefData{..}, Set.toList -> uids) -> do
       (nrRmSuper,nrRmActual) <- runDB $ (,)
         <$> updateWhereCount [UserCompanyUser <-. uids, UserCompanyCompany ==. cid] [UserCompanySupervisor =. False, UserCompanySupervisorReroute =. False]
-        <*> if firmSuperActRMSuperActive /= Just True
+        <*> if firmSuperActRMSuperActive /= Just True 
               then return 0
               else E.deleteCount $ do
                 spr <- E.from $ E.table @UserSupervisor
@@ -1091,7 +1101,14 @@ postFirmSupersR fsh = do
                     )
       addMessageI Info $ MsgRemoveSupervisors nrRmSuper nrRmActual
       reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes
-
+    (FirmSuperActSwitchSuperData{..}, Set.toList -> uids) -> do
+      let fltrSpr = guardMonoid (isNothing firmSuperActSwitchSuper) [UserCompanySupervisor ==. True]
+          changes = maybeEmpty firmSuperActSwitchSuper   (pure . (UserCompanySupervisor        =.))
+                 <> guardMonoid (firmSuperActSwitchSuper /= Just False || firmSuperActSwitchReroute == Just False) (
+                    maybeEmpty firmSuperActSwitchReroute (pure . (UserCompanySupervisorReroute =.)))
+      nrSuperChanges <- runDB $ updateWhereCount (fltrSpr <> [UserCompanyUser <-. uids, UserCompanyCompany ==. cid]) changes
+      addMessageI Info $ MsgFirmActAddSupersSet nrSuperChanges Nothing
+      reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes
     (FirmSuperActNotifyData    , uids) -> do
       cuids <- traverse encrypt $ Set.toList uids :: Handler [CryptoUUIDUser]
       redirect (FirmCommR fsh, [(toPathPiece GetRecipient, toPathPiece cID) | cID <- cuids])