more work on redesigning
authorMax Usachev <maxusachev@gmail.com>
Fri, 11 Jun 2010 12:46:14 +0000 (15:46 +0300)
committerMax Usachev <maxusachev@gmail.com>
Mon, 14 Jun 2010 09:27:18 +0000 (12:27 +0300)
controller.py
database/SQLite.py
ui/hildon_ui.py

index 687eec3..9878d23 100644 (file)
@@ -7,10 +7,6 @@ class MeabookController:
         self.config = config
         self.model = model
         self.view = view_class(self)
-
-        # activate necessary level
-        level = self.config.get_last_active_level()
-        self.view.show_items(None, level)
         self.view.start()
 
     def stop(self):
@@ -19,23 +15,38 @@ class MeabookController:
         self.config.set_last_active_level(self.view.get_current_level())
         self.model.close()
 
-    def get_level1_items(self, parent=None):
-        """Gets from model level1 items."""
+    def get_items(self, parent=0):
+        """Gets from model items with selected level."""
+
+        folders_list = list(self.get_all_folders(parent))
+        files_list = [(fields['cn'], internal_name, 'file') for internal_name, \
+            fields in self.model.get_files(['cn'], parent).items()]
+        return folders_list + files_list
+
+    def get_item(self, _id):
+        """Gets person info."""
+
+        return self.model.get_entry_by_id(_id)
+
+    def get_all_folders(self, parent=0):
+        """Gets all filials."""
 
-        #return self.model.....
-        return [('level1', 1)]
+        return [(name, internal_name, 'folder') for name, internal_name in \
+            self.model.get_folders(parent)]
 
-    def get_level2_items(self, parent=None):
-        """Gets from model level2 items."""
+    def get_all_subfolders(self):
+        """Gets all departments."""
 
-        #return self.model.....
-        return [('level2', 1)]
+        return [(name, internal_name, 'folder') for name, internal_name in \
+            self.model.get_folders()]
 
-    def get_level3_items(self, parent=None):
-        """Gets from model level3 items."""
+    def get_all_files(self):
+        """Gets all peoples."""
 
-        #return self.model.....
-        return [('level3', 1)]
+        # FIXME: read field names from Config
+        files_dict = self.model.get_files(['cn'])
+        return [(files_dict[internal_name]['cn'], internal_name, 'file') for \
+            internal_name in files_dict]
 
     def get_fields(self):
         """Returns all exists fields from model."""
index 42a0379..01870d7 100644 (file)
@@ -146,41 +146,53 @@ class SQLite:
         return dict([(key, value) for key, value in self.conn.execute("\
             SELECT field_id, value FROM data WHERE id=?", (_id,)).fetchall()])
 
-    def get_structs(self, parent=0):
-        """Returns list of all struct from STRUCT table."""
+    def get_folders(self, parent=None):
+        """
+        Returns list of all folders (items with folders and files)
+        from STRUCT table.
+        """
 
-        return self.conn.execute("SELECT DISTINCT name, id FROM struct \
-            WHERE parent=? ORDER BY name ASC", (parent,)).fetchall()
-
-    def get_middlelevel_entries(self, parent=None):
-        """Returns list of all middlelevel entries from DATA table."""
-
-        if not parent:
+        if parent is None:  # return all folders on level2
             return self.conn.execute("SELECT DISTINCT name, id FROM struct \
                 WHERE parent!=0 ORDER BY name ASC").fetchall()
         else:
-            return self.conn.execute("SELECT name, id FROM struct WHERE \
-                parent=? ORDER BY name ASC", (parent[1],)).fetchall()
-
-    def get_lowlevel_entries(self, parent=None):
-        """Returns list of all lowlevel entries from DATA table."""
-
-        if not parent:
-            return self.conn.execute("SELECT DISTINCT value FROM data WHERE \
-                field_id=? ORDER BY value ASC", (LOWLEVEL_FIELD,)).fetchall()
-        else:
-            print parent
-            return self.conn.execute("SELECT value FROM \
-                data WHERE id IN (SELECT DISTINCT id FROM data WHERE value=?) AND field_id='cn' \
-                ORDER BY value ASC", (parent, )).fetchall()
+            return self.conn.execute("SELECT DISTINCT name, id FROM struct \
+                WHERE parent=? ORDER BY name ASC", (parent,)).fetchall()
+
+    def get_files(self, fields, parent=0):
+        """Returns list of all files from DATA table."""
+
+        items_dict = {}
+        fields_string = ','.join('%r' % (field,) for field in fields)
+        if parent == 0: # get all files
+            sql_res = self.conn.execute("select data.id as id, fields.name, \
+            data.value as name from data left join fields on data.field_id=\
+            fields.id left join relation on data.id=relation.data_id where \
+            fields.name in (%s)" % fields_string)
+        else: # get files for selected parent
+            sql_res = self.conn.execute("select data.id as id, fields.name, \
+            data.value as name from data left join fields on data.field_id=\
+            fields.id left join relation on data.id=relation.data_id where \
+            fields.name in (%s) and relation.struct_id=?" % fields_string, \
+            (parent,))
+        if sql_res is None:
+            return {}
+        for _id, fname, fvalue in sql_res.fetchall():
+            if not items_dict.has_key(_id):
+                items_dict[_id] = {}
+            items_dict[_id][fname] = fvalue
+        return items_dict
 
     def get_entry_by_id(self, _id):
         """Returns full entry by it id."""
 
-        sql_res = self.conn.execute("""SELECT id_field, value FROM data 
-            WHERE id=?""", (_id,)).fetchall()
-        return dict([(self.get_field_name_by_id(field_id), value) for field_id, \
-            value in sql_res])
+        sql_res = self.conn.execute("SELECT fields.name, data.value AS name \
+        FROM data LEFT JOIN fields ON data.field_id=fields.id LEFT JOIN \
+        relation ON data.id=relation.data_id WHERE data.id=?", (_id,))
+        if sql_res is None:
+            return {}
+        else:
+            return dict(sql_res.fetchall())
 
     def get_all_entries(self):
         """Returns list of all entries."""
index d3d6a81..0aaabeb 100644 (file)
@@ -25,9 +25,7 @@ def create_button(title, value):
 class HildonMeabook(MeabookUI):
     def __init__(self, controller):
         MeabookUI.__init__(self, controller)
-        self.internal_names = []
         self.handler = None
-        self.level = 1
         self.window = hildon.StackableWindow()
         self.window.set_title(_('Meabook'))
         self.window.connect('destroy', self.exit)
@@ -39,27 +37,22 @@ class HildonMeabook(MeabookUI):
         about_button = hildon.Button(gtk.HILDON_SIZE_AUTO, \
             hildon.BUTTON_ARRANGEMENT_HORIZONTAL, _('About'))
 
-        # create filter widgets
+        # create filter widgets and connect signals
         self.level1_filter = gtk.RadioButton(None, _('level1'))
         self.level2_filter = gtk.RadioButton(self.level1_filter, _('level2'))
         self.level3_filter = gtk.RadioButton(self.level2_filter, _('level3'))
         for filter_widget in [self.level1_filter, self.level2_filter, \
             self.level3_filter]:
             filter_widget.set_mode(False)
+            filter_widget.connect('toggled', self.apply_filter_cb)
 
         # create items list
-        self.selector = hildon.TouchSelector(text=True)
+        self.selector = hildon.TouchSelector()
 
         # connect signals
         settings_button.connect('clicked', self.show_settings_dialog_cb)
         about_button.connect('clicked', self.show_about_dialog_cb)
         self.handler = self.selector.connect('changed', self.select_item_cb)
-        self.level1_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level1_items)
-        self.level2_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level2_items)
-        self.level3_filter.connect('toggled', self.apply_filter_cb, \
-            self.controller.get_level3_items)
 
         # packing widgets
         self.window.add(self.selector)
@@ -78,11 +71,17 @@ class HildonMeabook(MeabookUI):
         # temporary block handler
         selector.handler_block(handler)
 
-        self.internal_names = []
-        selector.get_model(0).clear()
-        for item in items:
-            selector.append_text(item[0])
-            self.internal_names.append(item[1])
+        # setting new content
+        # model: name, internal_name, type
+        model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT, \
+            gobject.TYPE_STRING)
+        for name, internal_name, item_type in items:
+            _iter = model.append()
+            model.set(_iter, 0, name)
+            model.set(_iter, 1, internal_name)
+            model.set(_iter, 2, item_type)
+        selector.remove_column(0)
+        selector.append_text_column(model, False)
         selector.unselect_all(0)
 
         # reconnect callback
@@ -91,40 +90,23 @@ class HildonMeabook(MeabookUI):
     def _show_items_dialog(self, title, items):
         """Creates dialog with items."""
 
-        selector = hildon.TouchSelector(text=True)
+        selector = hildon.TouchSelector()
         window = hildon.StackableWindow()
         window.set_title(title)
-        window.connect('destroy', self._decrease_level)
         window.add(selector)
         handler = selector.connect('changed', self.select_item_cb)
         self._set_selector_content(selector, handler, items)
         window.show_all()
 
-    def _decrease_level(self, widget):
-        self.level -= 1
-
     # Implementation of Base UI interface
     def start(self):
+        self.apply_filter_cb(self.level1_filter)
         gtk.main()
 
     def exit(self, event):
         gtk.main_quit()
         self.controller.stop()
 
-    def get_current_level(self):
-        return self.level
-
-    def show_items(self, items, level):
-        self.level = level
-        if level == 1:  # level1_button is not in gorup, process separately
-            self.level1_filter.set_active(True)
-            self.apply_filter_cb(self.level1_filter, \
-                self.controller.get_level1_items, items)
-        elif level == 2:
-            self.level2_filter.set_active(True)
-        else:
-            self.level3_filter.set_active(True)
-
     def show_about_dialog(self):
         dialog = hildon.Dialog()
         dialog.set_title(_('About'))
@@ -152,48 +134,47 @@ class HildonMeabook(MeabookUI):
 
         ConfigurationDialog(self.controller)
 
-    def apply_filter_cb(self, widget, func, items=None):
+    def apply_filter_cb(self, widget):
         """Updates toplevel selector with different level items."""
 
         if not widget.get_active():
             return
 
-        if widget == self.level1_filter: self.level = 1
-        elif widget == self.level2_filter: self.level = 2
-        else: self.level = 3
-
-        # update list content
-        self._set_selector_content(self.selector, self.handler, items or func())
-
         self.window.set_title(' - '.join([_('Meabook'), widget.get_label()]))
 
+        if widget == self.level1_filter:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_folders())
+        elif widget == self.level2_filter:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_subfolders())
+        else:
+            self._set_selector_content(self.selector, self.handler, \
+                self.controller.get_all_files())
+
     def select_item_cb(self, widget, column):
-        """Emits when changes selector content."""
-
-        name, internal_name = widget.get_current_text(), \
-            widget.get_active(0)
-        if self.level == 1:
-            items = self.controller.get_level2_items((name, internal_name))
-            self._show_items_dialog(name, items)
-            self.level = 2
-        elif self.level == 2:
-            items = self.controller.get_level3_items((name, internal_name))
-            self._show_items_dialog(name, items)
-            self.level = 3
+        """
+        Emits when changes selector content.
+        Opens new StackableWindow with new content.
+        """
+
+        selected_item_index = widget.get_active(0)
+        _iter = widget.get_model(0)[selected_item_index]
+        if _iter[2] == 'folder':
+            self._show_items_dialog(_iter[0], self.controller.get_items(\
+                _iter[1]))
         else:
-            print 'show item details'
+            self._show_item_dialog(_iter[0], self.controller.get_item(_iter[1]))
 
-    def show_item_dialog(self, widget, column):
+    def _show_item_dialog(self, title, item):
         """Shows detailed item information."""
 
-        selected_item = widget.get_current_text()
-        entry = self.database.get_entry(selected_item)
         window = hildon.StackableWindow()
-        window.set_title(selected_item)
+        window.set_title(title)
         pannable_area = hildon.PannableArea()
         vbox = gtk.VBox()
 
-        for key, value in entry.items():
+        for key, value in item.items():
             button = create_button(_(key) , value)
             vbox.pack_start(button)