exstore + : mit Rest

1 files changed, 50 insertions, 2 deletions

diff --git a/ReckonPrimer.activity/exstore.py b/ReckonPrimer.activity/exstore.py
index f62528d..1f1bce1 100644
--- a/ReckonPrimer.activity/exstore.py
+++ b/ReckonPrimer.activity/exstore.py
@@ -90,8 +90,11 @@ class ExStore:
         _c1c1c3t2 = Task(copy.deepcopy(_sett), [])
         _sett['*'] = True; _sett['in'] = False; _sett['vadd'] = 10; _sett['vmult'] = 10; _sett['title'] = "grosse Zahlen"
         _c1c1c3t3 = Task(copy.deepcopy(_sett), [])
+####### _c1c2 ################################################################
+####### _c1c2c1 ##############################################################
 ####### _c1c2c1c1 ############################################################
-        _sett['*'] = False; _sett['in'] = False; _sett[':'] = True; _sett['vadd'] = 0; _sett['vmult'] = 1; _sett['factors'] = [2]; _sett['title'] = "2-er Reihe"
+        _sett['*'] = False; _sett['in'] = False; _sett[':'] = True; _sett['vadd'] = 0; _sett['vmult'] = 1; 
+        _sett['factors'] = [2]; _sett['title'] = "2-er Reihe"
         _c1c2c1c1t1 = Task(copy.deepcopy(_sett), [])
         _sett['factors'] = [3]; _sett['title'] = "3-er Reihe"
         _c1c2c1c1t2 = Task(copy.deepcopy(_sett), [])
@@ -110,7 +113,7 @@ class ExStore:
         #_sett['factors'] = [1]; _sett['vmult'] = 1; 
         #_sett['factors'] = [10]; _sett['title'] = "10-er Reihe"
         #_c1c2c1c1t9 = Task(copy.deepcopy(_sett), [])
-####### _c1c2c1c1 ############################################################
+####### _c1c2c1c2 ############################################################
         _sett['factors'] = [2,4]; _sett['title'] = '2,4-er Reihe'
         _c1c2c1c2t1 = Task(copy.deepcopy(_sett), [])
         _sett['factors'] = [2,4,8]; _sett['title'] = '2,4,8-er Reihe'
@@ -121,6 +124,39 @@ class ExStore:
         _c1c2c1c2t3 = Task(copy.deepcopy(_sett), [])
         _sett['factors'] = [3,6,9]; _sett['title'] = '3,6,9-er Reihe'
         _c1c2c1c2t4 = Task(copy.deepcopy(_sett), [])
+####### _c1c2c2 ##############################################################
+####### _c1c2c2c1 ############################################################
+        _sett['remainder'] = True; 
+        _sett['factors'] = [2]; _sett['title'] = "2-er Reihe"
+        _c1c2c2c1t1 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [3]; _sett['title'] = "3-er Reihe"
+        _c1c2c2c1t2 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [4]; _sett['title'] = "4-er Reihe"
+        _c1c2c2c1t3 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [5]; _sett['title'] = "5-er Reihe"
+        _c1c2c2c1t4 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [6]; _sett['title'] = "6-er Reihe"
+        _c1c2c2c1t5 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [7]; _sett['title'] = "7-er Reihe"
+        _c1c2c2c1t6 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [8]; _sett['title'] = "8-er Reihe"
+        _c1c2c2c1t7 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [9]; _sett['title'] = "9-er Reihe"
+        _c1c2c2c1t8 = Task(copy.deepcopy(_sett), [])
+        #_sett['factors'] = [1]; _sett['vmult'] = 1; 
+        #_sett['factors'] = [10]; _sett['title'] = "10-er Reihe"
+        #_c1c2c2c1t9 = Task(copy.deepcopy(_sett), [])
+####### _c1c2c2c2 ############################################################
+        _sett['factors'] = [2,4]; _sett['title'] = '2,4-er Reihe'
+        _c1c2c2c2t1 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [2,4,8]; _sett['title'] = '2,4,8-er Reihe'
+        _c1c2c2c2t2 = Task(copy.deepcopy(_sett), [])
+        #_sett['factors'] = [5,10]; _sett['title'] = '-er Reihe'
+        #_c1c2c2c2t2 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [3,6]; _sett['title'] = '3,6-er Reihe'
+        _c1c2c2c2t3 = Task(copy.deepcopy(_sett), [])
+        _sett['factors'] = [3,6,9]; _sett['title'] = '3,6,9-er Reihe'
+        _c1c2c2c2t4 = Task(copy.deepcopy(_sett), [])
 
 
 
@@ -251,6 +287,18 @@ Collection("root = invisible node","required by tree structure", None,
                         " ", None, 
                 [_c1c2c1c2t1, _c1c2c1c2t2, _c1c2c1c2t3, _c1c2c1c2t4
                 ])
+             ]),
+        Collection(": mit Rest",                                 #_c1c2c2
+                    " ", None, 
+            [Collection("Reihen einzeln",                        #_c1c2c2c1
+                        " ", None, 
+                [_c1c2c2c1t1, _c1c2c2c1t2, _c1c2c2c1t3, _c1c2c2c1t4,
+                 _c1c2c2c1t5, _c1c2c2c1t6, _c1c2c2c1t7, _c1c2c2c1t8
+                ]),
+             Collection("mehrere Reihen",                        #_c1c2c2c2
+                        " ", None, 
+                [_c1c2c2c2t1, _c1c2c2c2t2, _c1c2c2c2t3, _c1c2c2c2t4
+                ])
              ])
         ]),
       Collection("Uebungen + und - ",                            #_c1c3