Changeset 30

Timestamp:

11/21/08 18:44:50 (7 weeks ago)

Author:

fcavazza

Message:

a

Files:

• gnrjs/gnr_d11/js/genro_frm.js (modified) (1 diff)
• gnrjs/gnr_d11/js/genro.js (modified) (1 diff)
• gnrjs/gnr_d11/js/genro_rpc.js (modified) (1 diff)
• gnrjs/gnr_d11/js/gnrdomsource.js (modified) (2 diffs)
• gnrpy/gnr/sql/gnrsqldata.py (modified) (1 diff)
• gnrpy/gnr/sql/gnrsqltable.py (modified) (1 diff)
• gnrpy/gnr/web/gnrwebapphandler.py (modified) (4 diffs)
• gnrpy/gnr/web/gnrwebpage.py (modified) (4 diffs)
• gnrpy/packages/adm/webpages/manage_users.py (modified) (1 diff)
• gnrpy/packages/_common_d11/webpages/_resources/public.py (modified) (1 diff)
• gnrpy/packages/_common_d11/webpages/_resources/standard_tables.py (modified) (4 diffs)
• gnrpy/packages/showcase/webpages/Widgets/Form/textbox.py (modified) (1 diff)

gnrjs/gnr_d11/js/genro_frm.js

@@ -270 +270 @@
             }
         }
-    }
+    },
+    
     
 });

gnrjs/gnr_d11/js/genro.js

@@ -696 +696 @@
         params = objectUpdate({}, params);
         var resolverName = resolverName || objectPop(params, '_resolver_name');
-        return this['remote_'+resolverName].call(this, params, parentbag);
-    },
-    remote_relOneResolver: function(params, parentbag){
-        var kw = {};
-        var cacheTime = -1;
-        var isGetter = false;
-        var sync=('sync' in params)? objectPop(params,'sync'):true;
-        var kwargs = { 'sync':sync,'from_fld':params._from_fld, 'target_fld':params._target_fld, 'sqlContextName':params._sqlContextName};
-        kwargs.method = 'app.getRelatedRecord';
-        
-        var resolver = new gnr.GnrRemoteResolver(kwargs, isGetter, cacheTime);
-        resolver.updateAttr=true;
-        var _related_field = params._target_fld.split('.')[2];
-        
-        if(params._auto_relation_value){
-            resolver.relation_fld = params._auto_relation_value; //params._from_fld.split('.')[2];
-            var dataprovider = function(){
-                return this.getParentNode().getParentBag().getItem(this.relation_fld);
-            };
-            kwargs[_related_field] = dojo.hitch(resolver, dataprovider);
-
-            //TODO: move that feature to BagNode.setResolver
-            var valNode = parentbag.getNode(resolver.relation_fld);
-            var reloader = function(){
-                this.getParentNode().getValue('reload');
-            };
-            valNode._onChangedValue = dojo.hitch(resolver, reloader);
-
-        } else {
-                kwargs[_related_field] = params._relation_value;
-        }
-        return resolver;
-    },
-    remote_relManyResolver: function(params){
-        var kw = {};
-        var cacheTime = -1;
-        var isGetter = false;
-        
-        var kwargs = {'sync':true, 
-                      'from_fld':params._from_fld, 'target_fld':params._target_fld, 'relation_value':params._relation_value,
-                      'sqlContextName':params._sqlContextName};
-        kwargs.method = 'app.getRelatedSelection';
-                
-        var resolver = new gnr.GnrRemoteResolver(kwargs, isGetter, cacheTime);
-        resolver.updateAttr=true;
-        resolver.onSetResolver = function(node){
-            node.newBagRow = function(defaultArgs){
-                //var defaultArgs = defaultArgs || {};
-                var resolver = genro.getRelationResolver(objectUpdate(this.attr.childResolverParams,{'sync':true}));
-                resolver.kwargs.newRecordDefualts = defaultArgs;
-                var result = new gnr.GnrBagNode(null,'label',null ,this.attr.childResolverParams,resolver);
-                if ((!this._newRowTemplate) || (!objectIsEqual(defaultArgs,this._oldDefaultArgs||{}))){
-                    resolver._keepResponse=true;
-                    this._oldDefaultArgs=defaultArgs;
-                    result.getValue().toXml();
-                    this._lastResponse=resolver._lastResponse;
-                    resolver._lastResponse=null;
-                    this._newRowTemplateAttr=result.attr;
-                }else{
-                    var envelope = new gnr.GnrBag();
-                    envelope.fromXmlDoc(this._lastResponse, genro.clsdict);
-                    result._value=envelope.getValue('result');
-                    resolver.lastUpdate=new Date();
-                    objectUpdate(result.attr,this._newRowTemplateAttr);
-                }
-                return result;
-            };
-        };
-        resolver.updateAttr=true;
-        return resolver;
+        return genro.rpc['remote_'+resolverName].call(genro.rpc, params, parentbag);
     },
     loadUserObject: function(path, params){

gnrjs/gnr_d11/js/genro_rpc.js

@@ -485 +485 @@
                         }, 1000);
         }
+    },
+    
+    
+    remote_relOneResolver: function(params, parentbag){
+        var kw = {};
+        var cacheTime = -1;
+        var isGetter = false;
+        var sync=('sync' in params)? objectPop(params,'sync'):true;
+        var kwargs = { 'sync':sync,'from_fld':params._from_fld, 
+                                 'target_fld':params._target_fld, 
+                             'sqlContextName':params._sqlContextName};
+        kwargs.method = 'app.getRelatedRecord';
+        
+        var resolver = new gnr.GnrRemoteResolver(kwargs, isGetter, cacheTime);
+        resolver.updateAttr=true;
+        resolver.onloading = function(kwargs){
+            var target = kwargs.target_fld.split('.');
+            var table = target[0] + '_' + target[1];
+            kwargs['loadingParameters'] = genro.getData('gnr.tables.'+table+'.loadingParameters');
+        };
+        var _related_field = params._target_fld.split('.')[2];
+        
+        if(params._auto_relation_value){
+            resolver.relation_fld = params._auto_relation_value; //params._from_fld.split('.')[2];
+            var dataprovider = function(){
+                return this.getParentNode().getParentBag().getItem(this.relation_fld);
+            };
+            kwargs[_related_field] = dojo.hitch(resolver, dataprovider);
+
+            //TODO: move that feature to BagNode.setResolver
+            var valNode = parentbag.getNode(resolver.relation_fld);
+            var reloader = function(){
+                this.getParentNode().getValue('reload');
+            };
+            valNode._onChangedValue = dojo.hitch(resolver, reloader);
+
+        } else {
+                kwargs[_related_field] = params._relation_value;
+        }
+        return resolver;
+    },
+    remote_relManyResolver: function(params){
+        var kw = {};
+        var cacheTime = -1;
+        var isGetter = false;
+        
+        var kwargs = {'sync':true, 
+                      'from_fld':params._from_fld, 'target_fld':params._target_fld, 'relation_value':params._relation_value,
+                      'sqlContextName':params._sqlContextName};
+        kwargs.method = 'app.getRelatedSelection';
+                
+        var resolver = new gnr.GnrRemoteResolver(kwargs, isGetter, cacheTime);
+        resolver.updateAttr=true;
+        resolver.onSetResolver = function(node){
+            node.newBagRow = function(defaultArgs){
+                //var defaultArgs = defaultArgs || {};
+                var resolver = genro.getRelationResolver(objectUpdate(this.attr.childResolverParams,{'sync':true}));
+                resolver.kwargs.newRecordDefualts = defaultArgs;
+                var result = new gnr.GnrBagNode(null,'label',null ,this.attr.childResolverParams,resolver);
+                if ((!this._newRowTemplate) || (!objectIsEqual(defaultArgs,this._oldDefaultArgs||{}))){
+                    resolver._keepResponse=true;
+                    this._oldDefaultArgs=defaultArgs;
+                    result.getValue().toXml();
+                    this._lastResponse=resolver._lastResponse;
+                    resolver._lastResponse=null;
+                    this._newRowTemplateAttr=result.attr;
+                }else{
+                    var envelope = new gnr.GnrBag();
+                    envelope.fromXmlDoc(this._lastResponse, genro.clsdict);
+                    result._value=envelope.getValue('result');
+                    resolver.lastUpdate=new Date();
+                    objectUpdate(result.attr,this._newRowTemplateAttr);
+                }
+                return result;
+            };
+        };
+        resolver.updateAttr=true;
+        return resolver;
     }
     

gnrjs/gnr_d11/js/gnrdomsource.js

@@ -160 +160 @@
         var _if=objectPop(attributes,'_if');
         var _else=objectPop(attributes,'_else');
+        var expr;
+        if(tag=='dataFormula'){
+            expr=objectPop(attributes,'formula');
+        }else if ((tag=='dataController') || (tag=='dataScript')){
+            expr=objectPop(attributes,'script');
+        }else {
+            expr=objectPop(attributes,'method');
+        }
         var argValues=[node];
         var argNames=['_node'];
@@ -175 +183 @@
         }
         if(tag=='dataFormula' || tag=='dataScript' || tag=='dataController' || tag=='dataRpc'){
-            var expr;
-            if(tag=='dataFormula'){
-                expr=objectPop(attributes,'formula');
-            }else if ((tag=='dataController') || (tag=='dataScript')){
-                expr=objectPop(attributes,'script');
-            }else {
-                expr=objectPop(attributes,'method');
-            }
             var val;
             if(! if_result){
+                if(!_else){
+                    return;
+                }
                 expr=_else;
             }
-            if(expr){
-                if(tag=='dataRpc' && (expr != _else)){
-                     var doCall = true;
-                     var method=expr;
-                     var httpMethod = objectPop(kwargs,'_POST')? 'POST' :'GET';
-                     var _onResult = objectPop(kwargs,'_onResult');
-                     var _onCalling = objectPop(kwargs,'_onCalling');
-                     objectExtract(kwargs,'_*');
-                     if (_onResult){
-                        _onResult = dojo.hitch(this, funcCreate(_onResult));
-                     }
-                     kwargs['_rpc_resultPath']=destinationPath;
-                     var cb = function(result){
-                                                  dataNode.setValue(result);
-                                                  if(_onResult){
-                                                        _onResult(result);
-                                                  }
-                                            };
-                    
-                     if (_onCalling){
-                         doCall = funcCreate(_onCalling, argNames.join(',')).apply(this,argValues);
-                     }
-                    if(doCall != false){
-                        genro.rpc.remoteCall(method, kwargs, null, httpMethod, null, cb);
-                    }
-                }
-                else{ 
-                    expr=(tag=='dataFormula')? 'return '+expr : expr;
-                    var result=funcCreate(expr,argNames.join(',')).apply(this,argValues);
-                    if (dataNode){ // if it has a dataNode set it to the returned value
-                        dataNode.setValue(result);
-                    }
-                } 
-            }
+            if(tag=='dataRpc' && (expr != _else)){
+                 var doCall = true;
+                 var method=expr;
+                 var httpMethod = objectPop(kwargs,'_POST')? 'POST' :'GET';
+                 var _onResult = objectPop(kwargs,'_onResult');
+                 var _onCalling = objectPop(kwargs,'_onCalling');
+                 objectExtract(kwargs,'_*');
+                 if (_onResult){
+                    _onResult = dojo.hitch(this, funcCreate(_onResult));
+                 }
+                 kwargs['_rpc_resultPath']=destinationPath;
+                 var cb = function(result){
+                                              dataNode.setValue(result);
+                                              if(_onResult){
+                                                    _onResult(result);
+                                              }
+                                        };
+                
+                 if (_onCalling){
+                     doCall = funcCreate(_onCalling, argNames.join(',')).apply(this,argValues);
+                 }
+                if(doCall != false){
+                    genro.rpc.remoteCall(method, kwargs, null, httpMethod, null, cb);
+                }
+            }
+            else{
+                var result;
+                if(!expr){
+                    result = new gnr.GnrBag(kwargs);
+                } else {
+                    expr = (tag=='dataFormula') ? 'return '+ expr : expr;
+                    result = funcCreate(expr,argNames.join(',')).apply(this,argValues);
+                }
+                if (dataNode){ // if it has a dataNode set it to the returned value
+                    dataNode.setValue(result);
+                }
+            } 
         }
         else{
             if( if_result){
-                var method=objectPop(attributes,'method');
+                var method=expr;
                 var cacheTime=objectPop(attributes,'cacheTime', -1);
                 var isGetter=objectPop(attributes,'isGetter', false);

gnrpy/gnr/sql/gnrsqldata.py

@@ -1587 +1587 @@
     result = property(_get_result)
 
-    def out_newrecord(self, resolver_one=True, resolver_many=True, defaults=None):
+    def out_newrecord(self, resolver_one=True, resolver_many=True):
         result = SqlRecordBag(self.db, self.dbtable.fullname)
-        
-        #defaults = self.dbtable.getNewRow(defaults)
         record = Bag()
-        #for k,v in defaults.items():
-        #    record['t0_%s' % k]=v # for loaded records all fields startst with t0_
-            
         self._loadRecord(result, record, self.compiled.template, resolver_many=resolver_many, resolver_one=resolver_one)
-        self.dbtable.onCreating(result, defaults)
+        
+        newdefaults = self.dbtable.defaultValues()
+        for k,v in newdefaults.items():
+            result[k] = v
+            
         return result
     

gnrpy/gnr/sql/gnrsqltable.py

@@ -292 +292 @@
         else:
             return record
-    
-    def onCreating(self, record, defaults=None):
-        newdefaults = self.defaultValues()
-        if defaults:
-            newdefaults.update(defaults)
-        for k,v in newdefaults.items():
-            record[k] = v
+        
         
     def defaultValues (self):

gnrpy/gnr/web/gnrwebapphandler.py

@@ -694 +694 @@
                     ignoreMissing=True, ignoreDuplicate=True, 
                     from_fld=None, target_fld=None, sqlContextName=None, applymethod=None,
-                     js_resolver_one='relOneResolver', js_resolver_many='relManyResolver',  
-                     newRecordDefaults=None, **kwargs):
+                    js_resolver_one='relOneResolver', js_resolver_many='relManyResolver',  
+                    **kwargs):
         t = time.time()
         dbtable = dbtable or table
@@ -701 +701 @@
             dbtable='%s.%s' % (pkg, dbtable)
         tblobj = self.db.table(dbtable)
+        newrecord = False
+        loadingParameters = dict([(k.lstrip('loading_'), kwargs.pop(k)) for k in kwargs.keys() if k.startswith('loading_')])
         if pkey: 
             kwargs['pkey'] = pkey
@@ -711 +713 @@
                 self._joinConditionsFromContext(rec, sqlContextName)
             if (pkey=='*newrecord*'):
-                record = rec.output('newrecord', resolver_one=js_resolver_one, resolver_many=js_resolver_many, defaults=newRecordDefaults)
+                newrecord = True
+                record = rec.output('newrecord', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
             else:
                 record = rec.output('bag', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
@@ -719 +722 @@
                                sqlContextName=sqlContextName, **kwargs)
             if sqlContextName: self._joinConditionsFromContext(record, sqlContextName)
-
+            
             record = record.output('bag', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
-            newrecord = False
-            
+            
+        recInfo = dict(_pkey=record[tblobj.pkey] or '*newrecord*',
+                        caption=tblobj.recordCaption(record,newrecord),
+                        _newrecord=newrecord)
+
+        method = loadingParameters.pop('method', None)
+        if method:
+            handler = self.page.getPublicMethod('rpc', method)
+        else:
+            if dbtable == self.page.maintable:
+                method = 'onLoading'
+            else:
+                method = 'onLoading_%s' % dbtable.replace('.','_')
+            handler = getattr(self.page, method, None)
+            
+        if not handler and newrecord and loadingParameters:
+            handler = self.newRecordDefaults
+        if handler:
+            handler(record, recInfo, loadingParameters)
+                    
         if applymethod:
             self.page.getPublicMethod('rpc', applymethod)(record)
             
-        recInfo = dict(_pkey=record[tblobj.pkey] or '*newrecord*',
-                        caption=tblobj.recordCaption(record,newrecord),
-                        _newrecord=not(newrecord is False), servertime=int((time.time() - t)*1000))
+        recInfo['servertime'] = int((time.time() - t)*1000)
         if tblobj.lastTS:
             recInfo['lastTS'] = str(record[tblobj.lastTS])
         return (record,recInfo)
     
+    def newRecordDefaults(record, recInfo, **kwargs):
+        for k,v in kwargs.items():
+            if k in record:
+                record[k] = v
+        
     def rpc_saveRecord(self, dbtable=None, recordBag=None,**kwargs):
         tbl = self.db.table(dbtable)

gnrpy/gnr/web/gnrwebpage.py

@@ -2358 +2358 @@
                     ignoreMissing=True, ignoreDuplicate=True, 
                     from_fld=None, target_fld=None, sqlContextName=None, applymethod=None,
-                     js_resolver_one='relOneResolver', js_resolver_many='relManyResolver',  
-                     newRecordDefaults=None, **kwargs):
+                    js_resolver_one='relOneResolver', js_resolver_many='relManyResolver', 
+                    loadingParameters=None, **kwargs):
         t = time.time()
         dbtable = dbtable or table
@@ -2365 +2365 @@
             dbtable='%s.%s' % (pkg, dbtable)
         tblobj = self.db.table(dbtable)
+        newrecord = False
         if pkey: 
             kwargs['pkey'] = pkey
@@ -2375 +2376 @@
                 self._joinConditionsFromContext(rec, sqlContextName)
             if (pkey=='*newrecord*'):
-                record = rec.output('newrecord', resolver_one=js_resolver_one, resolver_many=js_resolver_many, defaults=newRecordDefaults)
+                newrecord = True
+                record = rec.output('newrecord', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
             else:
                 record = rec.output('bag', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
@@ -2383 +2385 @@
                                sqlContextName=sqlContextName, **kwargs)
             if sqlContextName: self._joinConditionsFromContext(record, sqlContextName)
-
+            
             record = record.output('bag', resolver_one=js_resolver_one, resolver_many=js_resolver_many)
-            newrecord = False
-            
+            
+        recInfo = dict(_pkey=record[tblobj.pkey] or '*newrecord*',
+                        caption=tblobj.recordCaption(record,newrecord),
+                        _newrecord=newrecord)
+        
+        method = None
+        if loadingParameters:
+            method = loadingParameters.pop('method')
+            
+        if method:
+            handler = self.page.getPublicMethod('rpc', method)
+        else:
+            if dbtable == self.page.maintable:
+                method = 'onLoading'
+            else:
+                method = 'onLoading_%s' % dbtable.replace('.','_')
+            handler = getattr(self.page, method, None)
+            
+        if not handler and newrecord and loadingParameters:
+            handler = self.newRecordDefaults
+        if handler:
+            handler(record, recInfo, loadingParameters)
+                    
         if applymethod:
             self.page.getPublicMethod('rpc', applymethod)(record)
-        
-        _pkey = record[tblobj.pkey] or '*newrecord*'
-        _newrecord = (_pkey=='*newrecord*')
-        recInfo = dict( _pkey=_pkey,
-                        caption=tblobj.recordCaption(record, newrecord=_newrecord),
-                        _newrecord=_newrecord, servertime=int((time.time() - t)*1000))
+            
+        recInfo['servertime'] = int((time.time() - t)*1000)
         if tblobj.lastTS:
             recInfo['lastTS'] = str(record[tblobj.lastTS])
         return (record,recInfo)
     
+    def newRecordDefaults(self, record, recInfo, loadingParameters):
+        for k,v in loadingParameters.items():
+            if k in record:
+                record[k] = v
+        
     def rpc_saveRecord(self, dbtable=None, recordBag=None,**kwargs):
         tbl = self.db.table(dbtable)

gnrpy/packages/adm/webpages/manage_users.py

@@ -73 +73 @@
         return struct
         
-    def onLoading(self, record, recinfo):
+    def onLoading(self, record, recinfo, loadingParameters):
         tags = record['auth_tags']
         b = Bag()

gnrpy/packages/_common_d11/webpages/_resources/public.py

@@ -570 +570 @@
                                      grid.addBagRow('#id', '*', grid.newBagRow(),event);
                                      """ , 
-                            event='^.addRecord', gridId=gridId)
+                                     event='^.addRecord',
+                                     gridId=gridId)
         delScript = """var grid = genro.wdgById(gridId);
                        var nodesToDel = grid.delBagRow('*', delSelection);"""

gnrpy/packages/_common_d11/webpages/_resources/standard_tables.py

@@ -576 +576 @@
                        _fired='^.delete', _onResult='genro.wdgById("delete_view_dlg").onCancel();FIRE .deleted = true')
     
-                                   
-    
-    def recordGetter(self):
-        return ('app.getRecord', {})
-        
-    
+        
     def formController(self,pane):
         self.formTitleBase(pane)
@@ -594 +589 @@
         pane.dataFormula('form.canDelete','(!locked) && deletePermission',locked='^form.locked',deletePermission='=usr.deletePermission',_init=True)
         
-        recordGetter, kwargs = self.recordGetter()
-        
         pane.dataController('genro.formById("formPane").load();', _fired='^form.doLoad')
         #pane.dataRpc('form.record', 'load', table=self.maintable, pkey='=list.selectedId', _fired='^form.doLoad', recordGetter = recordGetter, sqlContextName='sql_record',
         #                 _onResult='FIRE recordLoaded=true;FIRE loggerReset=true;SET form.loading=false;', **kwargs)
-
         
         pane.dataRpc('form.record', 'load', table=self.maintable, pkey='=list.selectedId',
-                                            recordGetter = recordGetter, sqlContextName='sql_record',
+                        recordGetter = self.recordGetter(), sqlContextName='sql_record',
                         nodeId='formPane_loader',
-                         _onResult='genro.formById("formPane").loaded();',
-                         **kwargs)
+                        _onResult='genro.formById("formPane").loaded();',
+                        loadingParameters='=gnr.tables.maintable.loadingParameters')
         
         
@@ -770 +762 @@
     
     def rpc_load(self, table=None, pkey=None, recordGetter='app.getRecord', **kwargs):
-        recordGetter = self.getPublicMethod('rpc', recordGetter)
-        record, recinfo = recordGetter(table=table, pkey=pkey, **kwargs)
-        self.onLoading(record, recinfo)
+        getterHandler = self.getPublicMethod('rpc', recordGetter)
+        record, recinfo = getterHandler(table=table, pkey=pkey, **kwargs)
+        #self.onLoading(record, recinfo, loadingParameters)
         return record, recinfo
     
@@ -865 +857 @@
         return
     
-    def onLoading(self, record, recinfo):
+    def recordGetter(self):
+        return 'app.getRecord'
+        
+    def setLoadingParameters(self, table, **kwargs):
+        self.pageSource().dataFormula('gnr.tables.%s.loadingParameters' % table.replace('.','_'), '', _fired='^gnr.onStart', **kwargs)
+
+    def onLoading(self, record, recinfo, loadingParameters):
         pass
     

gnrpy/packages/showcase/webpages/Widgets/Form/textbox.py

@@ -22 +22 @@
         fb.numberTextBox(value='^.r0.age',lbl='age')
 &