Changeset 5752

Timestamp:

03/19/12 16:38:05 (11 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao na edicao de repeticao com n repeticoes

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (4 diffs)
• js/calendar.codecs.js (modified) (1 diff)
• js/helpers.js (modified) (3 diffs)
• js/init.js (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -110 +110 @@
           $occ = array();
 
-          if( $occurrences = self::checkOccurrences( $start, $end, intval($criteria['deepness']) + 1 ) )
+          if( $occurrences = self::checkOccurrences( $start, $end ) )
               foreach( $occurrences as $id => $occurrence )
               {
@@ -188 +188 @@
     }
 
-    public function checkOccurrences( $start, $end, $deep ){
+    public function checkOccurrences( $start, $end ){
 
         $ranges = Controller::find( array( 'concept' => 'repeatRange' ), array( 'rangeStart', 'rangeEnd' ),  array( 'filter' => array( '=', 'user', Config::me("uidNumber") ) ) );
@@ -217 +217 @@
 
             if( !isset( $result[ $id ] ) )
-                $result[ $id ] = array();
+                $result[ $id ] = !$initialized ?  array( $repeat['startTime'] ) : array();
 
             if( !$initialized )
@@ -329 +329 @@
 
     $return = array();
-
+    
     while($result = $r->next())
     { 

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -986 +986 @@
                     isRepeat = true;
                     occurrences = evt.occurrences;
-                }
-
-                occurrences[ occurrences.length ] = evt.startTime;
-
-                occurrences = DataLayer.unique( occurrences );
+                }else
+                    occurrences[ occurrences.length ] = evt.startTime;
+
+                //occurrences = DataLayer.unique( occurrences ).sort();
                   
                 for( var i = 0; i < occurrences.length; i++ )

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

@@ -657 +657 @@
                         canDiscardEventDialog = true;
                         
-                        var exit = function(){
+                        var exit = function(event){
+                            if(event)
+                                DataLayer.remove('schedulable', event, false); 
+
                             UI.dialogs.addEvent.children().find('form.form-addevent').submit();
                             UI.dialogs.addEvent.dialog("close");
@@ -665 +668 @@
                                DataLayer.remove('repeat', false);
                                DataLayer.put('repeat', repeat);
-                               DataLayer.commit('repeat', false, exit);
+                               DataLayer.commit('repeat', false, exit(repeat.schedulable));
                         }else
                             exit();
@@ -1628 +1631 @@
 
     edit.repeat.startTime = new Date(parseInt(edit.repeat.startTime)).toString('yyyy-MM-dd HH:mm:00');
-    edit.repeat.endTime = new Date(parseInt(edit.repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
+    edit.repeat.endTime = parseInt(edit.repeat.count) > 0 ? '0' : new Date(parseInt(edit.repeat.endTime)).toString('yyyy-MM-dd HH:mm:00');
     
     edit.repeat.exceptions = (schedulable.occurrences[idException]);         

trunk/prototype/modules/calendar/js/init.js

@@ -242 +242 @@
                                  DataLayer.put('repeat', repeat);
                                  DataLayer.commit('repeat', false, function(data){
-                                     
+                                    
+                                    DataLayer.remove('schedulable', repeat.schedulable, false); 
                                     DataLayer.put('schedulable', schedulable);
                                      
@@ -275 +276 @@
                                  DataLayer.commit('repeat', false, function(data){
                                      
+                                    DataLayer.remove('schedulable', repeat.schedulable, false); 
                                     DataLayer.put('schedulable', schedulable);