shares are updated now and visible

[mTask.git] / Shares / mTaskShare.icl

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index cddc903..76f676a 100644 (file)
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -5,52 +5,65 @@ import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
+import Data.List
 from Data.Func import $
 
-derive class iTask MTaskShareType
-
-derive gEditor MTaskShare
-derive gText MTaskShare
-derive JSONEncode MTaskShare
-derive JSONDecode MTaskShare
-derive gDefault MTaskShare
-gEq{|MTaskShare|} m1 m2 = m1.identifier == m2.identifier
+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 -|| */viewShares 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
 
-viewShares :: [MTaskShare] -> Task MTaskShare
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal
-       >>| return (hd sh)
+//viewSharesGrid :: [MTaskShare] -> Task [MTaskShare]
+//viewSharesGrid sh = allTasks [whileUnchanged (get $ getSDSShare m) (\s->treturn (m, s))\\m<-sh]
+//     @ map (\(s,v)->{MTaskShare|s&value=v})
+//     >>= enterChoice "Choose share" [ChooseFromGrid id]
+//     >>= \s->treturn [s]
+//{anyTask (map viewShare sh) <<@ ArrangeHorizontal
+//     >>| return (hd sh)
 
 viewShare :: MTaskShare -> Task BCValue
 viewShare m = viewSharedInformation "" [] (getSDSShare m)
        <<@ Title ("SDS: " +++ toString m.identifier)
 
 getSDSShare :: MTaskShare -> Shared BCValue
-getSDSShare s=:{realShare=(MTaskWithShare id),value}
-       = memoryShare id value//s.MTaskShare.value
+getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
 makeShare :: String Int BCValue -> Task MTaskShare
-makeShare withTask identifier value=:(BCValue v) = treturn 
+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" @! ()