update spec, and shares

[mTask.git] / Shares / mTaskShare.icl

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index e438a4a..8c0ae61 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -11,8 +11,8 @@ from Data.Func import $
 derive class iTask MTaskShareType, MTaskShare
 
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever $
-       viewSharesGrid shares @! ()
+manageShares shares = withShared Nothing $ \cs->forever $
+       viewSharesGrid cs shares /*||- (viewSharedInformation "" [] cs*/ @! ()//)//||- editCurrentShare cs
 
 //     >&^ \st->whileUnchanged st $ \msh->case msh of
 //             Nothing = viewShares shares
@@ -36,13 +36,16 @@ manageShares shares = forever $
 //updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
 //     >>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
 //     >>| treturn sh
+//
+from StdFunc import flip
 
-viewSharesGrid :: [MTaskShare] -> Task [BCValue]
-viewSharesGrid sh = allTasks [watch (getSDSShare m)\\m<-sh]
-       >&^ \st->whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
+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
-//             /*enterChoice "" [ChooseFromGrid id]*/viewInformation "" []  o fromJust
 
 viewShare :: MTaskShare -> Task BCValue
 viewShare m = viewSharedInformation "" [] (getSDSShare m)
@@ -54,15 +57,15 @@ getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 makeShare :: String Int BCValue -> Task MTaskShare
 makeShare withTask identifier value = treturn 
                {MTaskShare
-               |withTask=withTask
+               |withTask=[withTask]
                ,identifier=identifier
                ,value=value
                ,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
                } >>= \sh->set value (getSDSShare sh) >>| treturn sh
 
-updateShare :: Int String -> Task ()
+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 (fromByteCode val) (getSDSShare mts))
+               Just mts = set val (getSDSShare mts))
        >>| traceValue "Updated" @! ()