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

chore: rename btn-constructors

Browse Source
This commit is contained in:
Wolfgang Witt 2021-03-18 12:32:27 +01:00 committed by Gregor Kleen
parent 362e2cf00d
commit 65d0f24d71
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
messages/uniworx/misc/de-de-formal.msg
View File

@ -2824,8 +2824,8 @@ BtnExamAutoOccurrenceCalculate: Verteilungstabelle berechnen
BtnExamAutoOccurrenceAccept: Verteilung akzeptieren BtnExamAutoOccurrenceAccept: Verteilung akzeptieren
BtnExamAutoOccurrenceNudgeUp: + BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: - BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnoreEnable: Ignorieren BtnExamAutoOccurrenceIgnore: Ignorieren
BtnExamAutoOccurrenceIgnoreDisable: Berücksichtigen BtnExamAutoOccurrenceReconsider: Berücksichtigen
ExamRoomMappingSurname: Nachnamen beginnend mit ExamRoomMappingSurname: Nachnamen beginnend mit
ExamRoomMappingMatriculation: Matrikelnummern endend in ExamRoomMappingMatriculation: Matrikelnummern endend in
ExamRoomMappingRandom: Verteilung ExamRoomMappingRandom: Verteilung

4
messages/uniworx/misc/en-eu.msg
View File

@ -2824,8 +2824,8 @@ BtnExamAutoOccurrenceCalculate: Calculate assignment rules
BtnExamAutoOccurrenceAccept: Accept assignments BtnExamAutoOccurrenceAccept: Accept assignments
BtnExamAutoOccurrenceNudgeUp: + BtnExamAutoOccurrenceNudgeUp: +
BtnExamAutoOccurrenceNudgeDown: - BtnExamAutoOccurrenceNudgeDown: -
BtnExamAutoOccurrenceIgnoreEnable: Ignore BtnExamAutoOccurrenceIgnore: Ignore
BtnExamAutoOccurrenceIgnoreDisable: Reconsider BtnExamAutoOccurrenceReconsider: Reconsider
ExamRoomMappingSurname: Surnames starting with ExamRoomMappingSurname: Surnames starting with
ExamRoomMappingMatriculation: Matriculation numbers ending in ExamRoomMappingMatriculation: Matriculation numbers ending in
ExamRoomMappingRandom: Distribution ExamRoomMappingRandom: Distribution

15
src/Handler/Exam/AutoOccurrence.hs
View File

@ -1,4 +1,5 @@
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# OPTIONS_GHC -Wwarn #-}
module Handler.Exam.AutoOccurrence module Handler.Exam.AutoOccurrence
( examAutoOccurrenceCalculateWidget ( examAutoOccurrenceCalculateWidget
@ -15,7 +16,6 @@ import qualified Data.Set as Set
import qualified Database.Esqueleto as E import qualified Database.Esqueleto as E
import Database.Persist.Sql (updateWhereCount) import Database.Persist.Sql (updateWhereCount)
newtype ExamAutoOccurrenceCalculateForm = ExamAutoOccurrenceCalculateForm newtype ExamAutoOccurrenceCalculateForm = ExamAutoOccurrenceCalculateForm
{ eaofConfig :: ExamAutoOccurrenceConfig { eaofConfig :: ExamAutoOccurrenceConfig
} deriving stock (Eq, Ord, Read, Show, Generic, Typeable) } deriving stock (Eq, Ord, Read, Show, Generic, Typeable)
@ -36,7 +36,7 @@ data ExamAutoOccurrenceButton
= BtnExamAutoOccurrenceCalculate = BtnExamAutoOccurrenceCalculate
| BtnExamAutoOccurrenceAccept | BtnExamAutoOccurrenceAccept
| BtnExamAutoOccurrenceNudgeUp | BtnExamAutoOccurrenceNudgeDown | BtnExamAutoOccurrenceNudgeUp | BtnExamAutoOccurrenceNudgeDown
| BtnExamAutoOccurrenceIgnoreEnable | BtnExamAutoOccurrenceIgnoreDisable | BtnExamAutoOccurrenceIgnore | BtnExamAutoOccurrenceReconsider
deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable) deriving (Eq, Ord, Read, Show, Enum, Bounded, Generic, Typeable)
instance Universe ExamAutoOccurrenceButton instance Universe ExamAutoOccurrenceButton
instance Finite ExamAutoOccurrenceButton instance Finite ExamAutoOccurrenceButton
@ -69,6 +69,9 @@ examAutoOccurrenceNudgeForm occId protoForm html = do
cID <- encrypt occId cID <- encrypt occId
(btnRes, wgt) <- identifyForm (FIDExamAutoOccurrenceNudge $ ciphertext cID) (buttonForm' [BtnExamAutoOccurrenceNudgeUp, BtnExamAutoOccurrenceNudgeDown]) html (btnRes, wgt) <- identifyForm (FIDExamAutoOccurrenceNudge $ ciphertext cID) (buttonForm' [BtnExamAutoOccurrenceNudgeUp, BtnExamAutoOccurrenceNudgeDown]) html
oldDataRes <- globalPostParamField PostExamAutoOccurrencePrevious secretJsonField oldDataRes <- globalPostParamField PostExamAutoOccurrencePrevious secretJsonField
liftIO $ do
putStrLn "\n\nnudge"
print $ eaocNudge . eaofConfig <$> oldDataRes
oldDataId <- newIdent oldDataId <- newIdent
let protoForm' = fromMaybe def $ oldDataRes <|> protoForm let protoForm' = fromMaybe def $ oldDataRes <|> protoForm
@ -84,7 +87,7 @@ examAutoOccurrenceNudgeForm occId protoForm html = do
examAutoOccurrenceIgnoreRoomsForm :: ExamOccurrenceId -> Maybe ExamAutoOccurrenceCalculateForm -> Form ExamAutoOccurrenceCalculateForm examAutoOccurrenceIgnoreRoomsForm :: ExamOccurrenceId -> Maybe ExamAutoOccurrenceCalculateForm -> Form ExamAutoOccurrenceCalculateForm
examAutoOccurrenceIgnoreRoomsForm occId protoForm html = do examAutoOccurrenceIgnoreRoomsForm occId protoForm html = do
cID <- encrypt occId cID <- encrypt occId
(btnRes, wgt) <- identifyForm (FIDExamAutoOccurrenceIgnoreRooms $ ciphertext cID) (buttonForm' [BtnExamAutoOccurrenceIgnoreEnable, BtnExamAutoOccurrenceIgnoreDisable]) html (btnRes, wgt) <- identifyForm (FIDExamAutoOccurrenceIgnoreRoom $ ciphertext cID) (buttonForm' [BtnExamAutoOccurrenceIgnore, BtnExamAutoOccurrenceReconsider]) html
oldDataRes <- globalPostParamField PostExamAutoOccurrencePrevious secretJsonField oldDataRes <- globalPostParamField PostExamAutoOccurrencePrevious secretJsonField
oldDataId <- newIdent oldDataId <- newIdent
@ -93,9 +96,9 @@ examAutoOccurrenceIgnoreRoomsForm occId protoForm html = do
where where
action EAOIRAutomatic = EAOIRManual {eaoirmIgnored=Set.empty, eaoirmSorted=True} action EAOIRAutomatic = EAOIRManual {eaoirmIgnored=Set.empty, eaoirmSorted=True}
action ir@EAOIRManual {eaoirmIgnored, eaoirmSorted} = case btn of action ir@EAOIRManual {eaoirmIgnored, eaoirmSorted} = case btn of
BtnExamAutoOccurrenceIgnoreEnable -> EAOIRManual {eaoirmIgnored=Set.insert occId eaoirmIgnored, eaoirmSorted} BtnExamAutoOccurrenceIgnore -> EAOIRManual {eaoirmIgnored=Set.insert occId eaoirmIgnored, eaoirmSorted}
BtnExamAutoOccurrenceIgnoreDisable -> EAOIRManual {eaoirmIgnored=Set.delete occId eaoirmIgnored, eaoirmSorted} BtnExamAutoOccurrenceReconsider -> EAOIRManual {eaoirmIgnored=Set.delete occId eaoirmIgnored, eaoirmSorted}
_other -> ir _other -> ir
res = genForm <$> btnRes res = genForm <$> btnRes
oldDataView = fieldView (secretJsonField :: Field Handler _) oldDataId (toPathPiece PostExamAutoOccurrencePrevious) [] (Right . fromMaybe protoForm' $ formResult' res) False oldDataView = fieldView (secretJsonField :: Field Handler _) oldDataId (toPathPiece PostExamAutoOccurrencePrevious) [] (Right . fromMaybe protoForm' $ formResult' res) False
return (res, wgt <> oldDataView) return (res, wgt <> oldDataView)

2
src/Utils/Form.hs
View File

@ -229,7 +229,7 @@ data FormIdentifier
| FIDUserAuthMode | FIDUserAssimilate | FIDUserRights | FIDUserAuthentication | FIDUserAuthMode | FIDUserAssimilate | FIDUserRights | FIDUserAuthentication
| FIDAllUsersAction | FIDAllUsersAction
| FIDLanguage | FIDLanguage
| FIDExamAutoOccurrenceCalculate | FIDExamAutoOccurrenceConfirm | FIDExamAutoOccurrenceNudge UUID | FIDExamAutoOccurrenceIgnoreRooms UUID | FIDExamAutoOccurrenceCalculate | FIDExamAutoOccurrenceConfirm | FIDExamAutoOccurrenceNudge UUID | FIDExamAutoOccurrenceIgnoreRoom UUID
| FIDAllocationAccept | FIDAllocationAccept
| FIDTestDownload | FIDTestDownload
| FIDAllocationRegister | FIDAllocationRegister