Commit bce87f9b authored by Rinus Plasmeijer's avatar Rinus Plasmeijer

*** empty log message ***


git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@130 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 069e0b79
......@@ -3,10 +3,10 @@ definition module iTasks
// iTasks library for defining interactive multi-user workflow tasks (iTask) for the web.
// Defined on top of the iData library.
// (c) iTask & iData Concept and Implementation by Rinus Plasmeijer, 2006,2007 - MJP
// (c) iTask & iData Concept and Implementation by Rinus Plasmeijer, 2006,2007,2008 - MJP
// This library is still under construction - MJP
iTaskVersion :== "0.97 - Februari 2008 - "
iTaskVersion :== "0.99 - April 2008 - "
import iDataSettings, iDataButtons, StdBimap
derive gForm Void, TCl
......@@ -55,15 +55,16 @@ multiUserTask :: iTask start function for multi-users, with option in window to
workFlowTask :: iTask start function for a real workflow, expects a login task and the actual task
a predefined login task is defined in iTaskLogin.dcl
*/
singleUserTask :: ![StartUpOptions] !(Task a) !*HSt -> (!Bool,Html,*HSt) | iCreate a
multiUserTask :: ![StartUpOptions] !(Task a) !*HSt -> (!Bool,Html,*HSt) | iCreate a
singleUserTask :: ![StartUpOptions] !(Task a) !*HSt -> (!Bool,Html,*HSt) | iData a
multiUserTask :: ![StartUpOptions] !(Task a) !*HSt -> (!Bool,Html,*HSt) | iData a
workFlowTask :: ![StartUpOptions] !(Task (UserId,a))
!((UserId,a) -> Task b)!*HSt -> (!Bool,Html,*HSt) | iCreate a
!((UserId,a) -> Task b)!*HSt -> (!Bool,Html,*HSt) | iData b
:: StartUpOptions = TraceOn | TraceOff // for single & multiUser: default = TraceOn
| ThreadStorage Lifespan // for Ajax: where to store threadinformation: default = TxtFile
| ShowUsers Int // for multiUserTask, toggle between given maximum number of users, default: ShowUser 5
| VersionCheck | NoVersionCheck // for single & multiUser: default = VersionNoCheck
| TestModeOn | TestModeOff // emties storages when starting from scratch: On for single and multi-user tasks
| MyHeader HtmlCode // wil replace standard iTask information line
// *********************************************************************************************************************************
......@@ -218,3 +219,15 @@ taskId :: TSt -> (Int,TSt)
userId :: TSt -> (Int,TSt)
addHtml :: HtmlCode TSt -> TSt
// *********************************************************************************************************************************
:: Wid a :== Int // id of workflow process
spawnWorkflow :: (LabeledTask a) -> Task (Wid a) | iData a
waitForResult :: (Wid a) -> Task a | iData a
//activateWorkflows :: !*TSt -> (Void,*TSt)
This diff is collapsed.
......@@ -85,8 +85,8 @@ andTasks_mu :: !String ![(Int,Task a)] -> Task [a] | iData a
(=>>?) :: as bind, but do the second task only if the first one delivers a result
(-&&-?) :: do both tasks in any order, task completed when all done, or one of them delivers nothing
*/
(=>>?) infixl 1 :: !(Task (Maybe a)) !(a -> Task (Maybe b)) -> Task (Maybe b) | iCreateAndPrint a & iCreateAndPrint b
(-&&-?)infixr 4 :: !(Task (Maybe a)) !(Task (Maybe b)) -> Task (Maybe (a,b)) | iData a & iData b
(=>>?) infixl 1 :: !(Task (Maybe a)) !(a -> Task (Maybe b)) -> Task (Maybe b) | iCreateAndPrint a & iCreateAndPrint b
(-&&-?)infixr 4 :: !(Task (Maybe a)) !(Task (Maybe b)) -> Task (Maybe (a,b)) | iData a & iData b
/* Time and Date management:
......
......@@ -137,7 +137,6 @@ orTasks taskCollection = newTask "orTasks" (andTasksCond "or Tasks" (\list -> le
andTasks :: ![LabeledTask a] -> (Task [a]) | iData a
andTasks taskCollection = newTask "andTasks" (andTasksCond "and Tasks" (\_ -> False) taskCollection)
(-&&-?) infixr 4 :: !(Task (Maybe a)) !(Task (Maybe b)) -> Task (Maybe (a,b)) | iData a & iData b
(-&&-?) t1 t2
= andTasksCond "Maybe Task" noNothing [("Maybe 1",left),("Maybe 2",right)]
......@@ -154,7 +153,6 @@ where
noNothing [RIGHT Nothing:xs] = True
noNothing [x:xs] = noNothing xs
multiAndTask :: !(LabeledTask a) -> Task Void | iData a
multiAndTask (label,task)
= taskId
......
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