Changeset 5376 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

01/13/12 09:10:28 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Estabilizacao da nova api, correcoes de bug e melhorias na nova agenda

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

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

@@ -372 +372 @@
                     
                         if($participants[$ii]['user']['id'] == Config::me('uidNumber'))
-                            $participantLog = $vv['id'];  
+                           $participants[$ii]['alarms'] = Controller::find( array( 'concept' => 'alarm' ) , null , array('filter' => array('AND' , array('=', 'participant' ,$vv['id'] ) ,array('=' , 'schedulable', $v['id'])) ) ); 
                     }       
                     $result[$i]['participants'] = $participants;
-                }
-                
-                if(isset($participantLog))
-                    $result[$i]['alarms'] = Controller::find( array( 'concept' => 'alarm' ) , null , array('filter' => array('AND' , array('=', 'participant' ,$participantLog ) ,array('=' , 'schedulable', $v['id'])) ) );
+                }               
                 
            }
@@ -401 +398 @@
                            $participants[$ii]['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $vv['user'] ));
 
-                         if($participants[$ii]['user']['id'] == Config::me('uidNumber'))
-                            $participantLog = $vv['id'];  
-                    }  
+                        if($participants[$ii]['user']['id'] == Config::me('uidNumber'))
+                           $participants[$ii]['alarms'] = Controller::find( array( 'concept' => 'alarm' ) , null , array('filter' => array('AND' , array('=', 'participant' ,$vv['id'] ) ,array('=' , 'schedulable', $result['id'])) ) ); 
+               }  
 
                 $result['participants'] = $participants;
-                if(isset($participantLog))
-                    $result['alarms'] = Controller::find( array( 'concept' => 'alarm' ) , null , array('filter' => array('AND' , array('=', 'user' , $participantLog ) ,array('=' , 'schedulable', $result['id'])) ) );
-            }
+                }
        }