123

diff --git a/database/db.py b/database/db.py
index bdb24a0..fc808dc 100755 (executable)
--- a/database/db.py
+++ b/database/db.py
@@ -50,13 +50,35 @@ class DbSqlite:
                     "from data left join field "
                     "on data.id_field=field.id "
                     "left join relation on data.id=relation.id_data "
-                    "where field.name=? and relation.id_struct=?", (field, struct))
+                    "where field.name=? and relation.id_struct=? ", (field, struct))
         self.data = {}
         for row in cur:
             #print row
             self.data[row[0]] = row[1]
         return self.data
 
+    def get_allrecords1(self, field, struct):
+        
+        """return records"""
+        cur = self.conn.cursor()
+        cur.execute("select distinct data.id "
+                    "from data left join relation on data.id=relation.id_data "
+                    "where relation.id_struct=?", (struct,))
+        self.data = {}
+        cur1 = self.conn.cursor();
+        for row in cur:
+            #print row
+            cur1.execute("select data.value from data "
+                        "left join field on data.id_field=field.id "
+                        "where data.id=? and field.type=1 "
+                        "order by field.sort", (row[0],));
+            str = "";
+            for row1 in cur1:
+                str += row1[0]
+                str += " "
+            self.data[row[0]] = str;    
+        return self.data
+        
     def get_id(self, table, value):
         
         """get id for value into table"""

diff --git a/list.py b/list.py
index 72ed59d..def19de 100755 (executable)
--- a/list.py
+++ b/list.py
@@ -48,7 +48,7 @@ class List:
         
         self.buttons = {} 
         self.buttons[0] = gtk.Button(u"Всего")
-        self.max_buttons = 1;
+        self.max_buttons = 1
         self.buttons[0].connect("clicked", self.button_back, 0, 0)
         self.hbox.add(self.buttons[0])
         self.buttons[0].show()
@@ -58,7 +58,7 @@ class List:
         sw.set_shadow_type(gtk.SHADOW_ETCHED_IN)
         sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
-        vbox.pack_start(self.hbox, True, True, 0)
+        vbox.pack_start(self.hbox, False, True, 0)
         vbox.pack_end(sw, True, True, 0)
         
         self.dbo = db.DbSqlite()
@@ -119,12 +119,11 @@ class List:
         if self.buttons.has_key(self.max_buttons) == 0:
             self.buttons[self.max_buttons] = gtk.Button()
             self.hbox.add(self.buttons[self.max_buttons])
-        print self.buttons[self.max_buttons]
-        print self.buttons[self.max_buttons].get_label()
         self.buttons[self.max_buttons].set_label(widget.get_model()[path][1])
         self.buttons[self.max_buttons].connect("clicked", self.button_back, parent, self.max_buttons)
 
         self.buttons[self.max_buttons].show()
+        self.hbox.add(self.buttons[self.max_buttons])
         self.max_buttons = self.max_buttons + 1
 #        self.buttons[self.max_buttons] = gtk.Button()
         self.show_list(parent)
@@ -148,8 +147,8 @@ class List:
          
         # delete not use buttons
         while self.max_buttons - 1 > number:
-            self.buttons[self.max_buttons-1].set_label(" ");
-
+            self.buttons[self.max_buttons-1].set_label(" ")
+            self.hbox.remove(self.buttons[self.max_buttons-1])
             self.max_buttons = self.max_buttons - 1
         
         print "button back data= %i " % number