Changeset 1186

Timestamp:

03/13/10 06:31:24 (5 months ago)

Author:

erikj

Message:

prepare expanded search and sorting of query proxy models

Location:

trunk/camelot

Files:

• admin/validator/entity_validator.py (modified) (1 diff)
• admin/validator/object_validator.py (modified) (1 diff)
• view/controls/formview.py (modified) (1 diff)
• view/controls/tableview.py (modified) (2 diffs)
• view/elixir_admin.py (modified) (2 diffs)
• view/field_attributes.py (modified) (10 diffs)
• view/proxy/collection_proxy.py (modified) (1 diff)
• view/proxy/queryproxy.py (modified) (9 diffs)
• view/wizard/pages/form_page.py (modified) (3 diffs)

trunk/camelot/admin/validator/entity_validator.py

@@ -37 +37 @@
     """
 
-    def objectValidity(self, entity_instance):
-        """:return: list of messages explaining invalid data
-        empty list if object is valid
-        """
-        from camelot.view.controls import delegates
-        messages = []
-        fields_and_attributes = dict(self.admin.get_columns())
-        fields_and_attributes.update(dict(self.admin.get_fields()))
-        for field, attributes in fields_and_attributes.items():
-            # if the field was not editable, don't waste any time
-            if attributes['editable']:
-              value = getattr(entity_instance, field)
-              #@todo: check if field is a primary key instead of checking 
-              # whether the name is id
-              if attributes['nullable']!=True and field!='id':
-                  logger.debug('column %s is required'%(field))
-                  if 'delegate' not in attributes:
-                      raise Exception('no delegate specified for %s'%(field))
-                  is_null = False
-                  if value==None:
-                      is_null = True
-                  elif (attributes['delegate'] == delegates.CodeDelegate) and \
-                       (sum(len(c) for c in value) == 0):
-                      is_null = True
-                  elif (attributes['delegate'] == delegates.PlainTextDelegate) and (len(value) == 0):
-                      is_null = True
-                  elif (attributes['delegate'] == delegates.Many2OneDelegate) and (not value.id):
-                      is_null = True
-                  elif (attributes['delegate'] == delegates.VirtualAddressDelegate) and (not value[1]):
-                      is_null = True                    
-                  if is_null:
-                      messages.append(u'%s is a required field' % (attributes['name']))
-        logger.debug(u'messages : %s'%(u','.join(messages)))
-        return messages
+

trunk/camelot/admin/validator/object_validator.py

@@ -46 +46 @@
         empty list if object is valid
         """
-        return []
+        from camelot.view.controls import delegates
+        messages = []
+        fields_and_attributes = dict(self.admin.get_columns())
+        fields_and_attributes.update(dict(self.admin.get_fields()))
+        for field, attributes in fields_and_attributes.items():
+            # if the field was not editable, don't waste any time
+            if attributes['editable']:
+              value = getattr(entity_instance, field)
+              #@todo: check if field is a primary key instead of checking 
+              # whether the name is id, but this should only happen in the entity validator
+              if attributes['nullable']!=True and field!='id':
+                  logger.debug('column %s is required'%(field))
+                  if 'delegate' not in attributes:
+                      raise Exception('no delegate specified for %s'%(field))
+                  is_null = False
+                  if value==None:
+                      is_null = True
+                  elif (attributes['delegate'] == delegates.CodeDelegate) and \
+                       (sum(len(c) for c in value) == 0):
+                      is_null = True
+                  elif (attributes['delegate'] == delegates.PlainTextDelegate) and (len(value) == 0):
+                      is_null = True
+                  elif (attributes['delegate'] == delegates.Many2OneDelegate) and (not value.id):
+                      is_null = True
+                  elif (attributes['delegate'] == delegates.VirtualAddressDelegate) and (not value[1]):
+                      is_null = True                    
+                  if is_null:
+                      messages.append(u'%s is a required field' % (attributes['name']))
+        logger.debug(u'messages : %s'%(u','.join(messages)))
+        return messages
 
     def isValid(self, row):

trunk/camelot/view/controls/formview.py

@@ -55 +55 @@
         self.setLayout( self._widget_layout )
                 
+    def get_model(self):
+        return self._model
+    
     def set_model(self, model):
         self._model = model

trunk/camelot/view/controls/tableview.py

@@ -127 +127 @@
             self.number_of_rows = None
         layout.addLayout( widget_layout )
-        self._expanded_search = QtGui.QLabel('Expanded')
+        self._expanded_search = QtGui.QWidget()
         self._expanded_search.hide()
         layout.addWidget(self._expanded_search)
@@ -133 +133 @@
         self.setSizePolicy( QSizePolicy.Minimum, QSizePolicy.Fixed )
         self.setNumberOfRows( 0 )
-    
+        post( admin.get_columns, self._fill_expanded_search_options )
+    
+    def _fill_expanded_search_options(self, columns):
+        layout = QtGui.QHBoxLayout()
+        for field, attributes in columns:
+            if 'operators' in attributes:
+                widget = QtGui.QLabel(field)
+                layout.addWidget( widget )
+        self._expanded_search.setLayout( layout )
+        
+        
     def expand_search_options(self):
         if self._expanded_search.isHidden():

trunk/camelot/view/elixir_admin.py

@@ -169 +169 @@
                 from elixir import entities
                 mapped_entities = [str(e) for e in entities]
-                logger.error(u'%s is not a mapped class, mapped classes include %s'%(self.entity, u','.join(mapped_entities)),
+                logger.error(u'%s is not a mapped class, mapped classes include %s'%(self.entity, u','.join([unicode(me) for me in mapped_entities])),
                              exc_info=exception)
                 raise exception
@@ -401 +401 @@
                 model = QueryTableProxy(
                     tableview.admin,
-                    tableview._table_model._query_getter,
+                    tableview._table_model.get_query_getter(),
                     tableview.admin.get_fields,
                     max_number_of_rows=1

trunk/camelot/view/field_attributes.py

@@ -31 +31 @@
 import camelot.types
 import datetime
+import operator
 
 from controls import delegates
@@ -45 +46 @@
 )
 
+_numerical_operators = (operator.eq, operator.lt, operator.le, operator.gt, operator.ge)
 
 _sqlalchemy_to_python_type_ = {
@@ -53 +55 @@
         'nullable': True,
         'delegate': delegates.BoolDelegate,
-        'from_string': bool_from_string
+        'from_string': bool_from_string,
+        'operators' : (operator.eq,),
     },
 
@@ -61 +64 @@
         'nullable': True,
         'delegate': delegates.BoolDelegate,
-        'from_string': bool_from_string
+        'from_string': bool_from_string,
+        'operators' : (operator.eq,),
     },
 
@@ -72 +76 @@
         'nullable': True,
         'delegate': delegates.DateDelegate,
-        'from_string': date_from_string
+        'from_string': date_from_string,
+        'operators' : _numerical_operators,
     },
 
@@ -83 +88 @@
             'format': constants.camelot_time_format,
             'nullable': True,
-            'from_string': time_from_string
+            'from_string': time_from_string,
+            'operators': _numerical_operators,
     },
 
@@ -94 +100 @@
         'nullable': True,
         'delegate': delegates.DateTimeDelegate,
-        'from_string': datetime_from_string
+        'from_string': datetime_from_string,
+        'operators': _numerical_operators,
     },
 
@@ -105 +112 @@
         'nullable': True,
         'delegate': delegates.FloatDelegate,
-        'from_string': float_from_string
+        'from_string': float_from_string,
+        'operators': _numerical_operators,
     },
 
@@ -117 +125 @@
         'from_string': int_from_string,
         'to_string': unicode,
-        'widget': 'int'
+        'widget': 'int',
+        'operators': _numerical_operators,
     },
 
@@ -128 +137 @@
         'delegate': delegates.IntegerDelegate,
         'from_string': int_from_string,
-        'widget': 'int'
+        'widget': 'int',
+        'operators': _numerical_operators,
     },
 

trunk/camelot/view/proxy/collection_proxy.py

@@ -259 +259 @@
         self.logger.debug( 'initialization finished' )
 
+    def get_validator(self):
+        return self.validator
+    
     def map_to_source(self, sorted_row_number):
         """Converts a sorted row number to a row number of the source

trunk/camelot/view/proxy/queryproxy.py

@@ -33 +33 @@
 logger = logging.getLogger('camelot.view.proxy.queryproxy')
 
-from collection_proxy import CollectionProxy, stripped_data_to_unicode, \
-                             strip_data_from_object, tool_tips_from_object, \
-                             background_colors_from_object
-from camelot.view.model_thread import model_function, gui_function
+from collection_proxy import CollectionProxy, strip_data_from_object
+from camelot.view.model_thread import model_function, gui_function, post
 
 
@@ -50 +48 @@
         logger.debug('initialize query table')
         self._query_getter = query_getter
+        self._sort_decorator = None
         #rows appended to the table which have not yet been flushed to the
         #database, and as such cannot be a result of the query
@@ -56 +55 @@
                                  columns_getter, max_number_of_rows=10, edits=None)
 
+    def get_query_getter(self):
+        if not self._sort_decorator:
+            return self._query_getter
+        else:
+            
+            def sorted_query_getter():
+                return self._sort_decorator(self._query_getter())
+            
+            return sorted_query_getter
+    
     @model_function
     def _clean_appended_rows(self):
@@ -69 +78 @@
     def getRowCount(self):
         self._clean_appended_rows()
-        return self._query_getter().count() + len(self._appended_rows)
+        return self.get_query_getter()().count() + len(self._appended_rows)
 
     @gui_function
@@ -80 +89 @@
         
         def collection_getter():
-            return self._query_getter().all()
+            return self.get_query_getter()().all()
         
         return collection_getter
@@ -86 +95 @@
     @gui_function
     def sort( self, column, order ):
-        pass   
+        
+        def create_set_sort_decorator(column, order):
+
+            def set_sort_decorator():
+                from sqlalchemy import orm
+                from sqlalchemy.exceptions import InvalidRequestError
+                field_name = self._columns[column][0]
+                class_attribute = getattr(self.admin.entity, field_name)
+                mapper = orm.class_mapper(self.admin.entity)
+                try:
+                    property = mapper.get_property(
+                        field_name,
+                        resolve_synonyms=True
+                    )
+                except InvalidRequestError:
+                    #
+                    # If the field name is not a property of the mapper, we cannot
+                    # sort it using sql
+                    #
+                    return self.rows
+                
+                def create_sort_decorator(class_attribute, order):
+                    
+                    def sort_decorator(query):
+                        if order:
+                            return query.order_by(class_attribute.desc())
+                        else:
+                            return query.order_by(class_attribute)
+                    
+                    return sort_decorator
+                
+                
+                self._sort_decorator = create_sort_decorator(class_attribute, order)
+                return self.rows
+                    
+            return set_sort_decorator
+            
+        post( create_set_sort_decorator(column, order), self._refresh_content )
 
     def append(self, o):
@@ -103 +149 @@
     def getData(self):
         """Generator for all the data queried by this proxy"""
-        for _i,o in enumerate(self._query_getter().all()):
+        for _i,o in enumerate(self.get_query_getter()().all()):
             yield strip_data_from_object(o, self.getColumns())
 
@@ -109 +155 @@
     def _extend_cache(self, offset, limit):
         """Extend the cache around row"""
-        q = self._query_getter().offset(offset).limit(limit)
+        q = self.get_query_getter()().offset(offset).limit(limit)
         columns = self.getColumns()
         for i, o in enumerate(q.all()):
@@ -136 +182 @@
                 pass
             # momentary hack for list error that prevents forms to be closed
-            res = self._query_getter().offset(row)
+            res = self.get_query_getter()().offset(row)
             if isinstance(res, list):
                 res = res[0]

trunk/camelot/view/wizard/pages/form_page.py

@@ -26 +26 @@
 #  ============================================================================
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 from camelot.core.utils import ugettext as _
 from camelot.view.art import Icon
+from camelot.view.model_thread import post
 
 class FormPage(QtGui.QWizardPage):
@@ -37 +38 @@
     
     To access the data stored by the wizard form into a data object, use its
-    get_data method .
+    get_data method.
+    
+    The 'Next' button will only be activated when the form is complete.
     """
 
@@ -57 +60 @@
         self.setPixmap(QtGui.QWizard.LogoPixmap, self.get_icon().getQPixmap())
         self._data = self.Data()
+        self._complete = False
         
         admin = self.get_admin()
-        collection_proxy = CollectionProxy(admin, lambda:[self._data], admin.get_fields)
+        self._model = CollectionProxy(admin, lambda:[self._data], admin.get_fields)
         
         layout = QtGui.QVBoxLayout()
         form = FormWidget(admin)
-        form.set_model(collection_proxy)
+        self.connect(form, FormWidget.changed_signal, self._form_changed)
+        form.set_model(self._model)
         layout.addWidget(form)
         self.setLayout(layout)
+    
+    def _form_changed(self):
+        
+        def is_valid():
+            return self._model.get_validator().isValid(0)
+        
+        post(is_valid, self._change_complete)
+        
+    def _change_complete(self, complete):
+        self._complete = complete
+        self.emit(QtCore.SIGNAL('completeChanged ()'))
             
+    def isComplete(self):
+        return self._complete
+    
     def get_admin(self):
         from camelot.view.application_admin import get_application_admin