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

chore(avs): add end day for problem resolve in FRADrive

Browse Source
This commit is contained in:
Steffen Jost 2022-12-16 18:43:34 +01:00
parent 136e0471d3
commit cdf6c181a9
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/categories/avs/de-de-formal.msg
View File

@ -20,5 +20,5 @@ AvsImportIDs n@Int m@Int: AVS Persondendaten importiert: #{show n}/#{show m}
RevokeUnknownLicencesOk: AVS Fahrberechtigungen unbekannter Fahrer wurden gesperrt
RevokeUnknownLicencesFail: Nicht alle AVS Fahrberechtigungen unbekannter Fahrer konnten entzogen werden, siehe Log für Details
AvsCommunicationError: AVS Schnittstelle lieferte einen unerwarteten Fehler.
LicenseTableChangeAvs: Im AVS ändern
LicenseTableChangeFDrive: In FRADrive ändern
LicenceTableChangeAvs: Im AVS ändern
LicenceTableChangeFDrive: In FRADrive ändern

4
messages/uniworx/categories/avs/en-eu.msg
View File

@ -20,5 +20,5 @@ AvsImportIDs n m: AVS person daten importet: #{show n}/#{show m}
RevokeUnknownLicencesOk: AVS driving licences of unknown drivers revoked
RevokeUnknownLicencesFail: Not all AVS driving licences of unknown drivers could be revoked, see log for details
AvsCommunicationError: AVS interface returned an unexpected error.
LicenseTableChangeAvs: Change in AVS
LicenseTableChangeFDrive: Change within FRADrive
LicenceTableChangeAvs: Change in AVS
LicenceTableChangeFDrive: Change within FRADrive

26
src/Handler/Admin/Avs.hs
View File

@ -285,8 +285,8 @@ instance Button UniWorX ButtonAvsSynch where
btnClasses BtnRevokeAvsLicences = [BCIsButton, BCDanger]
data LicenceTableAction = LicenseTableChangeAvs
| LicenseTableChangeFDrive
data LicenceTableAction = LicenceTableChangeAvs
| LicenceTableChangeFDrive
deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
instance Universe LicenceTableAction
@ -294,9 +294,9 @@ instance Finite LicenceTableAction
nullaryPathPiece ''LicenceTableAction $ camelToPathPiece' 2
embedRenderMessage ''UniWorX ''LicenceTableAction id
data LicenceTableActionData = LicenseTableChangeAvsData
| LicenseTableChangeFDriveData
deriving (Eq, Ord, Enum, Bounded, Read, Show, Generic, Typeable)
data LicenceTableActionData = LicenceTableChangeAvsData
| LicenceTableChangeFDriveData { licenceTableChangeFDriveEnd :: Day }
deriving (Eq, Ord, Read, Show, Generic, Typeable)
postProblemAvsSynchR, getProblemAvsSynchR :: Handler Html
@ -344,9 +344,9 @@ getProblemAvsSynchR = do
>> redirect ProblemAvsSynchR
((_,tb0),(_,tb1),(_,tb2)) <- runDB $ (,,)
<$> mkLicenceTable AvsLicenceVorfeld setTo0
<*> mkLicenceTable AvsLicenceVorfeld setTo1
<*> mkLicenceTable AvsLicenceRollfeld setTo2
<$> mkLicenceTable AvsLicenceVorfeld setTo0 (Just LicenceTableChangeAvs)
<*> mkLicenceTable AvsLicenceVorfeld setTo1 (Just LicenceTableChangeAvs)
<*> mkLicenceTable AvsLicenceRollfeld setTo2 (Just LicenceTableChangeAvs)
siteLayoutMsg MsgAvsTitleLicenceSynch $ do
setTitleI MsgAvsTitleLicenceSynch
@ -387,8 +387,8 @@ instance HasUser LicenceTableData where
hasUser = resultUser . _entityVal
mkLicenceTable :: AvsLicence -> Set AvsPersonId -> DB (FormResult (LicenceTableActionData, Set UserId), Widget)
mkLicenceTable aLic apids = do
mkLicenceTable :: AvsLicence -> Set AvsPersonId -> Maybe LicenceTableAction -> DB (FormResult (LicenceTableActionData, Set UserId), Widget)
mkLicenceTable aLic apids defAct = do
currentRoute <- fromMaybe (error "mkLicenceTable called from 404-handler") <$> liftHandler getCurrentRoute
now <- liftIO getCurrentTime
let nowaday = utctDay now
@ -429,8 +429,8 @@ mkLicenceTable aLic apids = do
]
acts :: Map LicenceTableAction (AForm Handler LicenceTableActionData)
acts = mconcat
[ singletonMap LicenseTableChangeAvs $ pure LicenseTableChangeAvsData
, singletonMap LicenseTableChangeFDrive $ pure LicenseTableChangeFDriveData
[ singletonMap LicenceTableChangeAvs $ pure LicenceTableChangeAvsData
, singletonMap LicenceTableChangeFDrive (LicenceTableChangeFDriveData <$> apopt dayField (fslI MsgLmsQualificationValidUntil) Nothing)
]
dbtParams = DBParamsForm
@ -441,7 +441,7 @@ mkLicenceTable aLic apids = do
, dbParamsFormAdditional
= renderAForm FormStandard
$ (, mempty) . First . Just
<$> multiActionA acts (fslI MsgTableAction) Nothing
<$> multiActionA acts (fslI MsgTableAction) defAct
, dbParamsFormEvaluate = liftHandler . runFormPost
, dbParamsFormResult = id
, dbParamsFormIdent = def