Changeset 6331 for trunk/prototype/modules

Timestamp:

05/28/12 21:17:51 (12 years ago)

Author:

acoutinho

Message:

Ticket #2795 - Problema ao tentar aceitar convite da agenda para a conta compartilhada

Location:

trunk/prototype/modules/calendar

Files:

• interceptors/DBMapping.php (modified) (7 diffs)
• interceptors/Notifications.php (modified) (7 diffs)
• js/calendar.codecs.js (modified) (8 diffs)
• js/helpers.js (modified) (7 diffs)
• templates/event_add.ejs (modified) (1 diff)

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

@@ -373 +373 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public function updateCalendar(&$uri, &$params, &$criteria, $original) {
-        if (isset($params['calendar'])) {
-            $calendarObjects = self::schedulable2calendarToObject($uri['id']);
-            $params2['calendar'] = $params['calendar'];
-
-            foreach ($calendarObjects as $calendarObject)
+    public function updateCalendar(&$uri, &$params, &$criteria, $original) {       
+        if (isset($params['calendar'])) {
+            if(isset($params['lastCalendar'])){
+                $calendarObjects = self::referenceCalendarToObject($uri['id'], $params['lastCalendar']);
+                $params2['calendar'] = $params['calendar'];
+            }else{
+                $calendarObjects = self::schedulable2calendarToObject($uri['id']);
+                $params2['calendar'] = $params['calendar'];
+            }
+            
+            foreach ($calendarObjects as $calendarObject)
                 Controller::update(array('concept' => 'calendarToSchedulable', 'id' => $calendarObject['calendar_to_calendar_object']), $params2);
 
@@ -717 +722 @@
             $idCalendar = $criteria['filter'][2][2];
             
-            if(!self::ownerSchedulable($idSchedulable)){
+            if(!self::ownerSchedulable($idSchedulable, $criteria['filter'][3][2])){
                 $isPermissionFromOwner = self::permissionFromCalendarSignature($idCalendar, $idSchedulable);
                 
@@ -727 +732 @@
 
                     foreach($calendarsToSchedulable as $value)
-                        if($value['calendar_id'] == $idCalendar){
+                        if($value['calendar_id'] == $idCalendar){    
+
+                            $participant = Controller::read(array('concept' => 'participant'), array('id'), array('filter' =>
+                                array('AND',
+                                    array('=', 'user', $criteria['filter'][3][2]),
+                                    array('=', 'schedulable', $idSchedulable)
+                                )));
+
+                            Controller::call(('update'), array('concept' => 'participant', 'id' => $participant[0]['id']), array('status' => STATUS_CANCELLED));
                             Controller::delete(array('concept' => 'calendarToSchedulable', 'id' => $value['calendar_to_calendar_object']));
                             break;
@@ -740 +753 @@
         $calendarsToSchedulable = self::schedulable2calendarToObject($uri['id']);
 
-        if (!self::ownerSchedulable($uri['id']) && !self::isAllowDeleteInCalendar($calendarsToSchedulable[0]['calendar_id'])) {
+        if (!self::ownerSchedulable($uri['id'], Config::me('uidNumber')) && !self::isAllowDeleteInCalendar($calendarsToSchedulable[0]['calendar_id'])) {
 
             foreach ($calendarsToSchedulable as $i => $v) {
@@ -750 +763 @@
 
             /* Seta o participante como rejeitado */
-            Controller::update(array('concept' => 'participant'), array('status' => STATUS_CANCELLED), array('filter' =>
+            $participant = Controller::read(array('concept' => 'participant'), array('id'), array('filter' =>
                 array('AND',
                     array('=', 'user', Config::me('uidNumber')),
-                    array('=', 'schedulable', $uri['id'])
-                    )));
+                    array('=', 'schedulable', $idSchedulable)
+                )));
+
+            Controller::call(('update'), array('concept' => 'participant', 'id' => $participant[0]['id']), array('status' => STATUS_CANCELLED));
 
             return false; /* Mata o restante da execução */
@@ -1017 +1032 @@
     
     
-    private static function ownerSchedulable($id) {
+    private static function ownerSchedulable($id, $me) {
 
         $isOwner = Controller::find(array('concept' => 'participant'), array('id'), array('filter' =>
                     array('AND',
                         array('=', 'isOrganizer', '1'),
-                        array('=', 'user', $_SESSION['wallet']['user']['uidNumber']),
+                        array('=', 'user', $me),
                         array('=', 'schedulable', $id)
                         )));
@@ -1028 +1043 @@
         return ( isset($isOwner[0]['id']) ) ? true : false;
     }
-
+    
+    
+    private static function referenceCalendarToObject($schedulable, $calendar) {
+        return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_to_calendar_object.id as calendar_to_calendar_Object FROM calendar_to_calendar_object'
+            . ' WHERE calendar_to_calendar_object.calendar_id = '. $calendar
+            . ' AND calendar_to_calendar_object.calendar_object_id = ' . addslashes($schedulable));
+    }
+    
     private static function schedulable2calendarToObject($Schedulable) {
         return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_to_calendar_object.id as calendar_to_calendar_Object , calendar.name as calendar_name ,calendar.location as calendar_location, calendar.id as calendar_id FROM calendar_to_calendar_object , calendar , calendar_signature'

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

@@ -92 +92 @@
         if (isset($updated)) {
             $psUpdated = Controller::find(array('concept' => 'participant'), false, array('deepness' => '1', 'filter' => array('IN', 'id', $updated)));
+
             foreach ($psUpdated as $i => $pUpdated) {
                 if ($pUpdated['isOrganizer'] == '1')
@@ -237 +238 @@
      */
     public static function participantDelegatedStatusChange(&$partID, &$schedulable, $organizer, &$type = false) {
-
         $delegatedParams = array();
 
@@ -270 +270 @@
     }
 
-    public static function mountStruture($partID, &$schedulable, $type = false, &$data, &$subject, &$ical, &$part = false, &$method, &$notificationType, $regSet = false) {
+    public static function mountStruture(&$partID, &$schedulable, $type = false, &$data, &$subject, &$ical, &$part = false, &$method, &$notificationType, $regSet = false) {
 
         if ((Config::regGet('ical://' . $schedulable['id'] . '/' . $method) === false) || ($method == 'CANCEL')) { //Verifica se o ical ja não esta no reg
@@ -327 +327 @@
                 $part = self::_getAttendeeById($partID, $schedulable);
                 $data['participant'] = isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail'];
+                $partID = $part;
                 break;
             case 'othersAttendees':
@@ -344 +345 @@
         $subject['endDate'] = date_format($eTime, 'd/m/Y');
         $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i');
-        $subject['participant'] = Config::me('uid');
+        $subject['participant'] = (is_array($partID) && isset($partID['user']) )? $partID['user']['uid'] : Config::me('uid');
     }
 
@@ -379 +380 @@
      * @access     public
      */
-    public static function participantStatusChange(&$partID, &$schedulable, &$organizer, $type, $delegatedParams = false) {
+    public static function participantStatusChange(&$partID, &$schedulable, &$organizer, $type, $delegatedParams = false) {     
         $method = 'REPLY';
         $notificationType = 'Convite Aceito';
@@ -412 +413 @@
         }
 
-        self::sendMail($data, $ical, $organizer['user']['mail'], $subject, $tpl, false);
+        self::sendMail($data, $ical, $organizer['user']['mail'], $subject, $tpl, $partID);
     }
 

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

@@ -153 +153 @@
         delete DataLayer.tasks[this.clookRefresh];
         
-        this.clookRefresh = (parseInt(($.now()) / 1000) + this.timeRefresh);
-        
-        DataLayer.task( this.clookRefresh , function(){
-            Calendar.rerenderView(true);
-        });
-
+        //Realiza agendamentos de atualização de view somente se o módulo aberto for expressoCalendar
+        if(User.moduleName == "expressoCalendar"){
+            this.clookRefresh = (parseInt(($.now()) / 1000) + this.timeRefresh);
+
+            DataLayer.task( this.clookRefresh , function(){
+                Calendar.rerenderView(true);
+            });
+        }
     }
 }
@@ -516 +518 @@
         var pref = User.preferences;
                 
-        var Owner = decodeOwnerCalendar(evtObj.calendar);       
+        var Owner = decodeOwnerCalendar(evtObj[0].calendar);    
 
         var res = $.map(evtObj, function( form ){
                         
-            return {
+            return DataLayer.merge({
                 id: form.idEvent,
-                calendar: form.calendar,
                 participants : $.map(form.attendee, function( attendee, i ){
                     if(isNaN(attendee)){
@@ -536 +537 @@
                         if(DataLayer.get('participant', attendee).user == Owner.id){
                             var me = {
-                                user: User.id,
+                                user: Owner.id,
                                 status: form.status,
                                 id: attendee,
@@ -580 +581 @@
                     };
                 })
-            }
+            }, (Owner.id == User.me.id) ? (form.calendar != form.lastCalendar ? {calendar: form.calendar, lastCalendar: form.lastCalendar} : {}) : {})
         });
         return notArray ? res[0] : res;
@@ -641 +642 @@
                 attachments: $.map(objEvent.attachments || [], function( attachment, i ){
                     var attach = DataLayer.get('schedulableToAttachment', attachment, false);
-                    //TODO - Verificar na API retorno de id sobre os conceitos em que são utilizados tabelas de ligação
+                    //TODO - Verificar na API retorno de id sobre os conceitos em que s?o utilizados tabelas de liga??o
                     if(!attach.name) return(null); 
                     
@@ -838 +839 @@
             var Owner = decodeOwnerCalendar(form.calendar);
 
-            return {
+            return DataLayer.merge({
                 "class": form["class"],
                 startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd HH:mm:00'),
@@ -846 +847 @@
                 location: form.location,
                 category: form.category,
-                calendar: form.calendar,
                 summary: form.summary,
                 description: form.description,
@@ -901 +901 @@
                     };
                 })
-            };
+            }, form.lastCalendar ? (( form.lastCalendar == form.calendar ) ? {} : {calendar: form.calendar, lastCalendar: form.lastCalendar}) : {calendar: form.calendar});
         });
 

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

@@ -623 +623 @@
     $(this).parent().remove().find('li').is(':empty');
 });
-                
-/*Seleciona a agenda padrão para criação de um evento*/
-
-if(objEvent.calendar != undefined)
-    var selectedCalendar = objEvent.calendar;
-else
-    var selectedCalendar = User.preferences.defaultCalendar;
-
-UI.dialogs.addEvent.find('option[value="'+selectedCalendar+'"]').attr('selected','selected').trigger('change');
+
+var myCalendar = function(){
+        for(var i in Calendar.signatures)
+            if(Calendar.signatures[i].isOwner == "1")
+                return Calendar.signatures[i].calendar.id;
+}
                 
 /*Adicionar alarms padrões, quando alterado a agenda do usuário*/               
@@ -691 +688 @@
     .filter('.mail').html(User.me.mail).attr('title',User.me.mail);
 }
-                        
-                        
-                        
-                        
 });
-                
+
 /*Checkbox adicionar alarms padrões*/
 UI.dialogs.addEvent.find('input[name="defaultAlarm"]').click(function(){
@@ -781 +774 @@
                 canDiscardEventDialog = true;
                 /* Remove por filtro */
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objEvent.id], ['=', 'calendar', objEvent.calendar]]});
+                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objEvent.id], ['=', 'calendar', objEvent.calendar], ['=','user',(objEvent.me.user ? objEvent.me.user.id : objEvent.me.id)]]});
                 Calendar.rerenderView(true);
                 /********************/
@@ -1510 +1503 @@
 
 disponibily(objEvent, path, attendees);
-         
+
+/*Seleciona a agenda padrão para criação de um evento*/
+var selectedCalendar = (objEvent.calendar != undefined) ? objEvent.calendar : (User.preferences.defaultCalendar ? User.preferences.defaultCalendar : myCalendar());
+UI.dialogs.addEvent.find('option[value="'+selectedCalendar+'"]').attr('selected','selected').trigger('change');
+
 UI.dialogs.addEvent.find(':input').change(function(event){
     if (event.keyCode != '27' && event.keyCode != '13')
@@ -1915 +1912 @@
         'onClose':  function(clicked) {
             if(clicked == 'Sim'){
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar]]})
+
+                var schedulable = DataLayer.get('schedulable', '88');
+                
+                schedulable.calendar = idCalendar;
+                
+                var schudableDecode = DataLayer.encode( "schedulable:preview", schedulable);
+                var me = schudableDecode.me.user ? schudableDecode.me.user.id : schudableDecode.me.id;
+
+                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar], ['=','user', me]]})
                 Calendar.rerenderView(true);
             }
@@ -2635 +2640 @@
 
     var schedulable = DataLayer.get('schedulable', event+'');
-        
+        
     calendar = !!calendar ? calendar : schedulable.calendar;
         
@@ -2644 +2649 @@
     if(parseInt(type) == 0){
                 
-        schedulable.calendar = calendar;        
+        schedulable.lastCalendar = schedulable.calendar;
+        schedulable.calendar = calendar;        
         DataLayer.put('schedulable', schedulable);
         

trunk/prototype/modules/calendar/templates/event_add.ejs

@@ -8 +8 @@
                         <% if( data.event.id ){ %>
                                 <input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/>
+                        <% } %>
+                        <% if( data.event.calendar ){ %>
+                                <input type="hidden" class="last-calendar" name="lastCalendar" value="<%= data.event.calendar %>"/>
                         <% } %>
                 </p>