Commit 1063019b authored by Bas Lijnse's avatar Bas Lijnse

Added displaying of display names in messages of assigned tasks

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/branches/fancyTasks@362 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 097eb1ae
......@@ -77,8 +77,8 @@ where
confirmBid :: String ((Int,String),Real) -> Task Void
confirmBid purchase bid =: ((uid,label),price)
= uid @:: (
= uid @: ("Bid confirmation",(
[Text "Your bid of ", Text (toString price),Text " for the product ",ITag [] [Text purchase], Text " has been accepted."]
?>> editTask "Ok" Void
)
))
\ No newline at end of file
......@@ -9,7 +9,8 @@ implementation module Combinators
//
import StdList, StdFunc, StdTuple
import iDataTrivial, iDataFormlib, StdBimap
import BasicCombinators, PromptingCombinators, LiftingCombinators, iTasksTimeAndDateHandling, iTasksSettings, iTasksEditors
import BasicCombinators, PromptingCombinators, LiftingCombinators, iTasksTimeAndDateHandling, iTasksSettings, iTasksEditors, UserTasks
derive gForm []
derive gUpd []
......@@ -67,8 +68,10 @@ where
(@:) infix 3 :: !UserId !(LabeledTask a) -> Task a | iData a
(@:) nuserId ltask=:(taskname,task) = Task assigntask
where
assigntask tst=:{userId}
= appTaskTSt ([showText ("Waiting for Task "), showLabel taskname, showText " from ", showUser nuserId,BrTag []]
assigntask tst=:{userId}
= appTaskTSt (
getDisplayNamesTask [nuserId] =>> \displayNames ->
[showText ("Waiting for Task "), showLabel taskname, showText " from ", showLabel (hd displayNames),BrTag []]
?>> assignTaskTo nuserId (taskname,[showText "Requested by ", showUser userId,BrTag [] ,BrTag []] ?>> task)) tst
showUser nr = showLabel ("User " <+++ nr)
......
......@@ -22,7 +22,7 @@ userVersionNr thisUser :== "User" <+++ thisUser <+++ "_VersionPNr"
usersessionVersionNr thisUser :== "User" <+++ thisUser <+++ "_VersionSNr"
showText text :== Text text
showLabel text :== Text text
showLabel text :== ITag [] [Text text]
showMainLabel text :== Text text
showHighLight text :== Text text
showLowLight text :== Text text
......
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