Commit 0f027c30 authored by Mart Lubbers's avatar Mart Lubbers

Fix multiuser stuff and remove trailing space in examples

parent 0f6de3a5
Pipeline #12627 passed with stage
in 3 minutes and 38 seconds
......@@ -6,7 +6,7 @@ import iTasks.Extensions.Admin.UserAdmin
import iTasks.Extensions.Admin.WorkflowAdmin
wf :: String -> Workflow
wf a = workflow a "Chat with other users" multiUserExample
wf a = workflow a "Chat with other users" myExample
Start :: *World -> *World
Start world
......@@ -18,12 +18,11 @@ multiUserExample
(foldl (+++) "" (map (\n -> n +++ ", ") players))
-||-
viewInformation "and then Select \"new\" to create a new Task..." [] ""
>>| loginAndManageWorkList "Chat_4_2 Example" [workflow "chat" "chat" myExample]
>>| loginAndManageWorkList "Chat_4_2 Example" [wf "chat"]
where
mkUserAccount name
= { credentials = { username = Username name, password = Password name}, title = Nothing, roles = ["manager"] }
// -------------------------------------------------------------------------
// Simple MultiUser Chat Application for 2 users
......
......@@ -5,10 +5,11 @@ import iTasks
import iTasks.Extensions.Admin.UserAdmin
import iTasks.Extensions.Admin.WorkflowAdmin
import iTasks.Extensions.DateTime
import iTasks.UI.Editor.Common
import Text
wf :: String -> Workflow
wf a = workflow a "Plan a meeting" multiUserExample
wf a = workflow a "Plan a meeting" myExample
Start :: *World -> *World
Start world
......@@ -17,10 +18,10 @@ Start world
multiUserExample
= set (map mkUserAccount players) userAccounts
>>| viewInformation "Login under one of the following names (password = login name)" []
(foldl (+++) "" (map (\n -> n +++ ", ") players))
(join ", " players)
-||-
viewInformation "and then Select \"new\" to create a new Task..." [] ""
>>| loginAndManageWorkList "Meeting_4_3 Example" [workflow "Meeting date" "Determine meeting date" myExample]
>>| loginAndManageWorkList "Meeting_4_3 Example" [wf "Meeting date"]
where
mkUserAccount name
= { credentials = { username = Username name, password = Password name}, title = Nothing, roles = ["manager"] }
......
......@@ -9,7 +9,7 @@ import iTasks.Extensions.DateTime
import iTasks.Extensions.Document
wf :: String -> Workflow
wf a = workflow a "Chat with options" multiUserExample
wf a = workflow a "Chat with options" genChat
Start :: *World -> *World
Start world
......@@ -21,7 +21,7 @@ multiUserExample
(foldl (+++) "" (map (\n -> n +++ ", ") logins))
-||-
viewInformation "and then Select \"new\" to create a new Task..." [] ""
>>| loginAndManageWorkList "Chat_4_2 Example" [workflow "chat with options" "chat with options" genChat]
>>| loginAndManageWorkList "Chat_4_2 Example" [wf "Chat with options"]
where
mkUserAccount name
= { credentials = { username = Username name, password = Password name}, title = Nothing, roles = ["manager"] }
......
......@@ -24,9 +24,10 @@ Global
Time: False
Stack: False
Dynamics: True
GenericFusion: False
DescExL: False
Output
Output: ShowConstructors
Output: NoReturnType
Font: Courier
FontSize: 9
WriteStdErr: False
......@@ -41,6 +42,10 @@ Global
ExportedNames:
Paths
Path: {Project}
OtherPaths
Path: {Application}*lib*Dynamics
Path: {Application}*lib*Platform
Path: {Application}*lib*StdEnv
Precompile:
Postlink:
MainModule
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment