Changeset 5514 for trunk/prototype/modules/calendar

Timestamp:

02/14/12 16:52:04 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementacao anexos, acls e delegacao de participantes

Location:

trunk/prototype/modules/calendar

Files:

• constants.php (modified) (2 diffs)
• css/layout.css (modified) (5 diffs)
• css/style.css (modified) (1 diff)
• export.php (modified) (2 diffs)
• interceptors/DBMapping.php (modified) (6 diffs)
• interceptors/Notifications.php (modified) (12 diffs)
• js/calendar.codecs.js (modified) (13 diffs)
• js/helpers.js (modified) (9 diffs)
• templates/alarms_add_itemlist.ejs (modified) (2 diffs)
• templates/attachment_add_itemlist.ejs (added)
• templates/attendee_add.ejs (modified) (3 diffs)
• templates/attendee_permissions.ejs (added)
• templates/event_add.ejs (modified) (8 diffs)
• templates/index.ejs (modified) (1 diff)
• templates/notify_create_delegated_body.tpl (added)
• templates/notify_delegated_body.tpl (added)
• templates/notify_delegated_status_body.tpl (added)
• templates/notify_response_delegated_status_body.tpl (added)
• templates/notify_suggestion_body.tpl (added)
• templates/notify_suggestion_response_body.tpl (added)
• templates/participants_add_itemlist.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/constants.php

@@ -5 +5 @@
 define('STATUS_CONFIRMED', 1);
 define('STATUS_ACCEPTED', 1);
-define('STATUS_TENATIVE', 2);
+define('STATUS_TENTATIVE', 2);
 define('STATUS_DECLINED', 3);
 define('STATUS_CANCELLED', 3);
@@ -29 +29 @@
 define('ICAL_ACTION_NONE', 4);
 define('ICAL_ACTION_REPLY', 5);
+define('ICAL_ACTION_SUGGESTION', 6);
 
 ?>

trunk/prototype/modules/calendar/css/layout.css

@@ -211 +211 @@
 }
 
-.new-event-win fieldset.block-add-attendee-permissions { 
-        width: 220px; 
-        float:left; 
-        margin: 105px 0 0 10px;
-}
+.new-event-win ul.attendee-permissions-list, li.attendee-permissions-list{text-align: left;}
+
+li.attendee-permissions-list input{width: 20px !important; margin: 3px 0 0 0; !important}
+
+p.request-update{display: inline; position: relative; top: 2px;}
+
+
+p.request-update label{width: 150px !important;}
 
 .new-event-win .menu-addevent {
@@ -221 +224 @@
 }
 
-fieldset.block-add-attendee .add-attendee-search { max-width: 200px; margin: 5px;}
-fieldset.block-add-attendee .add-attendee-search input { max-width: 170px; }
+fieldset.block-add-attendee .add-attendee-search { max-width: 250px; margin: 5px;}
+fieldset.block-add-attendee .add-attendee-search input { max-width: 215px; width: 215px;}
 fieldset.block-add-attendee .search-result-list { width: 255px; max-height: 215px; overflow: auto;}
 fieldset.block-add-attendee .search-result-list .ui-widget-content { border: none;}
@@ -256 +259 @@
 .attendees-list .me select.status { margin:10px 5px 5px 5px; }
 .attendees-list .me .add-attendee-search { max-width: 155px; width:155px; display: inline; padding: 0; margin: 10px 0 5px 0;}
+
+.attendees-list .me .add-attendee-options { max-height: 16px; height:16px;  max-width: 50px; width:50px; display: inline; padding: 0; margin: 0 0 5px 0;}
+.attendees-list .me .add-attendee-options-read { max-height: 16px; height:16px;  max-width: 16px; width:16px; display: inline; padding: 0; margin: 0 0 5px 0;}
+
+.attendees-list .me .add-attendee-options-button {position: absolute; top: 171px;}
+.attendees-list .hover-attendee { background-color: #DFEFFC;}
+/*
+.attendees-list .attendee-options-button-edit { position: absolute; top:0; right:25px;}
+.attendees-list .attendee-options-button-key { position: absolute; top:0; right:45px;}
+.attendees-list .attendee-options-button-delegate { position: absolute; top:0; right:65px;}
+*/
+
+.attendee-options{ position: absolute; top: 0; left: 300px; background-color: white; z-index: 100; width: 90px; background-color: #FFF; padding: 0 5px 0 3px; text-align: right;}
+.attendees-list .not-attendee { height:16px; }
+
+.list-delegates{margin: 0 0 0 25px;}
+
+.status-delegate{position: absolute; left:3px;}
+
 .attendees-list .me .add-attendee-search input { max-width: 125px; }
-.attendees-list li.organizer {margin-bottom: 3px;}
+.attendees-list li.organizer, .attendees-list li.me-delegated  {margin-bottom: 3px;}
 .attendees-list .organizer .button.swap {
         float: right;
         margin-top: -1.5em;
 }
+
+.name-status-delegated{text-decoration: line-through; padding: 0 0 0 18px;}
+.name-status-delegated-delegated{text-decoration: line-through; padding: 0 0 0 12px;}
+.name-status-delegated-none{ padding: 0 0 0 12;}
+
+.name-status{padding: 0 0 0 18px;}
+
+.name-special{padding: 0 0 0 33px;}
+.name-special-delegated{text-decoration: line-through; padding: 0 0 0 33px;}
+
+.open-delegate{position: absolute; left: 20px; display: block; cursor: hand;}
+.space-status{position: absolute; left: 20px; display: block;}
+.space-special{position: absolute; left: 35px; display: block;}
+.space-special-delegated{position: absolute; left: 20px; display: block;}
+
+.attendee-permissions-change{background-image: url(../../../plugins/jquery/images/ui-icons_f9bd01_256x240.png) !important;}
+.attendee-permissions-change-button{border: 1px solid #79B7E7 !important; background: #F5F8F9 !important; font-weight: bold !important; color: #E17009 !important;}
+
+.attendee-permissions-conflict{opacity: 0.5}
 
 dd.attendee-list ul.attendee-list li {
@@ -275 +316 @@
 dd.attendee-list ul.attendee-list li label.name,
 dd.attendee-list ul.attendee-list li label.mail {
-        width: 6000px;
-        min-width: 6000px;
+        width: 99999px;
+        min-width: 99999px;
         vertical-align: middle;
 }
 dd.attendee-list ul.attendee-list li label[title=''] { display:none }
+/*
 dd.attendee-list ul.attendee-list li .button.close {
         position: absolute;
-    right: 0;
+    right: 5px;
     top: 0;
 }
-
+*/
 /*
 .attendees-list li .ui-icon-float-right {
@@ -482 +524 @@
 }
 
+.button.add.button-add-attachment{margin: -9px 0 0 8px;}
+.button.upload{margin-bottom: 4px;}
+div.fileupload-buttonbar{padding: 0.2em 0.5em }
+.archive-error{color: #F00;}
+
+.progress.in-progress{width: 100px; height: 12px;}
+
+
+.lbl-archive-nome, .lbl-archive-size{font-weight: bold !important;}
+.lbl-archive-nome{width:40px !important;}
+.row.fileupload-buttonbar{margin-top: -14px; padding: 0.2em 0.7em;}
+
+.archive-nome{width: 73px;}
+.archive-nome label{display: block; position: absolute; left: 136px; top: 194px;}
+.archive-size{min-width:100px; max-width:100px;}
+
+
 .input-group.date-info input {
         width: 100px;

trunk/prototype/modules/calendar/css/style.css

@@ -90 +90 @@
 
 .ui-dialog .ui-dialog-content { padding: 0; }
-.new-event-win form.form-addevent { padding: 10px; }
+.new-event-win div.div-addevent { padding: 0; width: 700px; border: 0;}
+.new-event-win form.form-addevent { padding: 9px; }
 
 .expresso-calendar-container input[type="text"] { height: 18px; }

trunk/prototype/modules/calendar/export.php

@@ -31 +31 @@
        $eventsIds[] = $eventLink['schedulable'];
 
-    $events = Controller::find(array('concept' => 'schedulable') , false , array('filter' => array('IN','id',$eventsIds) , 'deepness' => '2' ));
+    $events = Controller::find(array('concept' => 'schedulable') , false , array('filter' => array('IN','id',$eventsIds) , 'deepness' => '2' ));        
     $ics = Controller::format( array( 'service' => 'iCal' ) , $events , array('defaultTZI' => $calendar['timezone']) );
 
@@ -45 +45 @@
 {    
     $event = Controller::read(array('concept' => 'schedulable' , 'id' => $params['event']));
+        $attachmentRelation = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'schedulable'  ,  $event['id']) )); 
+        if(is_array($attachmentRelation)){
+                $attachments = array();
+                foreach($attachmentRelation as $key => $value)
+                        if(isset($value['attachment']) || !!$value['attachment'])
+                                $attachments[$key]  = $value['attachment'];
+                //Pega os anexos sem source
+                $event['attachments'] = Controller::find( array( 'concept' => 'attachment' ) , false ,array( 'filter' => array('IN', 'id' , $attachments) )); 
+        }
+                
     $ics = Controller::format( array( 'service' => 'iCal' ) , array($event) , array('defaultTZI' => $event['timezone']) );
     

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

@@ -40 +40 @@
         }  
         
+        public function encodeCreateSuggestion( &$uri , &$params , &$criteria , $original ){                    
+        $params['dtstamp'] = (isset($params['dtstamp'])) ? $params['dtstamp'] :time().'000';          
+    }   
+        
         public function encodeUpdateAlarm( &$uri , &$params , &$criteria , $original ){
             if(isset($params['type']))
@@ -46 +50 @@
         
     public function encodeCreateAttachment( &$uri , &$params , &$criteria , $original ){
-        $params['source'] = base64_encode( $params['source'] );
+        
+                if(!isset($params['source'])) return false;
+                
+                if(isset($_FILES[$params['source']]))
+                        if(isset($params['id']))
+                                $params =  array_merge($_FILES[$params['source']], array('id' => $params['id']));
+                        else
+                                $params =  $_FILES[$params['source']];
+                
+                //$params['source'] = base64_encode( $params['source'] );       
+                
         }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
         
@@ -145 +160 @@
     public function createCalendarToSchedulable( &$uri , &$result , &$criteria , $original ){           
 
-       Controller::create(array('concept' => 'calendarToSchedulable'), array('calendar' => $original['properties']['calendar'], 'schedulable' => $result['id'] ));
-            
-   }   
+                Controller::create(array('concept' => 'calendarToSchedulable'), array('calendar' => $original['properties']['calendar'], 'schedulable' => $result['id'] ));
+
+   }
+
+        public function createCreateSchedulableToAttachment( &$uri , &$params , &$criteria , $original ){               
+                if(array_key_exists('attachments', $original['properties']))    
+                        foreach($original['properties']['attachments'] as $key => $value){                              
+                                if(isset($params['id']))
+                                        Controller::create(array('concept' => 'schedulableToAttachment'), array('attachment' => $value['attachment'], 'schedulable' => $params['id'] ));
+                        }
+        }
      
     //TODO: Remover apos suporte a deepness na api 
@@ -172 +195 @@
                     }       
                     $result[$i]['participants'] = $participants;
-                }               
+                
+                                        $attachmentRelation = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'schedulable'  ,  $v['id']) )); 
+                                        if(is_array($attachmentRelation)){
+                                                $attachments = array();
+                                                foreach($attachmentRelation as $key => $value)
+                                                        if(isset($value['attachment']) || !!$value['attachment'])
+                                                                $attachments[$key]  = $value['attachment'];
+                                                //Pega os anexos sem source
+                                                $result[$i]['attachments'] = Controller::find( array( 'concept' => 'attachment' ) , array('id', 'name', 'type', 'size') ,array( 'filter' => array('IN', 'id' , $attachments) )); 
+                                        }
+                                
+                                }               
                 
            }
@@ -294 +328 @@
         }
     }
+
+    public function decodeFindAttachment( &$uri , &$result , &$criteria , $original ){          
+                if(isset($result))
+                foreach($result as $key => &$value)
+                        $value['source'] = base64_decode($value['source']);
+    }
+
         
         public function decodeSignatureAlarmType( &$uri , &$result , &$criteria , $original ){  
@@ -389 +430 @@
         }
         
-     }
+     } 
+         
+        public function deleteAttachmentDependences( &$uri , &$params , &$criteria , $original ){
+
+                if(isset($original['URI']['id']))
+                        Controller::delete(array('concept' => 'schedulableToAttachment', null , array('filter' => array('=' , 'attachment' , $original['URI']['id']))));
+    }
 
     public function createDefaultSignature( &$uri , &$result , &$criteria , $original ){

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

@@ -8 +8 @@
 {
     
-    /**
+        public function formatNotification(&$uri , &$params , &$data , $original){      
+                switch ($params['type']) {
+                        case 'suggestion':
+                                self::formatSuggestion($params);    
+                                break;
+                        case 'suggestionResponse':
+                                self::formatSuggestionResponse($params);    
+                                break;
+                        } 
+        }
+        
+        
+        /**
     * Analisa o commit do conceito participant e encaminha cada participant para seu devido metodo de notrificação
     *
@@ -19 +31 @@
     */
     public function commitParticipant(&$uri , &$result , &$data , $original)
-    {    
+    {                           
         if(Config::regGet('noAlarm') !== false) return; //Escapa notificações caso a flag de noAlarm esteja ativa.
-              
+                
         $organizers = array(); //Cache Organizadores
         $schedulables = array(); //Cache Schedulables
-        
+
         foreach ($data as $i => $concept) 
         {
@@ -39 +51 @@
                 foreach ($schedulables[ $concept['id'] ]['participants'] as $i => $v) //salva em $organizers as informações do organizador      
                     if(($v['isOrganizer'] === '1') && ($organizers[$concept['id']] = $v) ) break;
-            }
+                        }else if($concept['concept'] === 'schedulableToAttachment')
+                        {
+                                $relationAttachment = Controller::find( array( 'concept' => 'schedulableToAttachment' ) , false ,array( 'filter' => array('=', 'id' , $concept['id'])));                        
+                                                        
+                                
+                                        
+                                foreach($relationAttachment as $key => $value){
+                                        if(!array_key_exists('attachments',$schedulables[$value['schedulable']]))
+                                                $schedulables[$value['schedulable']]['attachments'] = array();
+
+                                        $temp = Controller::find( array( 'concept' => 'attachment' ) , false ,array( 'filter' => array('=', 'id' , $value['attachment'])));
+                                        array_push($schedulables[$value['schedulable']]['attachments'] , $temp[0]);                             
+                                }
+                        }
         }
         
         if( isset( $created ) )
         {
-           $psCreated =  Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $created )));
-           foreach ($psCreated as $i => $pCreated)   
+           $psCreated =  Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $created )));                
+                   foreach ($psCreated as $i => $pCreated)   
            {    
                if($pCreated['isOrganizer'] == '1') continue; //escapa organizador
@@ -52 +77 @@
                
                $organizer = isset( $organizers[$pCreated['schedulable']] ) ? $organizers[ $pCreated['schedulable'] ] : self::getOrganizer( $pCreated['schedulable'] );
-               
+                           
+                                if($pCreated['delegatedFrom'] != 0){
+                                        self::participantDelegated( $pCreated , $schedulable , $organizer);    
+                                        continue;
+                                }
+                           
                switch ($pCreated['status']) 
                {
@@ -68 +98 @@
         {
             $psUpdated  = Controller::find(array('concept' => 'participant'), false , array('deepness' => '1' , 'filter' => array('IN', 'id' , $updated )));
-            foreach ($psUpdated as $i => $pUpdated)   
-            {
+                        foreach ($psUpdated as $i => $pUpdated)   
+            {                   
                 if($pUpdated['isOrganizer'] == '1') continue; //escapa organizador
                 $schedulable = isset( $schedulables[$pUpdated['schedulable']] ) ? $schedulables[ $pUpdated['schedulable'] ] : Controller::read( array('concept' => 'schedulable', 'id' => $pUpdated['schedulable']) , false , array('deepness' => '2'));
@@ -77 +107 @@
                     if(($v['isOrganizer'] === '1') && ($organizer = $v) ) break;
                     
-                
-                if( $pUpdated['status'] != STATUS_UNANSWERED)
-                self::participantStatusChange( $pUpdated['id'] , $schedulable , $organizer , $pUpdated['status'] );    
+                if($pUpdated['delegatedFrom'] != 0){
+                                        self::participantDelegatedStatusChange( $pUpdated , $schedulable , $organizer , $pUpdated['status'] );    
+                }else if( $pUpdated['status'] != STATUS_UNANSWERED && $pUpdated['status'] != STATUS_DELEGATED)
+                                        self::participantStatusChange( $pUpdated['id'] , $schedulable , $organizer , $pUpdated['status'] );    
             }
         }
     }
-    
-
-    /**
-    * Monta o email de convite que sera enviado ao participant
-    *
-    * @license    http://www.gnu.org/copyleft/gpl.html GPL
-    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
-    * @sponsor    Caixa Econômica Federal
-    * @author     Cristiano Corrêa Schmidt
-    * @return     void
-    * @access     public
-    */
-    public static function participantCreated( &$partID , &$schedulable )
-    {
+        
+        public function formatSuggestion(&$params){
+            
+                $schedulable =  Controller::read(  array( 'concept' => 'schedulable' , 'id' => $params['schedulable'] ) , null , array('deepness' => '2') ) ;
+                
+                foreach ($schedulable['participants'] as $i => $v) //salva em $organizer as informações do organizador      
+            if(($v['isOrganizer'] === '1') && ($organizer = $v) ) break;
+                
+                $method = 'COUNTER';
+                $notificationType = 'Sugestão de horário';
+                $part = 'other';
+                
+                $schedulableReference = $schedulable;
+                
+                $referenceSuggestion = array( 'startTime' => $params['startTime'],
+                                                                        'endTime' => $params['endTime'],
+                                                                        'allDay' => $params['allDay']
+                                                                );
+                $schedulable = array_merge($schedulable, $referenceSuggestion);
+                
+                self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType);
+                       
+
+                $timezone = new DateTimeZone('UTC');
+                $sTime = new DateTime( '@'.(int)($schedulableReference['startTime'] / 1000) , $timezone );
+                $eTime =  new DateTime( '@'.(int)($schedulableReference['endTime'] / 1000) , $timezone ); 
+           
+                if(isset($schedulableReference['timezone']))
+                {
+                        $sTime->setTimezone(new DateTimeZone($schedulableReference['timezone']));
+                        $eTime->setTimezone(new DateTimeZone($schedulableReference['timezone']));
+                }
+
+                $data['nowStartDate'] = date_format( $sTime , 'd/m/Y');
+        $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
+        $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
+        $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
+                $data['userRequest'] = Config::me('uid');
+                
+                $params['attachments'][] = $ical;
+                $params['isHtml'] = true;                         
+                $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_body.tpl');
+                $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
+                $params['from'] = Config::me('mail');   
+                $params['to'] = $organizer['user']['mail'];
+                
+        }  
+        
+        public function formatSuggestionResponse(&$params){     
+                $schedulable = $params['schedulable'];
+                foreach ($schedulable['participants'] as $i => $v) {//salva em $organizer as informações do organizador      
+            if($v['isOrganizer'] === '1') $organizer = $v;
+                        if($v['user']['mail'] == Config::me('mail')) $me = $v;
+                }
+                $method = 'DECLINECOUNTER';
+                $notificationType = 'Sugestão de horário';
+                $part = 'other';
+                
+                $schedulable['participants'] = array();
+                array_push($schedulable['participants'], $me, $organizer);
+                
+                self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType);
+                
+                if($params['status'] == 'DECLINECOUNTER')
+                        $data['status'] = 'não pode ser aceito';
+                        
+                $params['attachments'][] = $ical;
+                $params['isHtml'] = true;                         
+                $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_response_body.tpl');
+                $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
+                $params['to'] = $params['from'];
+                $params['from'] = Config::me('mail');   
+        }
+        
+        
+        public static function _getAttendeeById($attendeId, $schedulable){
+                foreach ($schedulable['participants'] as $id => $dv) 
+                        if($dv['id'] == $attendeId )
+                                return $dv;
+        }
+        
+        /**
+    * Prepara para criação de email de delegação
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Adriano Coutinho da Silva
+    * @return     void
+    * @access     public
+    */
+        public static function participantDelegated( &$partID , &$schedulable , &$organizer){
+        
+                $delegatedParams = array();
+                
+                $delegatedFrom = self::_getAttendeeById($partID['delegatedFrom'], $schedulable);
+                $delegatedParams['delegatedFrom'] = $delegatedFrom['user']['uid'];
+                
+                self::participantCreated( $partID['id'] , $schedulable , STATUS_DELEGATED, $delegatedParams );          
+                
+                $delegatedTo = self::_getAttendeeById($partID['id'], $schedulable);
+                $delegatedParams['delegated'] = $delegatedTo['user']['uid'];
+                
+                self::participantStatusChange( $partID['delegatedFrom'] , $schedulable , $organizer , STATUS_DELEGATED, $delegatedParams );
+        }
+        
+        /**
+    * Monta o email de resposta que sera enviado ao delegatedFrom
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Cristiano Corrêa Schmidt
+    * @return     void
+    * @access     public
+    */
+    public static function participantDelegatedStatusChange( &$partID , &$schedulable, $organizer, &$type = false){
+        
+                $delegatedParams = array();
+                                        
+                $delegated = self::_getAttendeeById($partID['id'], $schedulable);
+                $delegatedParams['delegated'] = $delegated['user']['uid'];              
+                
+                switch($partID['status']){
+            case STATUS_ACCEPTED:
+                $delegatedParams['status'] = 'aceitou';
+            break;
+            case STATUS_TENTATIVE:
+                $delegatedParams['status'] = 'marcou como tentativa';
+            break;
+            case STATUS_CANCELLED:
+                $delegatedParams['status'] = 'rejeitou';
+            break;
+                        case STATUS_DELEGATED:
+                                $delegatedParams['status'] = 'delegou para um novo participante';
+            break;
+                }
+                        //notifica o organizador a resposta do delegado
+                        self::participantStatusChange( $partID['delegatedFrom'] , $schedulable , $organizer , $type, $delegatedParams );
+        
+                        $method = 'REQUEST';
+                        $notificationType = 'Resposta Delegação'; 
+                        $part = 'attendees';
+                        self::mountStruture($partID['delegatedFrom'], $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType );
+                        
+                        $data = array_merge($data, $delegatedParams);
+                        
+            self::sendMail($data, $ical , $part['user']['mail'] , $subject , 'notify_response_delegated_status_body');
+       
+    }
+
+        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
+                {
+                        $schedulable['URI']['concept'] = 'schedulable';
+                        $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => $method) );  
+                        $ical['type'] = 'text/calendar';
+                        $ical['name'] = 'calendar.ics';
+                        if($regSet)
+                                Config::regSet('ical://'.$schedulable['id'].'/'.$method, $ical);
+                }
+                else
+                        $ical = Config::regGet('ical://'.$schedulable['id'].'/'.$method);
         
-           $part = false;
-           if( Config::regGet('ical://'.$schedulable['id'].'/REQUEST') === false ) //Verifica se o ical ja não esta no reg
-           {
-                  $schedulable['URI']['concept'] = 'schedulable';
-                  $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'REQUEST') );  
-                  $ical['type'] = 'text/calendar';
-                  $ical['name'] = 'calendar.ics';
-                  Config::regSet('ical://'.$schedulable['id'].'/REQUEST', $ical);
-           }
-           else
-                $ical = Config::regGet('ical://'.$schedulable['id'].'/REQUEST');
-        
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
+                        $timezone = new DateTimeZone('UTC');
+                        $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
+                        $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
            
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
+                        if(isset($schedulable['timezone']))
+                        {
+                                $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
+                                $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
+                        }
             
-           $attList = '<UL> ';
-           foreach ($schedulable['participants'] as $i => $v)  
-           {   
-                if($part === false && $v['id'] == $partID)
-                   $part = $v;
-
-                $attList .= ' <LI> '. (isset($v['user']['name']) ? $v['user']['name'] : $v['user']['mail']) ;
-           }
-           $attList .= '</UL>';
-                            
-           $data = array(     'startDate' =>  date_format( $sTime , 'd/m/Y') ,
+                        $data = array(     'startDate' =>  date_format( $sTime , 'd/m/Y') ,
                               'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
                               'endDate' =>  date_format( $eTime , 'd/m/Y') ,
@@ -136 +295 @@
                               'eventTitle' =>  $schedulable['summary'],
                               'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC' ,
-                              'participants' =>  $attList);
-            
-             $subject['notificationType'] = 'Convite de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');
- 
-             self::sendMail($data, $ical , $part['user']['mail'] , $subject , 'notify_create_body');
+                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
+                        $temp = $part;
+                        $part = false;
+                        switch($temp){
+                                case 'attendees':
+                                        $attList = '<UL> ';
+                                        foreach ($schedulable['participants'] as $i => $v)  
+                                        {               
+                                                if($part === false && $v['id'] == $partID)
+                                                   $part = $v;
+
+                                                $attList .= ' <LI> '. (isset($v['user']['name']) ? $v['user']['name'] : $v['user']['mail']) ;
+                                        }
+                                        $attList .= '</UL>';
+                                        $data['participants'] = $attList;
+                                break;
+                                case 'me':
+                                        $part = self::_getAttendeeById($partID, $schedulable);
+                                        $data['participant'] = isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail'];
+                                break;
+                                case 'othersAttendees':
+                                        $data['participants'] = '<UL> ';
+                                        foreach ($schedulable['participants'] as $ii => $participant){
+                                                if(Config::me('mail') !== $participant['user']['mail'])
+                                                        $part[] = $participant['user']['mail'];
+                                        
+                                        $data['participants'] .= ' <LI> '. (isset($participant['user']['name']) ? $participant['user']['name'] : $participant['user']['mail']) ;
+                                        }
+                                break;
+                        }         
+                        $subject['notificationType'] = $notificationType;
+                        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
+                        $subject['startDate'] = date_format( $sTime , 'd/m/Y');
+                        $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
+                        $subject['endDate'] = date_format( $eTime , 'd/m/Y');
+                        $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
+                        $subject['participant'] = Config::me('uid');
+        }
+        
+        
+    /**
+    * Monta o email de convite que sera enviado ao participant
+    *
+    * @license    http://www.gnu.org/copyleft/gpl.html GPL
+    * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br)
+    * @sponsor    Caixa Econômica Federal
+    * @author     Cristiano Corrêa Schmidt
+    * @return     void
+    * @access     public
+    */
+    public static function participantCreated( &$partID , &$schedulable, $type = false, $delegatedParams = false)
+    {   
+                $method = 'REQUEST';
+                $notificationType = 'Convite de Calendario'; 
+                $part = 'attendees';
+                self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType, true);
+        
+                if($delegatedParams)
+                        $data = array_merge($data, $delegatedParams);
+                                         
+                 self::sendMail($data, $ical , $part['user']['mail'] , $subject , !$delegatedParams  ? 'notify_create_body' : 'notify_create_delegated_body' );
        
     }
@@ -161 +369 @@
     * @access     public
     */
-    public static function participantStatusChange( &$partID , &$schedulable , &$organizer , $type )
-    {
-        $part = false;
-        
-        foreach ($schedulable['participants'] as $i => $v) //salva em $part as informações do participant a ser notificado     
-            if(($v['id'] == $partID) && ($part = $v) ) break;
-            
-        if( Config::regGet('ical://'.$schedulable['id'].'/REPLY') === false ) //Verifica se o ical ja não esta no reg
-        {
-                  $schedulable['URI']['concept'] = 'schedulable';
-                  $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'REPLY' , 'participant' => $partID) );  
-                  $ical['type'] = 'text/calendar';
-                  $ical['name'] = 'calendar.ics';
-                  Config::regSet('ical://'.$schedulable['id'].'/REPLY', $ical);
-         }
-         else
-            $ical = Config::regGet('ical://'.$schedulable['id'].'/REPLY');
-        
-        
-        $timezone = new DateTimeZone('UTC');
-        $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-        $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-        
-        if(isset($schedulable['timezone']))
-        {
-            $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-            $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-        }
-        
-        $data = array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                          'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                          'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                          'endTime' =>  ($schedulable['allDay']) ? '' :  date_format( $eTime , 'H:i') ,
-                          'eventTitle' =>  $schedulable['summary'],
-                          'eventLocation' =>  $schedulable['location'],
-                          'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC' ,
-                          'participant' =>  (isset($part['user']['name']) ? $part['user']['name'] : $part['user']['mail']) );
-          
-        $subject['notificationType'] = 'Convite Aceito';
-        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-        $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-        $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-        $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-        $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-        $subject['participant'] = Config::me('uid');
-          
+    public static function participantStatusChange( &$partID , &$schedulable , &$organizer , $type, $delegatedParams = false )
+    {   
+        $method = 'REPLY';
+                $notificationType = 'Convite Aceito';
+                $part = 'me';
+                
+                self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType, true );
+                       
+                if($delegatedParams){
+                        $data = array_merge($data, $delegatedParams);
+                        $tplDelegated = 'notify_delegated_status_body';
+                }
+
        switch($type)
        {
             case STATUS_ACCEPTED:
-                $tpl =   'notify_accept_body';
+                $tpl =   !$delegatedParams ? 'notify_accept_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite Aceito';
             break;
-            case STATUS_TENATIVE:
-                $tpl =   'notify_attempt_body';
+            case STATUS_TENTATIVE:
+                $tpl =   !$delegatedParams ? 'notify_attempt_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite  aceito provisoriamente';
             break;
             case STATUS_CANCELLED:
-                $tpl =   'notify_reject_body';
+                $tpl =   !$delegatedParams ? 'notify_reject_body' : $tplDelegated;
                 $subject['notificationType'] = 'Convite rejeitado';
+            break;
+                        case STATUS_DELEGATED:
+                                if($delegatedParams)
+                                        $data = array_merge($data, $delegatedParams);
+                $tpl =   'notify_delegated_body';
+                $subject['notificationType'] = 'Convite delegado';
             break;
 
@@ -264 +445 @@
        if((Config::regGet('noAlarm') === false) && (self::futureEvent( $schedulable['startTime'] , $schedulable['rangeEnd'])))
        {
-           $schedulable['URI']['concept'] = 'schedulable'; 
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-           
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
-           
-           $data =  array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                              'startTime' =>  ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                              'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                              'endTime' =>  ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i') ,
-                              'eventTitle' =>  $schedulable['summary'],
-                              'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
-                              
-           
-           $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'CANCEL'));  
-           $ical['type'] = 'text/calendar';
-           $ical['name'] = 'calendar.ics';
-           
-           foreach ($schedulable['participants'] as $ii => $participant)
-                if(Config::me('mail') !== $participant['user']['mail'])
-                    $to[] = $participant['user']['mail'];
-                    
-             $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');     
+                        $method = 'CANCEL';
+                        $notificationType = 'Cancelamento de Calendario';
+                        $part = 'othersAttendees';
+                        self::mountStruture($uri['id'], $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType );
                 
-           if(count($to) > 0)
-            self::sendMail($data, $ical , implode(',' , $to) ,$subject, 'notify_cancel_body');
+           if(count($part) > 0)
+            self::sendMail($data, $ical , implode(',' , $part) ,$subject, 'notify_cancel_body');
        }
     }
@@ -323 +473 @@
        if((Config::regGet('noAlarm') === false) && (self::futureEvent( $schedulable['startTime'] , $schedulable['rangeEnd'])))
        {  
-           $schedulable['URI']['concept'] = 'schedulable'; 
-           $timezone = new DateTimeZone('UTC');
-           $sTime = new DateTime( '@'.(int)($schedulable['startTime'] / 1000) , $timezone );
-           $eTime =  new DateTime( '@'.(int)($schedulable['endTime'] / 1000) , $timezone ); 
-           
-           if(isset($schedulable['timezone']))
-           {
-               $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-               $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-           }
-           
-           $data =  array('startDate' =>  date_format( $sTime , 'd/m/Y') ,
-                              'startTime' => ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i') ,
-                              'endDate' =>  date_format( $eTime , 'd/m/Y') ,
-                              'endTime' => ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i') ,
-                              'eventTitle' =>  $schedulable['summary'],
-                              'eventLocation' =>  $schedulable['location'],
-                              'timezone' =>  ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC');
-
-           $ical['source'] = Controller::format( array( 'service' => 'iCal' ) , array($schedulable) , array('method' => 'CANCEL'));  
-           $ical['type'] = 'text/calendar';
-           $ical['name'] = 'calendar.ics';
-           
-             $subject['notificationType'] = 'Cancelamento de Calendario';
-             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-             $subject['startDate'] = date_format( $sTime , 'd/m/Y');
-             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i');
-             $subject['endDate'] = date_format( $eTime , 'd/m/Y');
-             $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format( $eTime , 'H:i');
-             $subject['participant'] = Config::me('uid');
-                          
-           self::sendMail($data, $ical , $participant['user']['mail'] , $subject , 'notify_cancel_body');  
+                        $method = 'CANCEL';
+                        $notificationType = 'Cancelamento de Calendario';
+                        $part = 'others';
+                        self::mountStruture(false, $schedulable, false , $data,  $subject, $ical, $part, $method, $notificationType );
+                                            
+                        self::sendMail($data, $ical , $participant['user']['mail'] , $subject , 'notify_cancel_body');  
         }
     }
@@ -369 +493 @@
     */
     public function updateEvent( &$uri , &$params , &$criteria , $original  )
-    {
-       
-       $schedulableOld =  Controller::read( array( 'concept' => 'schedulable' , 'id' => $uri['id'] ) , null , array('deepness' => '2') ) ;      
+    {       
+       $schedulableOld =  Controller::find( array( 'concept' => 'schedulable' , 'id' => $uri['id'] ) , null , array('deepness' => '2') ) ;      
        $schedulable = $schedulableOld;
        $alt = false;
-       
-      
+
        foreach ($params as $i => $v) //Verifica se ouve alteração no evento
            if( isset( $schedulableOld[$i] ) && $schedulableOld[$i] != $v && $i != 'participants')
@@ -384 +506 @@
            
        if ( ($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'])) ) 
-       {
-            $schedulable['URI']['concept'] = 'schedulable';
-            $ical['source'] = Controller::format(array('service' => 'iCal'), array($schedulable), array('method' => 'REQUEST'));
-            $ical['type'] = 'text/calendar';
-            $ical['name'] = 'calendar.ics';
-
-            $timezone = new DateTimeZone('UTC');
-            $sTime = new DateTime('@' . (int) ($schedulable['startTime'] / 1000), $timezone);
-            $eTime = new DateTime('@' . (int) ($schedulable['endTime'] / 1000), $timezone);
-
-            if (isset($schedulable['timezone'])) {
-                $sTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-                $eTime->setTimezone(new DateTimeZone($schedulable['timezone']));
-            }
-            ///Montando lista de participantes
-            $attList = '<UL> ';
-            foreach ($schedulable['participants'] as $ii => $participant)
-                $attList .= ' <LI> ' . (isset($participant['user']['name']) ? $participant['user']['name'] : $participant['user']['mail']);
-            $attList .= ' </UL>';
-            /////////////////////////
-
-            $data = array('startDate' => date_format($sTime, 'd/m/Y'),
-                'startTime' => ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i'),
-                'endDate' => date_format($eTime, 'd/m/Y'),
-                'endTime' => ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i'),
-                'eventTitle' => $schedulable['summary'],
-                'eventLocation' => $schedulable['location'],
-                'timezone' => ($schedulable['timezone']) ? $schedulable['timezone'] : 'UTC',
-                'participants' => $attList
-            );
-
-
-            foreach ($schedulable['participants'] as $ii => $participant)
-                if (Config::me('mail') !== $participant['user']['mail'])
-                    $to[] = $participant['user']['mail'];
-
-            $subject['notificationType'] = 'Modificação de Calendario';
-            $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8');
-            $subject['startDate'] = date_format($sTime, 'd/m/Y');
-            $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i');
-            $subject['endDate'] = date_format($eTime, 'd/m/Y');
-            $subject['endTime'] = ($schedulable['allDay']) ? '' : date_format($eTime, 'H:i');
-            $subject['participant'] = Config::me('uid');
-             
-            if ( isset($to) && count($to) > 0)
-                self::sendMail($data, $ical, implode(',', $to), $subject, 'notify_modify_body');
+       {                        
+                        $method = 'REQUEST';
+                        $notificationType = 'Modificação de Calendario'; 
+                        $part = 'othersAttendees';
+                        self::mountStruture($partID, $schedulable, $type , $data,  $subject, $ical, $part, $method, $notificationType);
+
+            if ( isset($part) && count($part) > 0)
+                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_modify_body');
         }
     }

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

@@ -29 +29 @@
                 this.preferenceIds = pref.ids;
     }
+}
+
+constantsParticipant = {
+        'o' : 'organization',
+        'w' : 'write',
+        'p' : 'participationRequired',
+        'i' : 'inviteGuests',
+        'r' : 'read'
 }
 
@@ -333 +341 @@
 });
 
+DataLayer.codec( "suggestion", "duration", {
+
+    decoder: function( evtObj ){
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+
+
+
+                var meAttendee = function(attendees){
+                        for(var i = 0; i < attendees.length; i++)
+                                if(DataLayer.get('participant', attendees[i]).user == User.me.id)
+                                        return attendee;
+                };
+
+                var res = $.map(evtObj, function( form ){       
+                        return {
+                                participant : meAttendee(form.attendee), 
+                                startTime: Timezone.getDateUTC(Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ), tzId).getTime(),
+                                endTime:  parseInt(Timezone.getDateUTC(Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ), tzId).getTime()) + (!!form.allDay ? 86400000 : 0) ,
+                                allDay: ( !!form.allDay ? 1 : 0 ),
+                                schedulable: form.idEvent
+                        }
+                });     
+        
+
+        return notArray ? res[0] : res;
+        },
+        
+        encoder: function( evtObj ){}
+        
+});
+
+DataLayer.codec( "attachment", "detail", {
+  
+        decoder: function(evtObj){
+        
+                if( notArray = $.type(evtObj) !== "array" )
+                        evtObj = [ evtObj ];
+
+                var res = $.map(evtObj, function( form){
+                        return [$.map(form.files , function( files){
+                                        return { source: files };
+                                })];
+                });
+        return notArray ? res[0] : res;
+        },
+      
+        encoder: function(){}
+
+      
+});
+
 DataLayer.codec( "schedulable", "preview", {
 
@@ -348 +408 @@
                                 id: form.idEvent,
                                 calendar: form.calendar,
-                                participants : [{
-                                        user: User.me.id,
-                                        status: form.status,
-                                        id: form.meId,
-                                        isOrganizer: 0,
-                                        alarms: typeof(form.alarmTime) != 'undefined' ? 
-                                                $.map( form.alarmTime || [], function( alarmTime, i ){
-
-                                                        if( alarmTime === "" )
-                                                                return( null );
-
-                                                        return !!form.alarmId[i] ?
-                                                                { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] } : 
-                                                                { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
-                                                }) : []
-                                        }]
+                                participants : $.map(form.attendee, function( attendee, i ){
+                                        if(isNaN(attendee)){
+                                                return{
+                                                        id: attendee,
+                                                        acl: form.attendeeAcl[i],
+                                                        delegatedFrom: !!form.delegatedFrom[i] ? form.delegatedFrom[i] : 0,
+                                                        isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                        isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                                                        acl: form.attendeeAcl[i].replace('o', '')
+                                                };
+                                        }else{
+                                                if(DataLayer.get('participant', attendee).user == User.me.id){
+                                                        var me = {
+                                                                user: User.me.id,
+                                                                status: form.status,
+                                                                id: attendee,
+                                                                isOrganizer: 0,
+                                                                receiveNotification : (!!form.receiveNotification ? 1 : 0),
+                                                                alarms: typeof(form.alarmTime) != 'undefined' ? 
+                                                                        $.map( form.alarmTime || [], function( alarmTime, i ){
+
+                                                                                if( alarmTime === "" )
+                                                                                        return( null );
+
+                                                                                return !!form.alarmId[i] ?
+                                                                                        { type: form.alarmType[i], unit: form.alarmUnit[i], time: form.alarmTime[i], id: form.alarmId[i] } : 
+                                                                                        { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
+                                                                        }) : []
+                                                        };
+                                                        
+                                                        if(form.startDate){
+                                                                var tzId =  DataLayer.get('schedulable', form.idEvent).timezone || User.preferences.timezone,
+                                                                formatString = ( typeof form.allDay !== "undefined" && !!form.allDay )? pref.dateFormat+" HH:mm" : pref.dateFormat + " " + pref.hourFormat;
+                                                                
+                                                                DataLayer.put('notification', {
+                                                                        participant: me.id,
+                                                                        type: 'suggestion',
+                                                                        startTime: Timezone.getDateUTC(Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ), tzId).getTime(),
+                                                                        endTime:  parseInt(Timezone.getDateUTC(Date.parseExact(form.endDate + ( !!form.allDay ? " 00:00": " "+$.trim(form.endHour)), formatString ), tzId).getTime()) + (!!form.allDay ? 86400000 : 0) ,
+                                                                        allDay: ( !!form.allDay ? 1 : 0 ),
+                                                                        schedulable: form.idEvent
+                                                                });
+                                                        
+                                                        }
+                                                        return me;
+                                                }else return(null);
+                                        };
+                                })
                         }
                 });
-                
                 return notArray ? res[0] : res;
     },
@@ -381 +472 @@
         statusLabels = [ '', 'accepted', 'tentative', 'cancelled', 'unanswered', 'delegated' ];
         
+        var delegateAttendee = {};
+        
         for( var i = 0; i < statusLabels.length; i++ )
                 statusParticipants[ statusLabels[i] ] = 0;
-
-        var isOrganizer = 1;
         
         var res = $.map(evtObj, function( objEvent ){                   
                     
-                        var participantInfo = {}, me = DataLayer.copy(User.me);
+                        var participantInfo = {}, delegatedFrom = {}, me = DataLayer.copy(User.me);
+                        
+                        var constantAcl = function(acl){
+                                var returns = {};
+                                for (var i in constantsParticipant){
+                                        returns[constantsParticipant[i]] = acl.indexOf(i) >= 0 ? true : false
+                                }
+                                return returns;
+                        };
                                                 
                     return {
@@ -406 +505 @@
                             endHour: dateCalendar.formatDate(Timezone.setDateTimezone(new Date(parseInt(objEvent.endTime)), objEvent.timezone, objEvent.calendar), User.preferences.hourFormat),
                             allDay: !!parseInt( objEvent.allDay ),
-          //                            attachments: this.decode( "attachment:detail", form ),
+                                attachments: $.map(objEvent.attachments || [], function( attachment, i ){
+                                        var attach = DataLayer.get('schedulableToAttachment', attachment, false);
+                                        attach.name = attach.name.length < 10 ?  attach.name : ( attach.name.substr(0, 6) + attach.name.substr( attach.name.length-4, attach.name.length));
+                                        
+                                        return attach;
+                                }),                                             
                             attendee: $.map(objEvent.participants || [], function( participant, i ){                                            
+                                        
+                                        if(delegateAttendee[participant])
+                                                return(null);
                                         
                                         var attend = DataLayer.get('participant', participant);
@@ -416 +523 @@
                                         if( attend.user.id ===  me.id ){
                                             participantInfo.user = {
+                                                        id: attend.id,
                                                         status : attend.status,
+                                                        delegatedFrom: attend.delegatedFrom,
+                                                        acl: attend.acl,
+                                                        receiveNotification : attend.receiveNotification,
                                                         alarms : $.map(attend.alarms || [], function( alarm ){
                                                                 return DataLayer.get('alarm', alarm);
@@ -422 +533 @@
                                                 };
                                                 me.id = attend.id;
-                                                return(null);
+                                                return(null);
                                         };
                                         
@@ -429 +540 @@
                                                 name: attend.user.name != 'false' ? attend.user.name : '',
                                                 mail: attend.user.mail,
-                                                isExternal: attend.isExternal
+                                                status : attend.status,
+                                                isExternal: attend.isExternal,
+                                                acl: attend.acl,
+                                                delegatedFrom: attend.delegatedFrom
                                         };
                                         
+                                        if(!!parseInt(attend.delegatedFrom)){
+                                                delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person);
+                                                return(null);
+                                        }
+                                        
                                         if( !!parseInt(attend.isOrganizer )){
-                                                isOrganizer = ((attend.user.id == User.me.id) || (!!!attend.user)) ? 1 : 0;
                                             participantInfo.organizer = DataLayer.copy(person);
                                                 return(null);
@@ -441 +559 @@
                                 }),
                             organizer: participantInfo.organizer || me,
-                            alarms: !!participantInfo.user ?  participantInfo.user.alarms : [],
-                            status: !!participantInfo.user ? participantInfo.user.status :  1,
-                            me: me,
-                                isOrganizer: isOrganizer,
+                            alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
+                            status: !!participantInfo.user ? participantInfo.user.status : 1,
+                                acl: !!participantInfo.user ? constantAcl(participantInfo.user.acl) : constantAcl('rowi'),
+                            me: !!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(me, {acl: 'rowi', delegatedFrom: 0, receiveNotification: 1}),
+                                delegatedFrom: delegatedFrom,
                                 statusParticipants: statusParticipants
                         };
-                });
-
+                });     
         return notArray ? res[0] : res;
     }
@@ -485 +603 @@
                               description: form.description,
                               timezone: tzId,
+                                  attachments: $.map(form.attachment || [], function( attachment, i ){
+                                                return {attachment: attachment}
+                                  }),
                               participants: $.map( form.attendee || [], function( attendee, i ){
 
@@ -495 +616 @@
                                                 if( participant.user === User.me.id ){
                                                         return DataLayer.merge({
-                                                                isOrganizer: ( !i ? 1 : 0 ),
+                                                                id: attendee,
+                                                                isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                                acl: form.attendee_organizer == attendee ? (form.attendeeAcl[i].indexOf('o') < 0 ? form.attendeeAcl[i]+'o' : form.attendeeAcl[i]) : form.attendeeAcl[i].replace('o', ''),
                                                                 alarms: participant.alarms = $.map( form.alarmTime || [], function( alarmTime, i ){
                                                                                 if( alarmTime === "" )
@@ -502 +625 @@
                                                                                                                                         { type: form.alarmType[i],unit: form.alarmUnit[i], time: form.alarmTime[i] };
                                                                         }),
-                                                                status: form.status
-                                                        }, !!form.idEvent ? {id: attendee} : {user: participant.user});                                                 
+                                                                status: !!form.status ? form.status : 3
+                                                                }, form.delegatedFrom[i] != '0' ? {delegatedFrom: form.delegatedFrom[i]} : {});                                                 
                                                 }else{
-                                                        return {
+                                                        return DataLayer.merge({
                                                                 id: attendee,
-                                                                isOrganizer: ( !i ? 1 : 0 ),
-                                                                isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
-                                                        };
+                                                                acl: form.attendeeAcl[i],
+                                                                isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
+                                                                isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                                                                acl: form.attendee_organizer == attendee ? (form.attendeeAcl[i].indexOf('o') < 0 ? form.attendeeAcl[i]+'o' : form.attendeeAcl[i]) : form.attendeeAcl[i].replace('o', '')
+                                                        }, form.delegatedFrom[i] != '0' ? {delegatedFrom: form.delegatedFrom[i]} : {}); 
                                                 };
                                           })
@@ -719 +844 @@
                         for(var i = 0; i < evt.participants.length; i++){
                                 attendee = DataLayer.get('participant', evt.participants[i]);
-                                if(!!parseInt(attendee.isOrganizer))
                                         if(attendee.user == User.me.id)
-                                                return true;
-                                        else
-                                                return false;
+                                                return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? true : false;
                         }
                 }

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

@@ -45 +45 @@
 }
 */
+
 function eventDetails( objEvent, decoded, path)
 {
@@ -69 +70 @@
          */
         zebraDiscardEventDialog = false;
+        
+        /**
+                ACLs do participant
+        */
+        acl_names = {
+                'w': 'acl-white',
+                'i': 'acl-invite-guests',
+                'p': 'acl-participation-required'
+        };
+        /**
+        * callback de participantes generico
+        */
+        var callbackAttendee = function(){
+                //Cria qtip de permissões pelo click do checkbox
+                var checked = false;
+                blkAddAtendee.find("li.not-attendee").addClass('hidden');
+        
+                blkAddAtendee.find("li .button").filter(".close.new").button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                        text: false
+                }).click(function () {
+                        DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+                        $(this).parents('li').remove();
+                        if(blkAddAtendee.find(".attendee-list li").length == 1)
+                                blkAddAtendee.find("li.not-attendee").removeClass('hidden');
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+        
+                .filter(".delegate.new").button({
+                        icons: {
+                                primary: "ui-icon-transferthick-e-w"
+                        },
+                        text: false
+                }).click(function () {
+                                                
+                        if($(this).hasClass('attendee-permissions-change-button')){
+                                $(this).removeClass('attendee-permissions-change-button')   
+                                .find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change').end();               
+                                
+                                $(this).parents('li').find('input[name="delegatedFrom[]"]').val('');
+                                
+                                blkAddAtendee.find('.request-update').addClass('hidden');
+                                blkAddAtendee.find('.status option').toggleClass('hidden');
+                                
+                                
+                                blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
+                                
+                        }else{
+                                blkAddAtendee.find('.delegate').removeClass('attendee-permissions-change-button');
+                                blkAddAtendee.find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change');
+                        
+                                $(this).addClass('attendee-permissions-change-button')   
+                                .find('.ui-icon-transferthick-e-w').addClass('attendee-permissions-change').end();               
+                                $(this).parents('li').find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+                        
+                                blkAddAtendee.find('.request-update').removeClass('hidden');
+                                if(blkAddAtendee.find('.status option.hidden').length == 1)
+                                        blkAddAtendee.find('.status option').toggleClass('hidden');
+                        
+                                blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+                        }
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+                
+                .filter(".edit.new").button({
+                        icons: {
+                                primary: "ui-icon-key"
+                        },
+                        text: false
+                }).click(function() {
+                        
+                        if(!!!checked)
+                                $(this).parents('li').find('[type=checkbox]').attr('checked', (!$(this).parent().find('[type=checkbox]').is(':checked'))).end();
+                        
+                        var aclsParticipant =  $(this).parents('li').find('input[name="attendeeAcl[]"]').val();
+                        checked = false;
+                        
+                        if( $('.qtip.qtip-blue.qtip-active').val() !== ''){
+                                blkAddAtendee.find('dd.attendee-list').qtip({
+                                        show: {ready: true, solo: true, when: {event: 'click'}},
+                                        hide: false,
+                                        content: {
+                                                text: $('<div></div>').html( DataLayer.render( 'templates/attendee_permissions.ejs', {} ) ), 
+                                                title: {
+                                                        text:'Permissões', 
+                                                        button: '<a class="button close" href="#">close</a>'
+                                                }
+                                        },
+                                        style: {name: 'blue', tip: {corner: 'leftMiddle'}, border: {width: 4, radius: 8}, width: {min: 230, max:230}},
+                                        position: {
+                                                corner: {
+                                                        target: 'rightMiddle',
+                                                        tooltip: 'leftMiddle'
+                                                },
+                                                adjust: {x:0, y:0}
+                                        }
+                                })
+                                .qtip("api").onShow = function(arg0) {
+                                        $('.qtip-active .button.close').button({
+                                                icons: {primary: "ui-icon-close"},
+                                                text: false
+                                        })
+                                        .click(function(){
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        });
+                                        
+                                        $('.qtip-active .button.save').button().click(function(){
+                                                
+                                                var acl = '';
+                                                $('.qtip-active').find('[type=checkbox]:checked').each(function(i, obj) {
+                                                        acl+= obj.value;
+                                                });
+
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]:checked').siblings('input[name="attendeeAcl[]"]').each(function(i, obj) { 
+                                                        obj.value = 'r'+acl;
+                                                }).parents('li').find('.button.edit').addClass('attendee-permissions-change-button')   
+                                                .find('.ui-icon-key').addClass('attendee-permissions-change');               
+                                                
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]').attr('checked', false);
+                                                
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        
+                                        });
+                                        $('.qtip-active .button.cancel').button().click(function(){
+                                                blkAddAtendee.find('dd.attendee-list [type=checkbox]').attr('checked', false);
+                                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                        });
+                                        
+                                        if(aclsParticipant)
+                                                for(var i = 1; i < aclsParticipant.length; i++){
+                                                        $('.qtip-active').find('input[name="'+acl_names[aclsParticipant.charAt(i)]+'"]').attr('checked', true);
+                                                }
+                                        
+                                        
+                                        $('.button').button();
+                                        
+                                };
+                        }else{
+                                if(!$('.new-event-win dd.attendee-list').find('[type=checkbox]:checked').length){
+                                        blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                                }else{
+                                        $('.qtip-active .button.save .ui-button-text').html('Aplicar a todos')
+                                }
+                        
+                        };                      
+                })
+                .addClass('tiny disable ui-button-disabled ui-state-disabled')
+                .removeClass('new').end()
+                
+                .filter(".open-delegate.new").click(function(){
+                        if($(this).hasClass('ui-icon-triangle-1-e')){
+                                $(this).removeClass('ui-icon-triangle-1-e').addClass('ui-icon-triangle-1-s');
+                                $(this).parents('li').find('.list-delegates').removeClass('hidden');
+                        }else{
+                                $(this).removeClass('ui-icon-triangle-1-s').addClass('ui-icon-triangle-1-e');
+                                $(this).parents('li').find('.list-delegates').addClass('hidden');
+                        }
+                
+                }).removeClass('new');
+        
+        
+                blkAddAtendee.find("li input[type=checkbox].new").click(function(){
+                        if(!$('.new-event-win dd.attendee-list').find('[type=checkbox]:checked').length){
+                                blkAddAtendee.find('dd.attendee-list').qtip('destroy');
+                        }else{
+                                checked = true;
+                                $(this).parents('li').find('.button.edit').click();
+                                //$('.qtip-active .button.save .ui-button-text').html('Aplicar a todos')
+                        }
+                        
+                        checked = true;
+                        $(this).parents('li').find('.button.edit').click();
+                }).removeClass('new');
+        
+                UI.dialogs.addEvent.find('.attendees-list li').hover(
+                        function () {
+                                $(this).addClass("hover-attendee");
+                                $(this).find('.button').removeClass('disable ui-button-disabled ui-state-disabled').end()
+                                .find('.attendee-options').addClass('hover-attendee');
+                        },
+                        function () {
+                                $(this).removeClass("hover-attendee");
+                                $(this).find('.button').addClass('disable ui-button-disabled ui-state-disabled').end()
+                                .find('.attendee-options').removeClass('hover-attendee');;
+                        }
+                );
+        
+                
+        }
         
         var html = DataLayer.render( path+'templates/event_add.ejs', {event:objEvent}); 
@@ -99 +293 @@
                                                                         if(clicked == 'Descartar alterações') {
                                                                                 canDiscardEventDialog = true;
+                                                                                /**
+                                                                                *Remoção dos anexos do eventos caso seja cancelado a edição
+                                                                                */
+                                                                                var ids = [];
+                                                                                $.each($('.attachment-list input'), function (i, input) { ids.push(input.value); });
+                                                                                if(ids.length > 0)
+                                                                                        DataLayer.remove('attachment', {filter: ['IN', 'id', ids]});
+                                                                                
                                                                                 UI.dialogs.addEvent.dialog('close');
                                                                         }else{
@@ -256 +458 @@
                         canDiscardEventDialog = true;
                         
-                        UI.dialogs.addEvent.children(".form-addevent").submit();
+                        UI.dialogs.addEvent.children().find('form.form-addevent').submit();
                         UI.dialogs.addEvent.dialog("close");
             }).end()
                 
                 .children(".export").click(function(){
-                        UI.dialogs.addEvent.children(".form-export").submit();
+                        UI.dialogs.addEvent.children().find(".form-export").submit();
             });
 
@@ -293 +495 @@
             });
             
-//          UI.dialogs.addEvent.find('.button-add-attachment').click(function(){
-//                  var li_attach = 
-//                          '<li class="input_label">' + 
-//                                  '<input type="file" name="attachments[]"" />' +
-//                          '</li>';
-//                  jQuery('.attachments-list').append(li_attach);
-//          });
-            
-                var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', {event:objEvent});
+                 
+                UI.dialogs.addEvent.find('.button.suggestion-hours').button({
+                        icons: {
+                                primary: "ui-icon-clock"
+                        },
+                        text: 'Sugerir horário'
+                }).click(function () {
+                        $(this).siblings('input').removeAttr('disabled')
+                        .end().parents().find('input[name="allDay"]').removeAttr('disabled');           
+                });
+
+                if(objEvent.me.id == User.me.id){
+                        objEvent.me.id = DataLayer.put('participant', {user: objEvent.me.id, mail: objEvent.me.mail });
+                        objEvent.organizer.id = objEvent.me.id;
+                }
+
+                var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', {event:objEvent});              
         
                         // load template of attendees
                         var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-                        
-                        blkAddAtendee.find('li.attendee .button').addClass('small '+ (objEvent.isOrganizer == 1 ? '' : 'hidden')).button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
-                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                $(this).parent().remove();
-                        });
+                        if(objEvent.attendee.length)
+                                callbackAttendee();
+                        /**
+                                Opções de delegação do participante/organizer
+                        */              
+                        blkAddAtendee.find(".button.participant-delegate").button({
+                                icons: {
+                                        primary: "ui-icon-transferthick-e-w"
+                                },
+                                text: false
+                        }).click(function () {
+                                if($(this).hasClass('attendee-permissions-change-button')){
+                                        if(!$(this).hasClass('disable')){
+                                                $(this).removeClass('attendee-permissions-change-button')   
+                                                .find('.ui-icon-transferthick-e-w').removeClass('attendee-permissions-change').end();               
+                                                blkAddAtendee.find('.block-add-attendee.search').addClass('hidden');
+                                                blkAddAtendee.find('.block-add-attendee.search dt').html('Adicionar outros contatos');
+                                        }
+                                }else{                                                                  
+                                        $(this).addClass('attendee-permissions-change-button')   
+                                        .find('.ui-icon-transferthick-e-w').addClass('attendee-permissions-change').end();               
+                                        blkAddAtendee.find('.block-add-attendee.search dt').html('Delegar participação para');
+                                        blkAddAtendee.find('.block-add-attendee.search').removeClass('hidden');
+                                        blkAddAtendee.find('.block-add-attendee.search input.search').focus();
+                                }
+                        })
+                        .addClass('tiny');              
+                        
                         //show or hidden permissions attendees
                         //blkAddAtendee.find('.block-attendee-list #attendees-users li').click(show_permissions_attendees); 
@@ -481 +714 @@
                                                         user[0].id =  DataLayer.put('participant', {user: user[0].id, isExternal: isExternal});
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', user)
+                                                                DataLayer.render(path+'templates/participants_add_itemlist.ejs', {user:user, acl: objEvent.acl})
                                                         )
-                                                        .find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                                DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                                                $(this).parent().remove();
-                                                        }).end()
                                                         .scrollTo('max');
+                                                        callbackAttendee();
                                                 }
                                                 
@@ -503 +733 @@
                                                  
                                                 blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
-                                                        DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail, isExternal: 1}])
-                                                ).find('.button.close').addClass('small').button({text:false, icons:{primary:'ui-icon-close'}}).click(function() {
-                                                        DataLayer.remove('participant', $(this).parent().find('[type=checkbox]').val());
-                                                        $(this).parent().remove();
-                                                }).end()
-                                                .scrollTo('max');
-
+                                                        DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id:newAttendeeId, name: newAttendeeName, mail: newAttendeeEmail, isExternal: 1, acl: objEvent.acl}])
+                                                ).scrollTo('max');
+                                                callbackAttendee();
 
                                                 /** 
@@ -573 +799 @@
                                                         newAttendeeId = DataLayer.put('participant', {user: old_item.find('.id').html(), isExternal: 0});
                                                         blkAddAtendee.find('dd.attendee-list ul.attendee-list')
-                                                        .append(DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id: newAttendeeId, name: old_item.find('.name').html(), mail: old_item.find('.mail').html(), isExternal: 0}]))
-                                                        .find('.button').addClass('small').button({text:false, icons: {primary:'ui-icon-close'}}).click(function () {
-                                                                $(this).parent().remove();
-                                                        }).end()
+                                                        .append(DataLayer.render(path+'templates/participants_add_itemlist.ejs', [{id: newAttendeeId, name: old_item.find('.name').html(), mail: old_item.find('.mail').html(), isExternal: 0, acl: objEvent.acl}]))
                                                         .scrollTo('max');
-
-                                                        old_item.remove();
+                                                        /**
+                                                        * Delegação de participação de um participante com permissão apenas de leitura
+                                                        *
+                                                        */
+                                                        if(!objEvent.acl.organization && !objEvent.acl.write && !objEvent.acl.inviteGuests && objEvent.acl.read ){
+                                                                
+                                                                blkAddAtendee.find('.block-add-attendee.search').addClass('hidden');
+                                                                blkAddAtendee.find('.block-add-attendee.search dt').html('Adicionar outros contatos');
+                                                                
+                                                                blkAddAtendee.find('.status option').toggleClass('hidden');
+                                                                blkAddAtendee.find('option[value=5]').attr('selected','selected').trigger('change');
+                                                                blkAddAtendee.find('.request-update').removeClass('hidden');
+
+                                                                blkAddAtendee.find('dd.attendee-list ul.attendee-list li .button.close').parents('li').find('input[name="delegatedFrom[]"]').val(blkAddAtendee.find('.me input[name="attendee[]"]').val());
+                                                                
+                                                                blkAddAtendee.find('.me .participant-delegate').addClass('disable ui-button-disabled ui-state-disabled');
+                                                                blkAddAtendee.find(".button.close").button({
+                                                                        icons: {
+                                                                                primary: "ui-icon-close"
+                                                                        },
+                                                                        text: false
+                                                                }).click(function () {
+                                                                        
+                                                                        $(this).parents('li').find('input[name="delegatedFrom[]"]').val('');
+                                                                        blkAddAtendee.find('.request-update').addClass('hidden');
+                                                                        blkAddAtendee.find('.status option').toggleClass('hidden');
+                                                                        blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');                    
+                                                                        blkAddAtendee.find('.me .participant-delegate').removeClass('disable ui-button-disabled ui-state-disabled attendee-permissions-change-button')
+                                                                        .find('.ui-icon-person').removeClass('attendee-permissions-change').end();                      
+                                                                        
+                                                                        DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+                                                                        $(this).parents('li').remove();
+                                                                })
+                                                                .addClass('tiny');
+                                                        }else{
+                                                                callbackAttendee();
+                                                                old_item.remove();
+                                                        }
                                                 }
                                         });
@@ -586 +845 @@
                                 }
                         });
-
-/*
-                        UI.dialogs.addEvent.find('.attendees-list li').hover(
-                                function () {
-                                        $(this).addClass("hover");
-                                },
-                                function () {
-                                        $(this).removeClass("hover");
+                        //$('.block-add-attendee .search-result-list').selectable();
+
+                UI.dialogs.addEvent.find('.row.fileupload-buttonbar .button').filter('.delete').button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                                text: 'Excluir'
+                        }).click(function () {
+                                $('.row.fileupload-buttonbar .attachments-list p').remove();
+                                
+                                var ids = [];
+                                $.each($('.attachment-list input'), function (i, input) { ids.push(input.value); });
+                                if(ids.length > 0){
+                                        DataLayer.remove('attachment', {filter: ['IN', 'id', ids]});
+                                        $('.attachment-list input').remove();
                                 }
-                        );
-*/
-                        //$('.block-add-attendee .search-result-list').selectable();
-
-                        UI.dialogs.addEvent.find('.block-attendee-list select.status').change(function(){
-                                if ($(this).val() == 'another') {
-        //                              jQuery('.block-attendee-list .add-attendee-search').removeClass('hidden');
-                                        $(this).qtip({
-                                                show: {ready: true},
-                                                hide: false,
-                                                content: {
-                                                        text: $('.block-attendee-list .add-attendee-search').clone().removeClass('hidden'), 
-                                                        title: {
-                                                                text:'Indique o participante', 
-                                                                button: '<a class="button close" href="#">close</a>'
-                                                        }
-                                                },
-                                                style: {name: 'blue', tip: {corner: 'leftMiddle'}, border: {width: 4, radius: 8}, width: {min: 250, max:250}},
-                                                position: {
-                                                        corner: {
-                                                                target: 'rightMiddle',
-                                                                tooltip: 'leftMiddle'
-                                                        },
-                                                        adjust: {x:0, y:0}
-                                                }
-                                        })
-                                        $(this).qtip.onShow = function() {
-                                                $('.qtip .button.close').button({
-                                                        icons: {primary: "ui-icon-close"},
-                                                        text: false
-                                                });
-                                        }
-                                } else {
-        //                              jQuery('.block-attendee-list .add-attendee-search').addClass('hidden');
-                                }
-                        });
-                UI.dialogs.addEvent.find(':input').change(function(event){
-                        if (event.keyCode != '27' && event.keyCode != '13')
-                                canDiscardEventDialog = false;
-                }).keydown(function(event){
-                        if (event.keyCode != '27' && event.keyCode != '13')
-                                canDiscardEventDialog = false;
+                }).end()
+                .filter('.close').button({
+                        icons: {
+                                primary: "ui-icon-close"
+                        },
+                                text: false
+                        }).click(function () {
+                                DataLayer.remove('attachment', $(this).parents('p').find('input[name="fileId[]"]').val());
+                                $(this).parents('p').remove();
+                }).end()
+                .filter('.downlaod-archive').button({
+                        icons: {
+                                primary: "ui-icon-arrowthickstop-1-s"
+                        },
+                                text: false
                 });
+                
+        $('#fileupload').fileupload({
+                sequentialUploads: true,
+                add: function (e, data) {
+                        if(data.files[0].size < 30000000)
+                                data.submit();
+                },
+                change: function (e, data) {
+                        $.each(data.files, function (index, file) {
+                                var attach = {};
+                                attach.fileName = file.name;
+                                if(file.name.length > 10)
+                                        attach.fileName = file.name.substr(0, 6) + file.name.substr(file.name.length-4, file.name.length);
+                                attach.fileSize = file.size;
+                                if(file.size > 30000000)
+                                        attach.error = 'Tamanho de arquivo nao permitido!!'
+                                
+                                $('.attachments-list').append(DataLayer.render(path+'templates/attachment_add_itemlist.ejs', {file : attach}));
+                                
+                                if(file.size < 30000000){
+                                        $('.fileinput-button.new').append(data.fileInput[0]).removeClass('new');
+                                        $('.attachments-list').find('[type=file]').addClass('hidden');
+                                        
+                                }else
+                                        $('.fileinput-button.new').removeClass('new');
+                                
+                                
+                                $('.attachments-list').find('.button.close').button({
+                                        icons: {
+                                                primary: "ui-icon-close"
+                                        },
+                                        text: false
+                                }).click(function(){
+                                        var idAttach = $(this).parent().find('input[name="fileId[]"]').val();
+                                        $('.attachment-list').find('input[value="'+idAttach+'"]')
+                                        $(this).parent().remove();
+                                });     
+                                
+                })},
+                progress: function(e, data){
+                        var value = parseInt(data.loaded / data.total * 100, 10);
+                        $('.progress.in-progress:first').removeClass('hidden')
+                        $('.progress.in-progress:first').progressbar({
+                                value: value
+                        });
+                        
+                        if(value == 100){
+                                $('.progress.in-progress:first').removeClass('in-progress').addClass('on-complete').fadeOut('slow');
+                        }
+                                
+                },
+                done: function(e, data){
+                        if(!!data.result && data.result != "[]"){
+                                var newAttach = jQuery.parseJSON(data.result);
+                                $('.attachment-list').append('<input tyepe="hidden" name="attachment[]" value="'+newAttach['attachment'][0][0].id+'"/>');
+                                $('.progress.on-complete:first').removeClass('on-complete').parents('p')
+                                .append('<input type="hidden" name="fileId[]" value="'+newAttach['attachment'][0][0].id+'"/>')
+                                .find('.status-upload').addClass('ui-icon ui-icon-check');
+                        }else
+                                $('.progress.on-complete:first').removeClass('on-complete').parents('p').find('.status-upload').addClass('ui-icon ui-icon-cancel');
+                                
+                        console.log("oi doen");
+                }
+        });
+                $('.attachments-list .button').button();
+                
+                
+                
+        $('#fileupload').bind('fileuploadstart', function () {
+                var widget = $(this),
+        progressElement = $('#fileupload-progress').fadeIn(),
+        interval = 500,
+        total = 0,
+        loaded = 0,
+        loadedBefore = 0,
+        progressTimer,
+        progressHandler = function (e, data) {
+            loaded = data.loaded;
+            total = data.total;
+        },
+        stopHandler = function () {
+            widget
+                .unbind('fileuploadprogressall', progressHandler)
+                .unbind('fileuploadstop', stopHandler);
+            window.clearInterval(progressTimer);
+            progressElement.fadeOut(function () {
+                progressElement.html('');
+            });
+        },
+        formatTime = function (seconds) {
+            var date = new Date(seconds * 1000);
+            return ('0' + date.getUTCHours()).slice(-2) + ':' +
+                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
+                ('0' + date.getUTCSeconds()).slice(-2);
+        },
+        formatBytes = function (bytes) {
+            if (bytes >= 1000000000) {
+                return (bytes / 1000000000).toFixed(2) + ' GB';
+            }
+            if (bytes >= 1000000) {
+                return (bytes / 1000000).toFixed(2) + ' MB';
+            }
+            if (bytes >= 1000) {
+                return (bytes / 1000).toFixed(2) + ' KB';
+            }
+            return bytes + ' B';
+        },
+        formatPercentage = function (floatValue) {
+            return (floatValue * 100).toFixed(2) + ' %';
+        },
+        updateProgressElement = function (loaded, total, bps) {
+            progressElement.html(
+                formatBytes(bps) + 'ps | ' +
+                    formatTime((total - loaded) / bps) + ' | ' +
+                    formatPercentage(loaded / total) + ' | ' +
+                    formatBytes(loaded) + ' / ' + formatBytes(total)
+            );
+        },
+        intervalHandler = function () {
+            var diff = loaded - loadedBefore;
+            if (!diff) {
+                return;
+            }
+            loadedBefore = loaded;
+            updateProgressElement(
+                loaded,
+                total,
+                diff * (1000 / interval)
+            );
+        };
+                widget
+                        .bind('fileuploadprogressall', progressHandler)
+                        .bind('fileuploadstop', stopHandler);
+                progressTimer = window.setInterval(intervalHandler, interval);
+        });
+                
+        UI.dialogs.addEvent.find(':input').change(function(event){
+                if (event.keyCode != '27' && event.keyCode != '13')
+                        canDiscardEventDialog = false;
+        }).keydown(function(event){
+                if (event.keyCode != '27' && event.keyCode != '13')
+                        canDiscardEventDialog = false;
+        });     
+                
                 
                 UI.dialogs.addEvent.dialog('open');

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

@@ -17 +17 @@
                         <input type="hidden" name="isDefaultAlarm[]" value="<%=data.alarm.useAlarmDefault ? 1 : 0%>" />
                         <label> antes de cada evento.</label>
-                        <a class="button remove small"></a>
+                        <a class="button remove tiny"></a>
                 </li>
         <%}
@@ -36 +36 @@
                 <input type="hidden" name="alarmId[]" value="" />
                 <label> antes de cada evento.</label>
-                <a class="button remove small"></a>
+                <a class="button remove tiny"></a>
         </li>
 <%}%>

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

@@ +1 @@
+        <%var iconStatus = ['','ui-icon-check', 'ui-icon-radio-off', 'ui-icon-close', 'ui-icon-help', 'ui-icon-transferthick-e-w', 'ui-icon-contact']
+          var legendStatus = ['','Confirmado','Tentativa','Cancelado','Sem Resposta','Delegado', 'Participante']
+        %>
         <dl class="block-attendee-list attendees-list">
                 <dt class="me"><%= data.event.me.name %></dt>
                 <dd class="me">
                         <select class="status" name="status">
-                                <option value="1" <%= data.event.status=='1' ? 'selected="selected"':'' %>>Eu vou</option>
-                                <option value="3" <%= data.event.status=='3' ? 'selected="selected"':'' %>>Eu não vou</option>
-                                <option value="2" <%= data.event.status=='2' ? 'selected="selected"':'' %>>Talvez</option>
-<!--                            <option value="another">Outra pessoa vai</option>-->
+                                <%if(!data.event.delegatedFrom[data.event.me.id]){%>
+                                        <option value="1" <%= data.event.status=='1' ? 'selected="selected"':'' %>>Eu vou</option>
+                                        <%if(!data.event.acl.participationRequired){%>
+                                                <option value="3" <%= data.event.status=='3' ? 'selected="selected"':'' %>>Eu não vou</option>
+                                                <option value="2" <%= data.event.status=='2' ? 'selected="selected"':'' %>>Talvez</option>
+                                                <option class="hidden" value="5">Delegado</option>
+                                        <%}%>
+                                <%}else{%>
+                                        <option value="5" 'selected="selected"'>Delegado</option>
+                                <%}%>
                         </select>
-                        <%if(data.event.organizer.id != data.event.me.id){%>
-                            <input type="hidden" name="meId" value="<%=data.event.me.id%>">
-                        <%}%>
-                        <fieldset class="add-attendee-search search-field ui-corner-all hidden">
-                                <span class="ui-icon ui-icon-search"></span>
-                                <input class="search" type="text" />
-                        </fieldset>
+                        <% if (!data.event.acl.organization && !data.event.acl.write && !data.event.acl.inviteGuests && !data.event.acl.participationRequired && !data.event.delegatedFrom[data.event.me.id] ) { %>
+                                <fieldset class="add-attendee-options-read">
+                                        <a href="#" class="button participant-delegate add-attendee-options-button">Delegar participação a um novo participante</a>
+                                </fieldset>
+                        <% } %>
+                        
+                        <p class="input-group request-update <%=data.event.delegatedFrom[data.event.me.id] ? '' : "hidden"%>">
+                                <input type="checkbox" name="receiveNotification" value="true" <%=data.event.me.receiveNotification=='1' ? 'checked="checked"' : ''%>/>
+                                <label for="request-update">Receber atualizações</label>
+                        </p>
+                        
+                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.me.delegatedFrom%>">
+                
+                        <input type="hidden" name="attendee[]" value="<%=data.event.me.id%>">
+                        <input type="hidden" name="attendeeType[]" value="0">
+                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.me.acl%>">                               
+                        
                 </dd>
 
@@ -20 +39 @@
                 <dd class="attendee-list">
                         <ul class="attendee-list">
-                                <li class="organizer <%= data.event.organizer.id == data.event.me.id ? "hidden" : ''%>"> 
+                                <li class="organizer <%= (data.event.acl.organization) ? "hidden" : "" %>"> 
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.organizer.id %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.organizer.id%>">
-                                                <input type="hidden" name="attendeeType[]" value="0">
-                                                <input type="hidden" name="attendee_organizer[]" value="<%=data.event.organizer.id%>">
-                                                <label for="attendee_organizer" title="<%= data.event.organizer.name ? data.event.organizer.name: '' %>" class="name"><%= data.event.organizer.name ? data.event.organizer.name : '' %></label>
-                                                <label for="attendee_organizer" title="<%= data.event.organizer.mail ? data.event.organizer.mail: '' %>" class="mail"><%= data.event.organizer.mail ? data.event.organizer.mail : '' %></label>
-                                                <% if (data.event.me.id == data.event.organizer.id && false) { %>
-                                                <span class="button small swap">Mudar organizador</span>
-                                                <% } %>
+                                                <span class="space-status ui-icon <%=iconStatus[data.event.organizer.status]%>" title="<%=legendStatus[data.event.organizer.status]%>"></span>
+                                                <span class="space-special ui-icon ui-icon-person" title="Organizador"></span>
+                                                <% if (!data.event.acl.organization && (data.event.organizer.id != data.event.me.id )) { %>
+                                                        <input type="checkbox" value="<%= data.event.organizer.id %>" disabled="disabled">
+                                                        <input type="hidden" name="attendee[]" value="<%=data.event.organizer.id%>">
+                                                        <input type="hidden" name="attendeeType[]" value="0">
+                                                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.organizer.acl%>">
+                                                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.organizer.delegatedFrom%>">
+                                                <%}%>
+                                                <input type="hidden" name="attendee_organizer" value="<%=data.event.organizer.id%>">
+                                                <label for="attendee_organizer" title="<%= data.event.organizer.name ? data.event.organizer.name: '' %>" class="name name-special"><%= data.event.organizer.name ? data.event.organizer.name : '' %></label>
+                                                <label for="attendee_organizer" title="<%= data.event.organizer.mail ? data.event.organizer.mail: '' %>" class="mail name-special"><%= data.event.organizer.mail ? data.event.organizer.mail : '' %></label>
                                         </div>
-                                </li>           
-                                
-                        <% if (data.event && data.event.attendee) {
-                                for (var i=0; i< data.event.attendee.length; i++) {
-                        %>
-                                <li class="attendee"> 
+                                </li>
+                        <%if(!!data.event.delegatedFrom[data.event.me.id]){
+                                var delegated_me = data.event.delegatedFrom[data.event.me.id]%>
+                                <li class="me-delegated">
                                         <div style="overflow:hidden; width:100%; display:table;">
-                                                <input type="checkbox" value="<%= data.event.attendee[i].id %>" disabled="disabled">
-                                                <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].id%>">
-                                                <input type="hidden" name="attendeeType[]" value="<%=data.event.attendee[i].isExternal%>">
-                                                <label title="<%= data.event.attendee[i].name ? data.event.attendee[i].name: '' %>" class="name"><%= data.event.attendee[i].name ? data.event.attendee[i].name : '' %></label>
-                                                <label title="<%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %>" class="mail"><%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %></label>
-                                                <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
-                                        </div> 
-                                        <a class="button close">X</a>
+                                                <span class="space-status ui-icon <%=iconStatus[delegated_me.status]%>" title="<%=legendStatus[delegated_me.status]%>"></span>
+                                                <span class="space-special ui-icon <%=iconStatus[5]%>" title="Delegado para"></span>
+                                                <input type="checkbox" value="<%= delegated_me.id%>" disabled="disabled">
+                                                <label for="me-delegated" title="<%= delegated_me.name ? delegated_me.name: '' %>" class="name name-special"><%= delegated_me.name ? delegated_me.name : '' %></label>
+                                                <label for="me-delegated" title="<%= delegated_me.mail ? delegated_me.mail: '' %>" class="mail name-special"><%= delegated_me.mail ? delegated_me.mail : '' %></label>
+                                        </div>
                                 </li>
-                                
-                                
-                                
-                        <%      
-                                } 
-                        } else { %>
-                                <li>Não há outros participantes.</li>
+                        <%}%>
+                        <% if (data.event && data.event.attendee.length > 0) {
+                                for (var i=0; i< data.event.attendee.length; i++) {%>
+                                        <li class="attendee"> 
+                                                <div style="overflow:hidden; width:100%; display:table;">
+                                                        <%if(data.event.delegatedFrom[data.event.attendee[i].id]){%>
+                                                                <span class="open-delegate new ui-icon ui-icon-triangle-1-e"></span>
+                                                        <%}else{%>
+                                                                <span class="space-status ui-icon <%=iconStatus[data.event.attendee[i].status]%>" title="<%=legendStatus[data.event.attendee[i].status]%>"></span>
+                                                        <%}%>
+                                                        <span class="space-special ui-icon <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? iconStatus[5] : iconStatus[6]%>" title="<%=!!data.event.delegatedFrom[data.event.attendee[i].id] ? legendStatus[5] : legendStatus[6]%>"></span>
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <input type="checkbox" value="<%= data.event.attendee[i].id %>">
+                                                        <%}else{%>
+                                                                <input type="checkbox" value="<%= data.event.attendee[i].id%>" disabled="disabled">
+                                                        <%}%>
+                                                        <input type="hidden" name="attendee[]" value="<%=data.event.attendee[i].id%>">
+                                                        <input type="hidden" name="attendeeType[]" value="<%=data.event.attendee[i].isExternal%>">
+                                                        <input type="hidden" name="attendeeAcl[]" value="<%=data.event.attendee[i].acl%>">
+                                                        <input type="hidden" name="delegatedFrom[]" value="<%=data.event.attendee[i].delegatedFrom%>">
+                                                        <label title="<%= data.event.attendee[i].name ? data.event.attendee[i].name: '' %>" class="name <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? "name-special-delegated" : "name-special" %>"><%= data.event.attendee[i].name ? data.event.attendee[i].name : '' %></label>
+                                                        <label title="<%= data.event.attendee[i].mail ? data.event.attendee[i].mail : ''%>" class="mail <%= !!data.event.delegatedFrom[data.event.attendee[i].id] ? "name-special-delegated" : "name-special"%>"><%= data.event.attendee[i].mail ? data.event.attendee[i].mail : '' %></label>
+                                                        <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
+                                                </div> 
+                                                <div class="attendee-options">
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <a class="button edit attendee-options-button-edit new">Editar permissões</a>
+                                                                <a class="button close new">Remover</a>
+                                                        <%}%>
+                                                </div>
+
+
+                                                <%if(!!data.event.delegatedFrom[data.event.attendee[i].id]){%>
+                                                        <%var attendee = data.event.delegatedFrom[data.event.attendee[i].id]%>
+                                                        <% while(attendee != 0){%>
+                                                                <div class="list-delegates hidden">
+                                                                        <div style="overflow:hidden; width:100%; display:table;">
+                                                                                <span class="status-delegate ui-icon <%=iconStatus[attendee.status]%>" title="<%=legendStatus[attendee.status]%>"></span>
+                                                                                <span class="space-special-delegated ui-icon <%= !!data.event.delegatedFrom[attendee.id] ? iconStatus[5] : iconStatus[6]%>" title="<%=!!data.event.delegatedFrom[attendee.id] ? legendStatus[5] : legendStatus[6]%>"></span>
+                                                                                <input type="hidden" name="attendee[]" value="<%=attendee.id%>">
+                                                                                <input type="hidden" name="attendeeType[]" value="<%=attendee.isExternal%>">
+                                                                                <input type="hidden" name="attendeeAcl[]" value="<%=attendee.acl%>">
+                                                                                <input type="hidden" name="delegatedFrom[]" value="<%=attendee.delegatedFrom%>">
+                                                                                <label title="<%= attendee.name ? attendee.name : '' %>" class="name <%=attendee.status == 5 ? "name-status-delegated-delegated" : "name-status-delegated-none"%>"><%= attendee.name ? attendee.name : '' %></label>
+                                                                                <label title="<%= attendee.mail ? attendee.mail : '' %>" class="mail <%=attendee.status == 5 ? "name-status-delegated-none" : "name-status-delegated-none"%>"><%= attendee.mail ? attendee.mail : '' %></label>
+                                                                                <span class="ui-icon ui-icon-close ui-corner-all ui-icon-float-right"></span>
+                                                                        </div> 
+                                                                </div>
+                                                                <%attendee = !!data.event.delegatedFrom[attendee.id] ? data.event.delegatedFrom[attendee.id] : 0%>
+                                                        <%}%>
+                                                <%}%>
+                                                
+
+                                        </li>   
+                                <%} 
+                        } else if(data.event.me.id == data.event.organizer.id && !(data.event.attendee.length > 0) ) { %>
+                                <li class="not-attendee">Não há outros participantes.</li>
                         <% } %>
                         </ul>
@@ -86 +154 @@
                 
         </dl>
-<% if (data.event.isOrganizer == 1) { %>
-        <dl class="block-add-attendee">
-                <dt class="add-attendee">Adicionar convidados</dt>
-                <dd class="add-attendee">
-                        <fieldset class="block-add-attendee" title="Participantes">
-                                <fieldset class="add-attendee-search search-field ui-corner-all">
-                                        <span class="ui-icon ui-icon-search"></span>
-                                        <input class="search" type="text" />
-                                </fieldset>
-                                <ul class="search-result-list ui-corner-all">
+<% var isSearch = (data.event.acl.organization || data.event.acl.write || data.event.acl.inviteGuests) ? '' : 'hidden' %>
+<dl class="block-add-attendee search <%=isSearch%>">
+        <dt class="add-attendee search">Adicionar outros convidados</dt>
+        <dd class="add-attendee">
+                <fieldset class="block-add-attendee" title="Participantes">
+                        <fieldset class="add-attendee-search search-field ui-corner-all">
+                                <span class="ui-icon ui-icon-search"></span>
+                                <input class="search" type="text" />
+                        </fieldset>
+                        <ul class="search-result-list ui-corner-all">
 
-                                </ul>
+                        </ul>
 
-                        </fieldset>
+                </fieldset>
+        </dd>
+</dl>
 
-                        <fieldset class="block-add-attendee-permissions ui-corner-all hidden">
-                                <legend>Convidados podem:</legend>
-                                <ul class="add-attendee-permissions-list">
-                                        <li><input type="checkbox" name="attendee-mod-event"><label for="attendee-mod-event">Modificar evento </label></li>
-                                        <li><input type="checkbox" name="attendee-invite-others"><label for="attendee-invite-others">Convidar outros</label></li>
-                                        <li><input type="checkbox" name="attendee-view-list-invited"><label for="attendee-view-list-invited">Ver lista de convidados</label></li>
-                                        <li><input type="checkbox" name="attendee-optional"><label for="attendee-optional">Participação opcional</label></li>
-                                </ul>
-                        </fieldset>
-                </dd>
-        </dl>
-<% } %>

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

@@ -1 @@
-<!--<div title="Criar Evento" class="new-event-win active"> -->
-    <form method="POST" action="<%=((data.event.isOrganizer == 0) && (data.event.id)) ? "schedulable:preview" : "schedulable:detail"%>" class="form-addevent content">
+<div title="Criar Evento" class="div-addevent content">
+    <form method="POST" action="<%=(data.event.acl.organization || data.event.acl.write) ?  "schedulable:detail" : "schedulable:preview"%>" class="form-addevent content">
 
         <fieldset id="calendar_addevent_details1">
                 <legend class="hidden">Detalhes do evento</legend>
                 <p class="input-group">
-                        <input type="text" class="h1" name="summary" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> value="<%= (data.event.summary) ? data.event.summary : '' %>"/>
+                        <input type="text" class="h1" name="summary" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> value="<%= (data.event.summary) ? data.event.summary : '' %>"/>
                         <% if( data.event.id ){ %>
                                 <input type="hidden" class="id-event" name="idEvent" value="<%= data.event.id %>"/>
@@ -11 +11 @@
                 </p>
                 <p class="input-group date-info">
-                        <input type="text" class="date start-date" value="<%= (data.event.startDate) ? data.event.startDate : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="startDate" />
-                        <input type="text" class="time start-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.startHour) ? data.event.startHour : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="startHour" /> 
+                        <input type="text" class="date start-date" value="<%= (data.event.startDate) ? data.event.startDate : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startDate" />
+                        <input type="text" class="time start-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.startHour) ? data.event.startHour : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="startHour" /> 
                         <span>até</span>
-                        <input type="text" class="date end-date" value="<%= (data.event.endDate) ? data.event.endDate : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="endDate" />
-                        <input type="text" class="time end-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.endHour) ? data.event.endHour : '' %>" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> name="endHour" />
-
-                        <a href="#" class="calendar_addevent_details_lnk_timezone">Fuso horário</a>
+                        <input type="text" class="date end-date" value="<%= (data.event.endDate) ? data.event.endDate : '' %>" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endDate" />
+                        <input type="text" class="time end-time<%= (data.event.allDay) ? ' hidden' : '' %>" value="<%= (data.event.endHour) ? data.event.endHour : '' %>" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> name="endHour" />
+
+                        <a href="#" class="calendar_addevent_details_lnk_timezone <%=((!data.event.acl.organization || !data.event.acl.write) && (data.event.id)) ? "hidden" : '' %>">Fuso horário</a>
 <!--                    <input type="text" name="timezone" style="display: none;" />-->
                         <select name="timezone" class="hidden calendar-addevent-details-txt-timezone">
@@ -25 +25 @@
                                 <% } %>
                         </select>
-                </p>
-                
+                        
+                        <a class="button suggestion-hours small <%=(data.event.acl.organization || data.event.acl.write) ? "hidden" : '' %>" href="#">Sugerir horário</a>
+                        
+                </p>
+                                
                 <div class="ui-widget messages-validation hidden">
                         <div style="padding: 0.2em 0.7em;" class="ui-state-error ui-corner-all"> 
@@ -37 +40 @@
                 
                 <p class="input-group event-type">
-                        <input type="checkbox" name="allDay" value="true" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> <%= (data.event.allDay) ? 'checked="checked"' : '' %>/>
+                        <input type="checkbox" name="allDay" value="true" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> <%= (data.event.allDay) ? 'checked="checked"' : '' %>/>
                         <label for="allDay">Dia inteiro</label>
 <!--
@@ -48 +51 @@
 <!--            <li><a href="#calendar_addevent_details3">Repetir</a></li>-->
                 <li><a href="#calendar_addevent_details4">Lembretes</a></li>
-<!--            <li><a href="#calendar_addevent_details4" style="color:#BBB;">Anexos</a></li>-->
+                <li><a href="#calendar_addevent_details5">Anexos</a></li>
                 <li><a href="#calendar_addevent_details6">Participantes</a></li>
         </ul>
@@ -55 +58 @@
                 <p class="input-group event-info">
                         <label for="calendar_addevent_details_txt_local">Onde</label>
-                        <input type="text" name="location" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> value="<%= (data.event) ? data.event.location : '' %>"/>
+                        <input type="text" name="location" <%=(data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> value="<%= (data.event) ? data.event.location : '' %>"/>
                 </p>
 
                 <p class="input-group">
                         <label for="calendar_addevent_details_txtarea_description" class="for-textarea" >Descrição</label>
-                        <textarea name="description" <%= (data.event.isOrganizer == 0) ? 'disabled="disabled"' : '' %> ><%=(data.event) ? data.event.description : '' %></textarea>
+                        <textarea name="description" <%= (data.event.acl.organization || data.event.acl.write) ? '' : 'disabled="disabled"' %> ><%=(data.event) ? data.event.description : '' %></textarea>
                 </p>
 
@@ -144 +147 @@
         <fieldset id="calendar_addevent_details6" class="tab-level2" title="Participantes">
         </fieldset>
+        
+        
+        <fieldset class="attachment-list hidden">
+        </fieldset>
     </form>
-    <form action="../../../../upload.php" method="POST">        
-<!--
+    
+
         <fieldset id="calendar_addevent_details5" class="tab-level2">
-                <span class="input_label">Anexos</span> 
-                  <ul class="attachments-list">
-                        <% if (data.event && data.event.attachments) {
-                                for (var i=0; i< data.event.attachments.length; i++) {
-                        %>
-                                <li>
-                                        <a href="<%= data.event.attachments[i].src %>" >
-                                                <input type="checkbox" name="attachments['<%= data.event.attachments[i].name %>']" checked="checked" />
-                                                <label for="calendar_addevent_details_attach_<%=i%>"><%= data.event.attachments[i].name %></label>
-                                        </a>
-                                </li>
-                        <%      }
-                           }
-                        %>
-
-                  </ul>
-                <span class="button add button-add-attachment">Adicionar anexo</span>
-        
-                <div id="fileupload">
-                        <div title="form:upload.php">
-                                <div class="fileupload-buttonbar">
-                                        <label class="fileinput-button">
-                                                <span>Add files...</span>
-                                                <input type="file" name="files[]" multiple>
-                                        </label>
-                                        <button type="submit" class="start">Start upload</button>
-                                        <button type="reset"  class="cancel">Cancel upload</button>
-                                        <button type="button" class="delete">Delete files</button>
-                                </div>
-                        </div>
-                        <div class="fileupload-content">
-                                <table class="files"></table>
-                                <div class="fileupload-progressbar"></div>
-                        </div>
-                </div>
+                <form id="fileupload" action="attachment:detail" method="POST">
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
+        <div class="row fileupload-buttonbar">
+            <div class="button-files-upload">
+                <!-- The fileinput-button span is used to style the file input field as button -->
+                <span class="button btn-success fileinput-button">
+                    <span><i class="icon-plus icon-white"></i> Adicionar</span>
+                    <input type="file" name="files[]" multiple>
+                </span>
+                                <%if(data.event.acl.organization || data.event.acl.write){%>
+                                        <button type="button" class="button btn-danger delete">
+                                                <i class="icon-trash icon-white"></i> Remover Todos
+                                        </button>
+                                <%}%>
+            </div>
+                        <div id="fileupload-progress"></div>
+            <div class="files-list">
+               <ul class="attachments-list">
+                           <%if(data.event && data.event.attachments){
+                                        for (var i=0; i< data.event.attachments.length; i++) {
+                                        %>
+                                                <p class="input-group arquive-info">
+                                                        <label class="lbl-archive-nome">Nome:</label>
+                                                        <span class="archive-nome"><%=data.event.attachments[i].name%></span>
+                                                        
+                                                        <label class="lbl-archive-size">Tamanho:</label>
+                                                        <span class="archive-size"><%=data.event.attachments[i].size%> kb</span>
+                                                        <a href="../prototype/getArchive.php?attachment=<%=data.event.attachments[i].id%>" class="button tiny upload downlaod-archive">Download</a>
+                                                        <%if(data.event.acl.organization || data.event.acl.write){%>
+                                                                <span class="button close tiny upload delete-upload" title="Deletar">Deletar</span>
+                                                        <%}%>
+                                                        <input type="hidden" name="fileId[]" value="<%=data.event.attachments[i].id%>"/>
+                                                </p>
+                                        <%}
+                                }%>
+                           
+                           
+                           </ul>
+            </div>
+        </div>
+        <br>
+        
+    </form>
+
+        </fieldset>
 
         </fieldset>
@@ -194 +211 @@
     <div class="menu-container footer-container menu-addevent">
             <% if (data.event.id) { %>
-                <a class="button export" href="#">Exportar</a>
-            <a class="button delete" href="#">Excluir</a>
+                        <a class="button export" href="#">Exportar</a>
+                        <a class="button delete" href="#">Excluir</a>
             <% } %>
                 <a class="button cancel" href="#">Cancelar</a>
             <a class="button save" href="#">Salvar</a>
     </div>
-<!--</div>-->
+</div>
 <!--<script src="application.js"></script>-->
+<!--<script src="application.js"></script>-->

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

@@ -40 +40 @@
 <script type='text/javascript' src='<?= PLUGINSURL ?>/store/jquery.store.js'></script>
 <script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload.js'></script>
-<script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload-ui.js'></script>
+<!--<script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.fileupload-ui.js'></script>-->
 <script type='text/javascript' src='<?= PLUGINSURL ?>/fileupload/jquery.iframe-transport.js'></script>
 <script type='text/javascript' src='<?= PLUGINSURL ?>/store/jquery.store.js'></script>

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

@@ -1 +1 @@
 <li class="attendee"> 
         <div style="overflow:hidden; width:100%; display:table;">
-                <input type="checkbox" value="<%= data[0].id %>" disabled="disabled">
+                <div class="attendee-options">
+                        <%if(data[0].acl.organization || data[0].acl.write || data[0].acl.inviteGuests){%>
+                                <a href="#" class="button delegate attendee-options-button-delegate new">Delegar participação a este participante</a>
+                        <%}%>
+                        <%if(data[0].acl.organization || data[0].acl.write){%>
+                                <a class="button edit attendee-options-button-edit new">Editar permissões</a>
+                        <%}%>
+                        <a class="button close new">Close</a>
+                </div>
+                
+                <input class="new" type="checkbox" value="<%= data[0].id %>">
                 <input type="hidden" name="attendee[]" value="<%= data[0].id %>">
                 <input type="hidden" name="attendeeType[]" value="<%=data[0].isExternal%>">
+                <input type="hidden" name="attendeeAcl[]" value="r">
+                <input type="hidden" name="delegatedFrom[]" value="0">
                 <label title="<%= data[0].name ? data[0].name : '' %>" class="name"><%= data[0].name ? data[0].name : '' %></label>
-                <label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail"><%= data[0].mail ? data[0].mail : '' %></label>
-        </div> 
-        <a class="button close">Close</a>
+                <label title="<%= data[0].mail ? data[0].mail : '' %>" class="mail <%= data[0].name ? 'hidden' : ''%>"><%= data[0].mail ? data[0].mail : '' %></label>
+
+        </div>
+        
 </li>