Changeset 7391 for branches/2.4/prototype
- Timestamp:
- 10/09/12 17:56:00 (12 years ago)
- Location:
- branches/2.4/prototype/modules/calendar
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/prototype/modules/calendar/alarms.php
r6754 r7391 12 12 $target = (gmdate('U') - 300 ).'000'; 13 13 14 $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" '.14 $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" '. 15 15 'FROM calendar_participant, calendar_alarm as "al", calendar_object as "co", calendar_repeat as "rep" WHERE ('. 16 16 "al.participant_id = calendar_participant.id AND ". … … 60 60 'participants' => '<UL> <LI> '.implode( '<LI></LI> ', $attList ).'</LI> </UL>'); 61 61 62 Controller::create( array( 'service' => 'SMTP' ), array( 'body' => parseTPL::load_tpl( $data, ROOTPATH.'/modules/calendar/templates/ notify_alarm_body.tpl'),62 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')), 63 63 'isHtml' => true, 64 64 'subject' => 'Alarme de Calendario', -
branches/2.4/prototype/modules/calendar/js/calendar.codecs.js
r7362 r7391 133 133 return returns; 134 134 }; 135 console.log(evtObj); 135 136 136 var res = $.map(evtObj, function( objEvent ){ 137 137 return { … … 676 676 alarms: !!participantInfo.user ? participantInfo.user.alarms : [], 677 677 status: !!participantInfo.user ? participantInfo.user.status : 1, 678 acl: constantAcl( me.acl || 'roiw'),678 acl: constantAcl((me.acl && me.acl != '') ? me.acl : ((!objEvent.id || objEvent.id == '') ? 'row' : 'r')), 679 679 isShared: isShared, 680 680 isAttendee: (isAttendee ? true : (objEvent.id && isShared ? false : true)), … … 764 764 id: attendee, 765 765 isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ), 766 isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0 766 isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0, 767 delegatedFrom: (form.delegatedFrom[i] != '0' && form.delegatedFrom[i] != '') ? form.delegatedFrom[i] : '0' 767 768 }; 768 769 }; … … 868 869 isExternal: attend.isExternal, 869 870 acl: attend.acl, 870 delegatedFrom: attend.delegatedFrom 871 delegatedFrom: attend.delegatedFrom, 872 isOrganizer: attend.isOrganizer 871 873 }; 872 874 873 875 if(!!parseInt(attend.delegatedFrom)){ 874 876 delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person); 875 return(null); 877 if( !!parseInt(attend.isOrganizer)){ 878 participantInfo.organizer = DataLayer.copy(person); 879 } 880 881 return null; 876 882 } 877 883 878 884 if( !!parseInt(attend.isOrganizer)){ 879 885 participantInfo.organizer = DataLayer.copy(person); 880 return (null);886 return null; 881 887 }; 882 888 -
branches/2.4/prototype/modules/calendar/js/task.helpers.js
r7362 r7391 845 845 }); 846 846 847 blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function ( task) {847 blkAddAtendee.find('.add-attendee-search .ui-icon-search').click(function (evt) { 848 848 blkAddAtendee.find('.add-attendee-search input').keydown(); 849 849 }); 850 850 851 blkAddAtendee.find('.add-attendee-search input').keydown(function ( task) {852 853 if (task.keyCode == '13' || typeof (task.keyCode) == 'undefined') {851 blkAddAtendee.find('.add-attendee-search input').keydown(function (evt) { 852 853 if (evt.keyCode == '13' || typeof (evt.keyCode) == 'undefined') { 854 854 var result = DataLayer.get('user', ["*", "name", $(this).val()], true); 855 855 … … 867 867 blkAddAtendee.find('ul.search-result-list').append(DataLayer.render(path + 'templates/participants_search_itemlist.ejs', result)); 868 868 869 blkAddAtendee.find('ul.search-result-list li').click(function ( task, ui) {870 if ($( task.target).is('input')) {871 old_item = $( task.target).parents('li');869 blkAddAtendee.find('ul.search-result-list li').click(function (event, ui) { 870 if ($(event.target).is('input')) { 871 old_item = $(event.target).parents('li'); 872 872 newAttendeeId = DataLayer.put('participant', { 873 873 user: old_item.find('.id').html(), … … 925 925 }); 926 926 927 ev ent.preventDefault();927 evt.preventDefault(); 928 928 } 929 929 }); -
branches/2.4/prototype/modules/calendar/templates/attendee_add.ejs
r7382 r7391 43 43 <%}%> 44 44 45 <li class="organizer <%= (data.event.acl.organization ) ? "hidden" : "" %>">45 <li class="organizer <%= (data.event.acl.organization || (data.event.delegatedFrom[data.event.me.id] && data.event.delegatedFrom[data.event.me.id].isOrganizer == '1')) ? "hidden" : "" %>"> 46 46 <div style="overflow:hidden; width:100%; display:table;"> 47 47 <span class="space-status ui-icon <%=iconStatus[data.event.organizer.status]%>" title="<%=legendStatus[data.event.organizer.status]%>"></span> -
branches/2.4/prototype/modules/calendar/templates/attendees_task.ejs
r7362 r7391 15 15 <%}%> 16 16 </select> 17 <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id] ) { %>17 <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id] && !data.task.isOrganizer) { %> 18 18 <fieldset class="add-attendee-options-read"> 19 19 <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> 36 36 37 <li class="organizer <%= data.task.isOrganizer? "hidden" : "" %>">37 <li class="organizer <%= (data.task.isOrganizer || (data.task.delegatedFrom[data.task.me.id] && data.task.delegatedFrom[data.task.me.id].isOrganizer == '1')) ? "hidden" : "" %>"> 38 38 <div style="overflow:hidden; width:100%; display:table;"> 39 39 <span class="space-status ui-icon <%=iconStatus[data.task.organizer.status]%>" title="<%=legendStatus[data.task.organizer.status]%>"></span> -
branches/2.4/prototype/modules/calendar/templates/notify_create_delegated_body_task.tpl
r7360 r7391 1 <br />Você foi convidado por [delegatedFrom] para participar em seu lugar n starefa agendada para [startDate].<br /><br />1 <br />Você foi convidado por [delegatedFrom] para participar em seu lugar na tarefa agendada para [startDate].<br /><br /> 2 2 <strong>[eventTitle]</strong><br /> 3 3 <strong>Início:</strong> [startDate] [startTime]<br />
Note: See TracChangeset
for help on using the changeset viewer.