Changeset 6151 for trunk/prototype/modules/calendar/js/helpers.js

Timestamp:

05/09/12 17:50:59 (12 years ago)

Author:

acoutinho

Message:

Ticket #2709 - Inconsistencias na query de pesquisas de eventos

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (2 diffs)

trunk/prototype/modules/calendar/js/helpers.js

@@ -62 +62 @@
         if (!eventInterval.length)
             return 'Por favor, informe o intervalo';
-        else if (parseInt(eventInterval,10) <=0 || parseInt(eventInterval,10).toString() == "NaN")
+        else if (parseInt(eventInterval,10) < 0 || parseInt(eventInterval,10).toString() == "NaN")
             return 'Por favor informe um valor válido para o intervalo';
     }    
@@ -2396 +2396 @@
         
     return {
-        filter: ['AND', ['>=', 'rangeStart', rangeStart], ['<=', 'rangeEnd', rangeEnd] , ['IN', 'calendar',  calerdars_selecteds]], 
+         filter: ['AND', 
+                    ['OR', 
+                        ['AND', 
+                            ['>=', 'rangeEnd', rangeStart], 
+                            ['<=', 'rangeEnd', rangeEnd] , 
+                        ],
+                        ['AND', 
+                            ['>=', 'rangeStart', rangeStart], 
+                            ['<=', 'rangeStart', rangeEnd] , 
+                        ],
+                        ['AND', 
+                            ['<=', 'rangeStart', rangeStart], 
+                            ['>=', 'rangeEnd', rangeEnd] , 
+                        ]
+                    ],
+                    ['IN', 'calendar',  calerdars_selecteds]
+                ], 
         criteria: {
             deepness: 2,