X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;fp=Shares%2FmTaskShare.icl;h=60fb0a8da1568f2517df735ab401d447d753d1d0;hb=c518754bec4758cce7d899463f9c68612c3bf4e4;hp=ed4b5e3811e0e40c85440696beac983e99ddddbb;hpb=80f25a299c99096fdf8727577112dfa2bac39adc;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index ed4b5e3..60fb0a8 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -7,6 +7,7 @@ import iTasks
 import mTask
 import Data.List
 from Data.Func import $
+from StdFunc import flip
 
 derive class iTask MTaskShareType, MTaskShare
 
@@ -22,36 +23,12 @@ updateS sh = flip (<<@) (Title $ toString sh.identifier) $ forever $
 		viewSharedInformation "Current value" [] (getSDSShare sh)
 	||- (
 			updateSharedInformation "New value" [] (getSDSShare sh)
-		>>= \nv->allTasks (map (sendMessages [MTUpd sh.identifier nv]) sh.withDevice)
+		>>= \nv->allTasks (map getDevice sh.withDevice)
+		>>= \devs->allTasks (map (sendMessages [MTUpd sh.identifier nv]) devs)
 		>>| treturn nv
 		)
 	<<@ ArrangeHorizontal
 
-//	>&^ \st->whileUnchanged st $ \msh->case msh of
-//		Nothing = viewShares shares
-//		Just sh = forever (
-//				viewSharedInformation "View value" [] (getSDSShare sh) >>| treturn sh
-//			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-//			>>= updateShare sh
-//			)
-//			
-//	) @! ()
-
-
-//viewShares :: [MTaskShare] -> Task BCValue
-//viewShares shares = anyTask (map viewShare shares)
-//
-//viewAndDelete :: [MTaskShare] -> Task ()
-//viewAndDelete shares 
-//	= enterChoice "Choose share to update" [ChooseFromGrid id] shares @! ()
-
-//updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
-//updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
-//	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
-//	>>| treturn sh
-//
-from StdFunc import flip
-
 viewSharesGrid :: (Shared (Maybe MTaskShare)) [MTaskShare] -> Task [BCValue]
 viewSharesGrid _ [] = viewInformation "No shares yet" [] []
 viewSharesGrid cs sh = (allTasks [watch (getSDSShare m)\\m<-sh] <<@ NoUserInterface)
@@ -67,7 +44,7 @@ viewShare m = viewSharedInformation "" [] (getSDSShare m)
 getSDSShare :: MTaskShare -> Shared BCValue
 getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
-makeShare :: String MTaskDevice Int BCValue -> Task MTaskShare
+makeShare :: String String Int BCValue -> Task MTaskShare
 makeShare withTask withDevice identifier value = treturn 
 		{MTaskShare
 		|withTask=[withTask]