small update

[mTask.git] / Shares / mTaskShare.icl

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index fe65501..ee6282b 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -7,42 +7,36 @@ import iTasks
 import mTask
 import Data.List
 from Data.Func import $
+from StdFunc import flip
 
 derive class iTask MTaskShareType, MTaskShare
 
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever $ viewInformation "" [] "" @! ()
-//     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]
+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
-//             /*enterChoice "" [ChooseFromGrid id]*/viewInformation "" []  o fromJust
 
 viewShare :: MTaskShare -> Task BCValue
 viewShare m = viewSharedInformation "" [] (getSDSShare m)
@@ -51,18 +45,19 @@ viewShare m = viewSharedInformation "" [] (getSDSShare m)
 getSDSShare :: MTaskShare -> Shared BCValue
 getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
-makeShare :: String Int BCValue -> 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
                ,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" @! ()