update a lot, try to type shares

[mTask.git] / Shares / mTaskShare.icl

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index eb799df..8eb7dc0 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -1,42 +1,49 @@
 implementation module Shares.mTaskShare
 
+import dynamic_string
 import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
 from Data.Func import $
 
+derive class iTask MTaskShareType
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares)
-       @! ()
-
-
-
-/*
+manageShares shares =
        forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
        >&^ \st->whileUnchanged st $ \msh->case msh of
-               Nothing = viewShares shares @! zero
+               Nothing = viewShares shares
                Just sh = forever (
-                               viewSharedInformation "View value" [] (getSDSStore sh)
-                       >>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-                       >>= updateShare sh
+                               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 ()
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal @! ()
-
-viewShare :: MTaskShare -> Task ()
-viewShare m = treturn ()//viewSharedInformation "" [] (getSDSStore m)
-       //<<@ Title ("SDS: " +++ toString m.identifier) @! ()
-
-instance zero MTaskShare where
-       zero = {withTask="",identifier=0,realShare="",initVal=""}
-
+       ) @! ()
+
+//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
+viewShare m = viewSharedInformation "" [] (getSDSShare m)
+       <<@ Title ("SDS: " +++ toString m.identifier)
+
+getSDSShare :: MTaskShare -> Shared String
+getSDSShare s=:{realShare=(MTaskWithShare id)}
+       = memoryShare id s.MTaskShare.value
+
+makeShare :: String Int String -> 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