Changeset 7388 for trunk

Timestamp:

10/09/12 17:19:23 (12 years ago)

Author:

acoutinho

Message:

Ticket #3152 - Inconsistencias na delegacao em tarefas, e erros de tela

Location:

trunk/prototype/modules/calendar

Files:

• alarms.php (modified) (2 diffs)
• js/calendar.codecs.js (modified) (5 diffs)
• js/task.helpers.js (modified) (3 diffs)
• templates/attendee_add.ejs (modified) (1 diff)
• templates/attendees_task.ejs (modified) (2 diffs)
• templates/notify_alarm_body_task.tpl (added)
• templates/notify_create_delegated_body_task.tpl (modified) (1 diff)

trunk/prototype/modules/calendar/alarms.php

@@ -12 +12 @@
 $target = (gmdate('U') - 300 ).'000';
 
-$parts = Controller::service('PostgreSQL')->execSql('SELECT DISTINCT calendar_participant.user_info_id as "user", co.id as "schedulable", co.allDay as "allDay" ,co.dtend as "endTime", co.dtstart as "startTime", co.summary as "summary", co.tzid as "timezone", co.location as "location", al.id as "id" '.
+$parts = Controller::service('PostgreSQL')->execSql('SELECT DISTINCT calendar_participant.user_info_id as "user", co.id as "schedulable", co.type_id as "type", co.allDay as "allDay" ,co.dtend as "endTime", co.dtstart as "startTime", co.summary as "summary", co.tzid as "timezone", co.location as "location", al.id as "id" '.
                             'FROM calendar_participant, calendar_alarm as "al", calendar_object as "co", calendar_repeat as "rep" WHERE ('.
                             "al.participant_id = calendar_participant.id AND ".
@@ -60 +60 @@
                       'participants' =>  '<UL> <LI> '.implode( '<LI></LI> ', $attList ).'</LI> </UL>');
 
-        Controller::create( array( 'service' => 'SMTP' ), array( 'body' => parseTPL::load_tpl( $data, ROOTPATH.'/modules/calendar/templates/notify_alarm_body.tpl' ),
+        Controller::create( array( 'service' => 'SMTP' ), array( 'body' => parseTPL::load_tpl( $data, ROOTPATH.'/modules/calendar/templates/'. ($parts['type'] == '1' ? 'notify_alarm_body.tpl' : 'notify_alarm_body_task.tpl')),
                                                                   'isHtml' => true,
                                                                   'subject' => 'Alarme de Calendario',

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

@@ -128 +128 @@
         var constantAcl = function(acl){
             var returns = {};
+
             for (var i in constantsCalendarShared){
                 returns[constantsCalendarShared[i]] = acl.indexOf(i) >= 0 ? true : false
@@ -133 +134 @@
             return returns;
         };
-    console.log(evtObj);
+
         var res = $.map(evtObj, function( objEvent ){                   
             return {
@@ -676 +677 @@
                 alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
                 status: !!participantInfo.user ? participantInfo.user.status : 1,
-                acl: constantAcl(me.acl || 'roiw'),
+                acl: constantAcl((me.acl && me.acl != '') ? me.acl : ((!objEvent.id || objEvent.id == '') ? 'row' : 'r')),
                 isShared: isShared,
                 isAttendee: (isAttendee ? true : (objEvent.id && isShared ? false : true)),
@@ -764 +765 @@
                     id: attendee,
                     isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
-                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
+                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                    delegatedFrom: (form.delegatedFrom[i] != '0' && form.delegatedFrom[i] != '') ? form.delegatedFrom[i] : '0'
                     };
             };
@@ -868 +870 @@
                 isExternal: attend.isExternal,
                 acl: attend.acl,
-                delegatedFrom: attend.delegatedFrom
+                delegatedFrom: attend.delegatedFrom,
+                isOrganizer: attend.isOrganizer
             };
 
             if(!!parseInt(attend.delegatedFrom)){
                 delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person);
-                return(null);
+
+                if( !!parseInt(attend.isOrganizer)){
+                    participantInfo.organizer = DataLayer.copy(person);
+                }
+
+                return null;
             }
 
             if( !!parseInt(attend.isOrganizer)){
                 participantInfo.organizer = DataLayer.copy(person);
-                return(null);
+                return null;
             };                  
 

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

@@ -845 +845 @@
     });
 
-    blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function (task) {
+    blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function (evt) {
         blkAddAtendee.find('.add-attendee-search input').keydown();
     });
 
-    blkAddAtendee.find('.add-attendee-search input').keydown(function (task) {
-
-        if (task.keyCode == '13' || typeof (task.keyCode) == 'undefined') {
+    blkAddAtendee.find('.add-attendee-search input').keydown(function (evt) {
+
+        if (evt.keyCode == '13' || typeof (evt.keyCode) == 'undefined') {
             var result = DataLayer.get('user', ["*", "name", $(this).val()], true);
 
@@ -867 +867 @@
             blkAddAtendee.find('ul.search-result-list').append(DataLayer.render(path + 'templates/participants_search_itemlist.ejs', result));
 
-            blkAddAtendee.find('ul.search-result-list li').click(function (task, ui) {
-                if ($(task.target).is('input')) {
-                    old_item = $(task.target).parents('li');
+            blkAddAtendee.find('ul.search-result-list li').click(function (event, ui) {
+                if ($(event.target).is('input')) {
+                    old_item = $(event.target).parents('li');
                     newAttendeeId = DataLayer.put('participant', {
                         user: old_item.find('.id').html(),
@@ -925 +925 @@
             });
 
-            event.preventDefault();
+            evt.preventDefault();
         }
     });

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

@@ -43 +43 @@
                             <%}%>
                             
-                                <li class="organizer <%= (data.event.acl.organization) ? "hidden" : "" %>"> 
+                                <li class="organizer <%= (data.event.acl.organization || (data.event.delegatedFrom[data.event.me.id] && data.event.delegatedFrom[data.event.me.id].isOrganizer == '1')) ? "hidden" : "" %>">
                                         <div style="overflow:hidden; width:100%; display:table;">
                                                 <span class="space-status ui-icon <%=iconStatus[data.event.organizer.status]%>" title="<%=legendStatus[data.event.organizer.status]%>"></span>

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

@@ -15 +15 @@
                 <%}%>
             </select>
-            <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id]) { %>
+            <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id] && !data.task.isOrganizer) { %>
                     <fieldset class="add-attendee-options-read">
                             <a href="#" class="button participant-delegate add-attendee-options-button">Delegar participação a um novo participante</a>
@@ -35 +35 @@
                 <label for="attendee" title="<%=  data.task.me.user ? data.task.me.user.mail : data.task.me.mail %>" class="mail hidden"></label>
                 
-                <li class="organizer <%= data.task.isOrganizer ? "hidden" : "" %>"> 
+                <li class="organizer <%= (data.task.isOrganizer || (data.task.delegatedFrom[data.task.me.id] && data.task.delegatedFrom[data.task.me.id].isOrganizer == '1')) ? "hidden" : "" %>">
                     <div style="overflow:hidden; width:100%; display:table;">
                         <span class="space-status ui-icon <%=iconStatus[data.task.organizer.status]%>" title="<%=legendStatus[data.task.organizer.status]%>"></span>

trunk/prototype/modules/calendar/templates/notify_create_delegated_body_task.tpl

@@ -1 @@
-<br />Você foi convidado por [delegatedFrom] para participar em seu lugar ns tarefa agendada para [startDate].<br /><br />
+<br />Você foi convidado por [delegatedFrom] para participar em seu lugar na tarefa agendada para [startDate].<br /><br />
 <strong>[eventTitle]</strong><br />
 <strong>Início:</strong> [startDate] [startTime]<br />