get exercises from collection OK

3 files changed, 16 insertions, 13 deletions

diff --git a/ReckonPrimer.activity/coach.py b/ReckonPrimer.activity/coach.py
index 6503857..05fa42e 100755
--- a/ReckonPrimer.activity/coach.py
+++ b/ReckonPrimer.activity/coach.py
@@ -65,20 +65,20 @@ class Coach:
         #print("in coach.request_exercise")
         #self._dis.offer_coll_to_learner([t.get_topic() for t in self._exs])
         self._dis.offer_coll_to_learner(self._collect)
-        # calls back with notify('setting-done'...
+        # calls back with notify('exerc-selected'...
 
     def notify(self, (msg, data)):
         """called by the observed objects"""
-
-        print("in Coach.notify: msg=, data=", (msg, data))
+        print("in coach.notify: msg=, data=", (msg, data))
         if msg == 'setting-done': # from 
             # + self._setts.save_last_sett(self._key, data)
             self._ex.update_setting(data)
-            self._update_exs(self._ex)
+            self._update_exs(self._ex) ################################
             self._learner.notify((msg, self._ex))
         elif msg == 'exerc-selected':
-            self._ex = self.get_ex(data)
-            print('in Coach.notify(exerc-selected), 93 self._ex._sett=',
+            #self._ex = self.get_ex(data)
+            self._ex = self._collect.select(data)
+            print('in coach.notify(exerc-selected), 93 self._ex._sett=',
                   self._ex._sett)
             self._dis.offer_setting(self._ex)
 
diff --git a/ReckonPrimer.activity/collection.py b/ReckonPrimer.activity/collection.py
index e3761ad..948dccd 100644
--- a/ReckonPrimer.activity/collection.py
+++ b/ReckonPrimer.activity/collection.py
@@ -32,6 +32,9 @@ class Collection:
     def select(self, key):
         """ Select an exercise by key. """
         #WN.LV Code ersetzen, key NICHT fuer Listen sondern fuer ...
+        print('in collection.select, key=', key)
+        print('in collection.select, _data=', self._data)
+        print('in collection.select, _data[key]=', self._data[key])
         _sett = self._data[key]
         if _sett['topic'] == 'addsub_simp':
             return ExAddSimp(self._display, _sett)
@@ -59,7 +62,6 @@ class Collection:
         #WN.LV diesen Code ersetzen !!!!!
         _i = 0
         for _t in ['addsub_simp','passten','times_div']:
-            _i = _i + 1
             self.button = gtk.Button()
             self.image = gtk.Image()
             
@@ -71,9 +73,10 @@ class Collection:
                 self.image.set_from_file("img/times_div.jpg")
 
             self.button.set_image(self.image)
-            self.button.connect("clicked", self.select_exerc_callback, _t)
+            self.button.connect("clicked", self.select_exerc_callback, _i)
             self.topic_box.pack_start(self.button)
             self.button.show()
+            _i = _i + 1
         self.topic_box.show()
 
          
diff --git a/ReckonPrimer.activity/settings.py b/ReckonPrimer.activity/settings.py
index 84c9ba3..3e115a9 100755
--- a/ReckonPrimer.activity/settings.py
+++ b/ReckonPrimer.activity/settings.py
@@ -95,15 +95,15 @@ class Settings:
         }

         #!!!extend here with additional topic!!!

                           

-        self._setts = {'default_addsub_simp' : self._default_addsub_simp,

-                       'default_passten'     : self._default_passten,

-                       'default_times_div'   : self._default_times_div

+        self._setts = {'addsub_simp' : self._default_addsub_simp,

+                       'passten'     : self._default_passten,

+                       'times_div'   : self._default_times_div

                        #!!!extend here with additional topic!!!

         }

 

     def get_setting(self, key):

-        print("in Settings.get_setting, key=" + key)

-        return (key, self._setts['default_' + key])        

+        print("in settings.get_setting, key=" + key)

+        return self._setts[key]

     

     def load_last_sett(self, key):

         _dict = None