Changeset 7075
- Timestamp:
- 08/21/12 09:17:44 (12 years ago)
- Location:
- trunk/prototype/modules/calendar
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/calendar/js/activity.helpers.js
r7012 r7075 300 300 blkAddTask.find('dd.task-activity-list ul.task-activity-list') 301 301 .append(DataLayer.render(path+'templates/task_add_itemlist.ejs', [{ 302 idTask: old_item.find('[name="id"]').val(), 303 description: old_item.find('.description').html(), 304 isWrite: false 302 idTask: old_item.find('[name="id"]').val(), 303 description: old_item.find('.description').html(), 304 isWrite: false, 305 summary: old_item.find('[name="taskSummary"]').val(), 306 dueDate: old_item.find('[name="taskDueDate"]').val(), 307 dueTime: old_item.find('[name="taskDueTime"]').val(), 308 startDate: old_item.find('[name="taskStartDate"]').val(), 309 startHour: old_item.find('[name="taskStartHour"]').val(), 310 percentage: old_item.find('[name="taskPercentage"]').val(), 311 priority: old_item.find('[name="taskPriority"]').val() 305 312 }])) 306 313 .scrollTo('max'); … … 327 334 description: tasks[i].description, 328 335 idTaskToActivity: tasks[i].taskToActivity, 329 isWrite: true 336 isWrite: true, 337 summary: tasks[i].summary, 338 dueDate: tasks[i].dueDate, 339 dueTime: tasks[i].dueTime, 340 startDate: tasks[i].startDate, 341 startHour: tasks[i].startHour, 342 percentage: tasks[i].percentage, 343 priority: tasks[i].priority 330 344 }])) 331 345 .scrollTo('max'); … … 411 425 description: tasks[i].description, 412 426 idTaskToActivity: tasks[i].taskToActivity, 413 isWrite: true 427 isWrite: true, 428 summary: tasks[i].summary, 429 dueDate: tasks[i].dueDate, 430 dueTime: tasks[i].dueTime, 431 startDate: tasks[i].startDate, 432 startHour: tasks[i].startHour, 433 percentage: tasks[i].percentage, 434 priority: tasks[i].priority 414 435 }])) 415 436 .scrollTo('max'); … … 559 580 var positionY = $(this).parents("li").offset().top; 560 581 561 var name = $(this).parents('li').find("div").find(".name").text(); 582 var summary = $(this).parents('li').find("div").find(".summary").val(); 583 var startDate = $(this).parents('li').find("div").find(".startDate").val(); 584 var startHour = $(this).parents('li').find("div").find(".startHour").val(); 585 var dueDate = $(this).parents('li').find("div").find(".dueDate").val(); 586 var dueTime = $(this).parents('li').find("div").find(".dueTime").val(); 587 var percentage = $(this).parents('li').find("div").find(".percentage").val(); 588 var priority = $(this).parents('li').find("div").find(".priority").val(); 562 589 var email = $(this).parents('li').find("div").find(".mail").text() 563 590 … … 574 601 content: { 575 602 text: $('<div></div>').html( DataLayer.render( path + 'templates/activity_information_task.ejs', { 576 'name' : name 603 'summary' : summary, 604 'startDate' : startDate, 605 'startHour' : startHour, 606 'dueDate' : dueDate, 607 'dueTime' : dueTime, 608 'percentage' : percentage, 609 'priority' : priority 577 610 } ) ), 578 611 title: { -
trunk/prototype/modules/calendar/js/calendar.codecs.js
r7068 r7075 85 85 borderColor: '#' + signature.borderColor || User.preferences.borderColor, 86 86 textColor: '#' + signature.fontColor || User.preferences.fontColor, 87 87 className: [], 88 88 editable: signature.isOwner 89 89 } … … 607 607 endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(objEvent.endTime)), objEvent.timezone, objEvent.calendar, objEvent.DayLigth, 'endTime'), User.preferences.hourFormat), 608 608 allDay: !!parseInt( objEvent.allDay ), 609 dueDate: objEvent.dueDate, 610 dueTime: objEvent.dueTime, 611 priority: objEvent.priority, 609 612 attachments: $.map(objEvent.attachments || [], function( attachment, i ){ 610 613 var attach = DataLayer.get('schedulableToAttachment', attachment, false); … … 879 882 }), 880 883 organizer: participantInfo.organizer || me, 881 isOrganizer: (participantInfo.organizer || me).id == me.id,884 isOrganizer: (participantInfo.organizer || me).id == me.id, 882 885 alarms: !!participantInfo.user ? participantInfo.user.alarms : [], 883 886 status: !!participantInfo.user ? participantInfo.user.status : 1, … … 1005 1008 return { 1006 1009 id: objEvent.id, 1010 summary: objEvent.summary, 1007 1011 description: !!objEvent.summary ? objEvent.summary : objEvent.description, 1008 1012 startDate: new Date( parseInt(objEvent.startTime) ).setTimezoneOffset( Timezone.timezone( objEvent.timezone ) ).toString( User.preferences.dateFormat ), … … 1014 1018 allDay: !!parseInt( objEvent.allDay ), 1015 1019 percentage: (objEvent.percentage) ? objEvent.percentage : '0', 1016 status: objEvent.status 1020 status: objEvent.status, 1021 priority: objEvent.priority 1017 1022 } 1018 1023 }); … … 1137 1142 endDate: new Date( parseInt(task.endTime) - (!!parseInt(task.allDay) ? 86400000 : 0) ).setTimezoneOffset( Timezone.timezone( task.timezone ) ).toString( User.preferences.dateFormat ), 1138 1143 endHour: dateCalendar.formatDate(Timezone.getDateEvent(new Date(parseInt(task.endTime)), task.timezone, obj.calendar, obj.DayLigth, 'endTime'), User.preferences.hourFormat), 1139 status: task.status, 1140 percentage: task.percentage 1144 status: task.status, 1145 percentage: task.percentage, 1146 priority: task.priority, 1147 summary: task.summary 1141 1148 } 1142 1149 … … 1339 1346 type: 1, 1340 1347 category: form.category, 1348 priority: form.priority, 1341 1349 summary: form.summary == '' ? 'Evento sem título' : form.summary, 1342 1350 description: form.description, -
trunk/prototype/modules/calendar/templates/activity_information_task.ejs
r6996 r7075 1 <% if(data){ %> 2 Nome: <%= data.name %><br> 1 <% if(data){ 2 var priority = {1: 'Alta', 2: 'Normal', 3: 'Baixa'};%> 3 Título: <%= data.summary %><br> 4 Início: <%= data.startDate %> <%= data.startHour %><br> 5 Prev. Fim: <%= data.dueDate %> <%= data.dueTime %><br> 6 % Conclusão: <%= data.percentage %><br> 7 Prioridade: <%= priority[data.priority] %><br> 3 8 <% } %> -
trunk/prototype/modules/calendar/templates/task_add_itemlist.ejs
r6996 r7075 9 9 </div> 10 10 <input class="new" type="checkbox" value="<%= data[0].idTask %>"> 11 11 <input type="hidden" name="idtask[]" value="<%= data[0].idTask %>"> 12 12 <input type="hidden" name="idTaskToActivity[]" value="<%= data[0].idTaskToActivity %>"> 13 13 <label title="<%= data[0].description %>" class="name"><%= data[0].description %></label> 14 <input type="hidden" class="summary" value="<%= data[0].summary %>"> 15 <input type="hidden" class="dueDate" value="<%= data[0].dueDate %>"> 16 <input type="hidden" class="dueTime" value="<%= data[0].dueTime %>"> 17 <input type="hidden" class="startDate" value="<%= data[0].startDate %>"> 18 <input type="hidden" class="startHour" value="<%= data[0].startHour %>"> 19 <input type="hidden" class="percentage" value="<%= data[0].percentage %>"> 20 <input type="hidden" class="priority" value="<%= data[0].priority %>"> 14 21 </li> -
trunk/prototype/modules/calendar/templates/task_search_itemlist.ejs
r6996 r7075 12 12 <input type="hidden" name="taskStatus" value="<%=data[i]['status']%>" /> 13 13 <input type="hidden" name="taskPercentage" value="<%=data[i]['percentage']%>" /> 14 <input type="hidden" name="taskPriority" value="<%=data[i]['priority']%>" /> 15 <input type="hidden" name="taskSummary" value="<%=data[i]['summary']%>" /> 14 16 <label class="description"><%=data[i]['startDate']%> - <%=data[i]['description']%></label> 15 17 </li>
Note: See TracChangeset
for help on using the changeset viewer.