Changeset 5592 for trunk/prototype/api

Timestamp:

03/01/12 03:35:01 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementacao de compartilhamento de agendas (agendas usuario e agendas publicas)

File:

• trunk/prototype/api/datalayer.js (modified) (2 diffs)

trunk/prototype/api/datalayer.js

@@ -1067 +1067 @@
         
         var result = false;
-
-        /*
-        *  TODO - Para correta aplicação de filtros campos com valores de datas
-        * devem ter tratamento diferenciado, sendo que como string os mesmos não serão 
-        * corretamente tratados. 
-        */
         
         if( bothSides || !oneSide )
-            //result = this.check( concept, id || filter );
-                result = concept == 'schedulable' ? false : this.check( concept, id || filter );
+            result = this.check( concept, id || filter );
+        
+        if (bothSides && filter.filter && filter.criteria)
+                result = false;
+
+                
         if( !result && (bothSides || oneSide) )
         {
@@ -1116 +1114 @@
         return( filtered );
     },
+
+        converterType: function( filter ){
+
+                        return isNaN(parseInt(filter)) ? filter : parseInt(filter);
+                
+        },
+
     
     compare: function( operator, base, test ){
       
-      switch( operator )
-      {
-          case '*':  return RegExp( ".*" + test + ".*" ).test( base );
-          case '^':  return RegExp( "^" + test +  ".*" ).test( base );
-          case '$':  return RegExp( ".*"  + test + "$" ).test( base );
-
-          case '&':  return ( base && test );
-          case '|':  return ( base || test );
-
-          case '=':  return ( base == test );
-          case '<=': return ( base <= test );
-          case '>=': return ( base >= test );
-          case '>':  return ( base <  test );
-          case '<':  return ( base >  test );
-      }
+        base = this.converterType(base);
+        test = this.converterType(test);
+         
+    switch( operator ){
+        
+        case '*':  return RegExp( ".*" + test + ".*" ).test( base );
+        case '^':  return RegExp( "^" + test +  ".*" ).test( base );
+        case '$':  return RegExp( ".*"  + test + "$" ).test( base );
+
+        case '&':  return ( base && test );
+        case '|':  return ( base || test );
+
+        case '=':  return ( base == test );
+        case '<=': return ( base <= test );
+        case '>=': return ( base >= test );
+        case '>':  return ( base <  test );
+        case '<':  return ( base >  test );
+        
+        default: return true;
+        }
       
     },