Changeset 7075 for trunk/prototype/modules/calendar/js/activity.helpers.js

Timestamp:

08/21/12 09:17:44 (12 years ago)

Author:

marcieli

Message:

Ticket #3058 - Exibir mais detalhes da tarefa na atividade vinculada.

File:

• trunk/prototype/modules/calendar/js/activity.helpers.js (modified) (5 diffs)

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

@@ -300 +300 @@
                 blkAddTask.find('dd.task-activity-list ul.task-activity-list')
                     .append(DataLayer.render(path+'templates/task_add_itemlist.ejs', [{
-                        idTask: old_item.find('[name="id"]').val(),
-                            description: old_item.find('.description').html(),
-                            isWrite: false
+                                idTask: old_item.find('[name="id"]').val(),
+                                description: old_item.find('.description').html(),
+                                isWrite: false,
+                                summary: old_item.find('[name="taskSummary"]').val(),
+                                dueDate: old_item.find('[name="taskDueDate"]').val(),
+                                dueTime: old_item.find('[name="taskDueTime"]').val(),
+                                startDate: old_item.find('[name="taskStartDate"]').val(),
+                                startHour: old_item.find('[name="taskStartHour"]').val(),
+                                percentage: old_item.find('[name="taskPercentage"]').val(),
+                                priority: old_item.find('[name="taskPriority"]').val()
                         }]))
                         .scrollTo('max');
@@ -327 +334 @@
                     description: tasks[i].description,
                     idTaskToActivity: tasks[i].taskToActivity,
-                    isWrite: true
+                                        isWrite: true,
+                                        summary: tasks[i].summary,
+                                        dueDate: tasks[i].dueDate,
+                                        dueTime: tasks[i].dueTime,
+                                        startDate: tasks[i].startDate,
+                                        startHour: tasks[i].startHour,
+                                        percentage: tasks[i].percentage,
+                                        priority: tasks[i].priority
                  }]))
             .scrollTo('max');
@@ -411 +425 @@
                     description: tasks[i].description,
                     idTaskToActivity: tasks[i].taskToActivity,
-                    isWrite: true
+                                        isWrite: true,
+                                        summary: tasks[i].summary,
+                                        dueDate: tasks[i].dueDate,
+                                        dueTime: tasks[i].dueTime,
+                                        startDate: tasks[i].startDate,
+                                        startHour: tasks[i].startHour,
+                                        percentage: tasks[i].percentage,
+                                        priority: tasks[i].priority
                  }]))
             .scrollTo('max');
@@ -559 +580 @@
             var positionY = $(this).parents("li").offset().top;
              
-            var name = $(this).parents('li').find("div").find(".name").text();
+            var summary = $(this).parents('li').find("div").find(".summary").val();
+                        var startDate = $(this).parents('li').find("div").find(".startDate").val();
+            var startHour = $(this).parents('li').find("div").find(".startHour").val();
+                        var dueDate = $(this).parents('li').find("div").find(".dueDate").val();
+                        var dueTime = $(this).parents('li').find("div").find(".dueTime").val();
+                        var percentage = $(this).parents('li').find("div").find(".percentage").val();
+                        var priority = $(this).parents('li').find("div").find(".priority").val();
             var email = $(this).parents('li').find("div").find(".mail").text()
                         
@@ -574 +601 @@
                     content: {
                         text: $('<div></div>').html( DataLayer.render( path + 'templates/activity_information_task.ejs', {
-                            'name' : name
+                            'summary' : summary,
+                                                        'startDate' : startDate,
+                                                        'startHour' : startHour,
+                                                        'dueDate' : dueDate,
+                                                        'dueTime' : dueTime,
+                                                        'percentage' : percentage,
+                                                        'priority' : priority
                         } ) ),
                         title: {