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

chore(workflows): tweak list headings wrt archived

Browse Source
This commit is contained in:
Sarah Vaupel 2022-05-21 01:50:20 +02:00 committed by Sarah Vaupel
parent cc5cd62572
commit 18129bfb17
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
messages/uniworx/categories/workflows/de-de-formal.msg
View File

@ -125,18 +125,18 @@ GlobalWorkflowWorkflowWorkflowTitle workflowWorkflowId@CryptoFileNameWorkflowWor
SchoolWorkflowWorkflowWorkflowHeading ssh@SchoolId workflowWorkflowId@CryptoFileNameWorkflowWorkflow !ident-ok: Workflow #{ssh}, #{toPathPiece workflowWorkflowId}
SchoolWorkflowWorkflowWorkflowTitle ssh@SchoolId workflowWorkflowId@CryptoFileNameWorkflowWorkflow !ident-ok: Workflow #{ssh}, #{toPathPiece workflowWorkflowId}
WorkflowWorkflowListScopeTitle rScope@RouteWorkflowScope: Laufende Workflows - _{rScope}
WorkflowWorkflowListScopeHeading rScope@RouteWorkflowScope: Laufende Workflows (_{rScope})
WorkflowWorkflowListInstanceTitle: Laufende Workflows für Instanz
WorkflowWorkflowListInstanceHeading: Laufende Workflows für Instanz
WorkflowWorkflowListNamedInstanceTitle rScope@RouteWorkflowScope wiTitle@Text: Laufende Workflows - _{rScope}, #{wiTitle}
WorkflowWorkflowListNamedInstanceHeading rScope@RouteWorkflowScope wiTitle@Text: Laufende Workflows (_{rScope}, #{wiTitle})
WorkflowWorkflowListNamedInstanceTitleDisabled rScope@RouteWorkflowScope: Laufende Workflows - _{rScope}
WorkflowWorkflowListNamedInstanceHeadingDisabled rScope@RouteWorkflowScope: Laufende Workflows (_{rScope})
WorkflowWorkflowListTopTitle: Laufende Workflows
WorkflowWorkflowListTopHeading: Laufende Workflows
AdminWorkflowWorkflowListTitle: Laufende Workflows
AdminWorkflowWorkflowListHeading: Laufende Workflows
WorkflowWorkflowListScopeTitle rScope@RouteWorkflowScope mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows - _{rScope}
WorkflowWorkflowListScopeHeading rScope@RouteWorkflowScope mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows (_{rScope})
WorkflowWorkflowListInstanceTitle mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows für Instanz
WorkflowWorkflowListInstanceHeading mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows für Instanz
WorkflowWorkflowListNamedInstanceTitle rScope@RouteWorkflowScope wiTitle@Text mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows - _{rScope}, #{wiTitle}
WorkflowWorkflowListNamedInstanceHeading rScope@RouteWorkflowScope wiTitle@Text mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows (_{rScope}, #{wiTitle})
WorkflowWorkflowListNamedInstanceTitleDisabled rScope@RouteWorkflowScope mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows - _{rScope}
WorkflowWorkflowListNamedInstanceHeadingDisabled rScope@RouteWorkflowScope mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows (_{rScope})
WorkflowWorkflowListTopTitle mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows
WorkflowWorkflowListTopHeading mArchived@(Maybe Bool): #{tshow (maybe "Alle" (bool "Laufende" "Archivierte") mArchived)} Workflows
AdminWorkflowWorkflowListTitle: Alle Workflows
AdminWorkflowWorkflowListHeading: Alle Workflows
WorkflowWorkflowListNumber: Nummer
WorkflowWorkflowListScope: Bereich

24
messages/uniworx/categories/workflows/en-eu.msg
View File

@ -84,18 +84,18 @@ GlobalWorkflowWorkflowWorkflowTitle workflowWorkflowId: Workflow #{toPathPiece w
SchoolWorkflowWorkflowWorkflowHeading ssh workflowWorkflowId: Workflow #{ssh}, #{toPathPiece workflowWorkflowId}
SchoolWorkflowWorkflowWorkflowTitle ssh workflowWorkflowId: Workflow #{ssh}, #{toPathPiece workflowWorkflowId}
WorkflowWorkflowListScopeTitle rScope: Running workflows - _{rScope}
WorkflowWorkflowListScopeHeading rScope: Running workflows (_{rScope})
WorkflowWorkflowListInstanceTitle: Running workflows for an instance
WorkflowWorkflowListInstanceHeading: Running workflows for an instance
WorkflowWorkflowListNamedInstanceTitle rScope wiTitle: Running workflows - _{rScope}, #{wiTitle}
WorkflowWorkflowListNamedInstanceHeading rScope wiTitle: Running workflows (_{rScope}, #{wiTitle})
WorkflowWorkflowListNamedInstanceTitleDisabled rScope: Running Workflows - _{rScope}
WorkflowWorkflowListNamedInstanceHeadingDisabled rScope: Running Workflows (_{rScope})
WorkflowWorkflowListTopTitle: Running workflows
WorkflowWorkflowListTopHeading: Running workflows
AdminWorkflowWorkflowListTitle: Running workflows
AdminWorkflowWorkflowListHeading: Running workflows
WorkflowWorkflowListScopeTitle rScope mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows - _{rScope}
WorkflowWorkflowListScopeHeading rScope mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows (_{rScope})
WorkflowWorkflowListInstanceTitle mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows for an instance
WorkflowWorkflowListInstanceHeading mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows for an instance
WorkflowWorkflowListNamedInstanceTitle rScope wiTitle mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows - _{rScope}, #{wiTitle}
WorkflowWorkflowListNamedInstanceHeading rScope wiTitle mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows (_{rScope}, #{wiTitle})
WorkflowWorkflowListNamedInstanceTitleDisabled rScope mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows - _{rScope}
WorkflowWorkflowListNamedInstanceHeadingDisabled rScope mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows (_{rScope})
WorkflowWorkflowListTopTitle mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows
WorkflowWorkflowListTopHeading mArchived: #{tshow (maybe "All" (bool "Running" "Archived") mArchived)} workflows
AdminWorkflowWorkflowListTitle: All workflows
AdminWorkflowWorkflowListHeading: All workflows
WorkflowWorkflowListNumber: Number
WorkflowWorkflowListScope: Scope

12
src/Handler/Workflow/Workflow/List.hs
View File

@ -88,7 +88,7 @@ workflowWorkflowListR mArchived rScope = workflowsDisabledWarning (headings ^. _
columns = def
{ wwListColumnScope = False
}
headings = (MsgWorkflowWorkflowListScopeTitle rScope, MsgWorkflowWorkflowListScopeHeading rScope)
headings = (MsgWorkflowWorkflowListScopeTitle rScope mArchived, MsgWorkflowWorkflowListScopeHeading rScope mArchived)
getGWIWorkflowsR, getGWIWorkflowsArchiveR :: WorkflowInstanceName -> Handler Html
@ -103,7 +103,7 @@ workflowInstanceWorkflowsR :: Maybe Bool -- ^ archived/non-archived workflows on
-> RouteWorkflowScope
-> WorkflowInstanceName
-> Handler Html
workflowInstanceWorkflowsR mArchived rScope win = workflowsDisabledWarning (MsgWorkflowWorkflowListNamedInstanceTitleDisabled rScope) (MsgWorkflowWorkflowListNamedInstanceHeadingDisabled rScope) $ do
workflowInstanceWorkflowsR mArchived rScope win = workflowsDisabledWarning (MsgWorkflowWorkflowListNamedInstanceTitleDisabled rScope mArchived) (MsgWorkflowWorkflowListNamedInstanceHeadingDisabled rScope mArchived) $ do
now <- liftIO getCurrentTime
(scope, desc) <- runDB $ do
scope <- maybeT notFound $ fromRouteWorkflowScope rScope
@ -111,10 +111,10 @@ workflowInstanceWorkflowsR mArchived rScope win = workflowsDisabledWarning (MsgW
desc <- selectWorkflowInstanceDescription wiId
return (scope, desc)
let headings = case desc of
Nothing -> (MsgWorkflowWorkflowListInstanceTitle, MsgWorkflowWorkflowListInstanceHeading)
Nothing -> (MsgWorkflowWorkflowListInstanceTitle mArchived, MsgWorkflowWorkflowListInstanceHeading mArchived)
Just (Entity _ WorkflowInstanceDescription{..})
-> ( MsgWorkflowWorkflowListNamedInstanceTitle rScope workflowInstanceDescriptionTitle
, MsgWorkflowWorkflowListNamedInstanceHeading rScope workflowInstanceDescriptionTitle
-> ( MsgWorkflowWorkflowListNamedInstanceTitle rScope workflowInstanceDescriptionTitle mArchived
, MsgWorkflowWorkflowListNamedInstanceHeading rScope workflowInstanceDescriptionTitle mArchived
)
workflowWorkflowList headings columns . runReader $ do
workflowWorkflow <- view queryWorkflowWorkflow
@ -142,7 +142,7 @@ topWorkflowWorkflowListR :: Maybe Bool -> Handler Html
topWorkflowWorkflowListR mArchived = do
now <- liftIO getCurrentTime
workflowsDisabledWarning (headings ^. _1) (headings ^. _2) . workflowWorkflowList headings def . views queryWorkflowWorkflow $ \workflowWorkflow -> isTopWorkflowScopeSql (workflowWorkflow E.^. WorkflowWorkflowScope) E.&&. restrictOnArchived workflowWorkflow now mArchived
where headings = (MsgWorkflowWorkflowListTopTitle, MsgWorkflowWorkflowListTopHeading)
where headings = (MsgWorkflowWorkflowListTopTitle mArchived, MsgWorkflowWorkflowListTopHeading mArchived)
type WorkflowWorkflowTableExpr = E.SqlExpr (Entity WorkflowWorkflow)