X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=ee6282b775eb5803d4dc803235dd72ccbadb6dc5;hb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;hp=7f9a2f499dbdc3576039cf4a891f8296d701673a;hpb=18c1286739897b65578e87b17167c6cef1922a3b;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 7f9a2f4..ee6282b 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -5,54 +5,59 @@ import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
+import Data.List
 from Data.Func import $
+from StdFunc import flip
 
-derive class iTask MTaskShareType
-
-derive gEditor MTaskShare
-derive gText MTaskShare
-derive JSONEncode MTaskShare
-derive JSONDecode MTaskShare
-derive gDefault MTaskShare
-gEq{|MTaskShare|} m1 m2 = m1.identifier == m2.identifier
+derive class iTask MTaskShareType, MTaskShare
 
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares =
-	forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
-	>&^ \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
-			)
-			
-	) @! ()
-
-//updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
-//updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
-//	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
-//	>>| treturn sh
-
-
-viewShares :: [MTaskShare] -> Task MTaskShare
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal
-	>>| return (hd sh)
-
-viewShare :: MTaskShare -> Task String
+manageShares shares = withShared Nothing $ \cs->forever $
+	(viewSharesGrid cs shares -|| updateShares shares <<@ ArrangeVertical) 
+	@! ()
+
+updateShares :: [MTaskShare] -> Task BCValue
+updateShares shares = anyTask (map updateS shares) <<@ ArrangeWithTabs
+
+updateS :: MTaskShare -> Task BCValue
+updateS sh = flip (<<@) (Title $ toString sh.identifier) $ forever $
+		viewSharedInformation "Current value" [] (getSDSShare sh)
+	||- (
+			updateSharedInformation "New value" [] (getSDSShare sh)
+		>>= \nv->allTasks (map (withDevice treturn) sh.withDevice)
+		>>= \devs->allTasks (map (sendMessages [MTUpd sh.identifier nv]) devs)
+		>>| treturn nv
+		)
+	<<@ ArrangeHorizontal
+
+viewSharesGrid :: (Shared (Maybe MTaskShare)) [MTaskShare] -> Task [BCValue]
+viewSharesGrid _ [] = viewInformation "No shares yet" [] []
+viewSharesGrid cs sh = (allTasks [watch (getSDSShare m)\\m<-sh] <<@ NoUserInterface)
+	>&^ \st->flip (<<@) NoUserInterface $ whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
+		[{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
+		>>* [OnValue (withValue $ \s->Just (set (Just s) cs))]
+		@! fromJust mshs
+
+viewShare :: MTaskShare -> Task BCValue
 viewShare m = viewSharedInformation "" [] (getSDSShare m)
 	<<@ Title ("SDS: " +++ toString m.identifier)
 
-getSDSShare :: MTaskShare -> Shared String
-getSDSShare s=:{realShare=(MTaskWithShare id)}
-	= memoryShare id s.MTaskShare.value
+getSDSShare :: MTaskShare -> Shared BCValue
+getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
-makeShare :: String Int String -> Task MTaskShare
-makeShare withTask identifier value = treturn 
+makeShare :: String String Int BCValue -> Task MTaskShare
+makeShare withTask withDevice identifier value = treturn 
 		{MTaskShare
-		|withTask=withTask
+		|withTask=[withTask]
+		,withDevice=[withDevice]
 		,identifier=identifier
 		,value=value
-		,dynvalue=dynamic value
 		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
 		} >>= \sh->set value (getSDSShare sh) >>| treturn sh
+
+updateShare :: Int BCValue -> Task ()
+updateShare ident val = get sdsStore
+	>>= \sh->(case find (\s->s.identifier==ident) sh of
+		Nothing = abort "Help, no share found with this ident"
+		Just mts = set val (getSDSShare mts))
+	>>| traceValue "Updated" @! ()