X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=e438a4a7558dbc68280ed7e69e139278346a3721;hb=ff14654a72e483d14807272de58c21ad03677177;hp=8eb7dc081b3da404d8c6d349ff3f4811f9fe7095;hpb=5f4c4b61ea1e4062e90715af9e1027da6d1c7a66;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 8eb7dc0..e438a4a 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -5,41 +5,53 @@ import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
+import Data.List
 from Data.Func import $
 
-derive class iTask MTaskShareType
+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
+manageShares shares = forever $
+	viewSharesGrid 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
-			)
-			
-	) @! ()
+//			)
+//			
+//	) @! ()
+
+
+//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
 
+viewSharesGrid :: [MTaskShare] -> Task [BCValue]
+viewSharesGrid sh = allTasks [watch (getSDSShare m)\\m<-sh]
+	>&^ \st->whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
+		[{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
+		@! fromJust mshs
+//		/*enterChoice "" [ChooseFromGrid id]*/viewInformation "" []  o fromJust
 
-viewShares :: [MTaskShare] -> Task MTaskShare
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal
-	>>| return (hd sh)
-
-viewShare :: MTaskShare -> Task String
+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 :: String Int BCValue -> Task MTaskShare
 makeShare withTask identifier value = treturn 
 		{MTaskShare
 		|withTask=withTask
@@ -47,3 +59,10 @@ makeShare withTask identifier value = treturn
 		,value=value
 		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
 		} >>= \sh->set value (getSDSShare sh) >>| treturn sh
+
+updateShare :: Int String -> 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 (fromByteCode val) (getSDSShare mts))
+	>>| traceValue "Updated" @! ()