up

[mTask.git] / Shares / mTaskShare.icl

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 0bb6265..fe65501 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -1,24 +1,68 @@
 implementation module Shares.mTaskShare
 
+import dynamic_string
 import Utils.SDS
+import Utils.Devices
 import iTasks
+import mTask
+import Data.List
 from Data.Func import $
 
+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 @! zero
-               Just sh = viewSharedInformation "View value" [] (getSDSStore sh)
-                       >>= \_->return sh
-       ) @! ()
+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]
+               [{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
+               @! fromJust mshs
+//             /*enterChoice "" [ChooseFromGrid id]*/viewInformation "" []  o fromJust
 
-viewShares :: [MTaskShare] -> Task ()
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal @! ()
+viewShare :: MTaskShare -> Task BCValue
+viewShare m = viewSharedInformation "" [] (getSDSShare m)
+       <<@ Title ("SDS: " +++ toString m.identifier)
 
-viewShare :: MTaskShare -> Task ()
-viewShare m = viewSharedInformation "" [] (getSDSStore m)
-       <<@ Title ("SDS: " +++ toString m.identifier) @! ()
+getSDSShare :: MTaskShare -> Shared BCValue
+getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
-instance zero MTaskShare where
-       zero = {initValue=0,withTask="",identifier=0,realShare=""}
+makeShare :: String Int BCValue -> Task MTaskShare
+makeShare withTask identifier value = treturn 
+               {MTaskShare
+               |withTask=withTask
+               ,identifier=identifier
+               ,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" @! ()