Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js (revision 6958) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js (revision 6959) @@ -18,5 +18,6 @@ var endDate = new Date; var dueDate = new Date; - var percentage = 0; + var percentage = 0; + var statusTasks = {1: 0, 2: 0, 3: 0, 4: 0}; var allDay = true; @@ -42,4 +43,8 @@ blkAuto.find('input[name="percentage"]').val(percentage); + + todoStatus('addActivity', 1); + + UI.dialogs.addActivity.find('select[name="activityStatus"] option[value="'+1+'"]').attr('selected','selected'); blkAuto.find('input[name="allDay"]').attr('checked', false); @@ -52,6 +57,7 @@ if(i == 'length') continue; - - var statusActivity = tasks[i].status ; + + statusTasks[tasks[i].status]++; + stTime = Date.parseExact( tasks[i].startDate + " "+$.trim( tasks[i].startHour) , formatString); enTime = Date.parseExact( tasks[i].endDate + " "+$.trim( tasks[i].endHour), formatString ); @@ -68,6 +74,18 @@ percentage += parseInt((100 / tasks.length)) * ( parseInt(tasks[i].percentage) / 100); } - - todoStatus('addActivity', (statusActivity != undefined) ? statusActivity : 1); + var statusActivity = 1; + + if(statusTasks[4] != 0) + statusActivity = 4; + else if(statusTasks[2] != 0) + statusActivity = 2; + else if(statusTasks[3] == tasks.length) + statusActivity = 3; + else if(statusTasks[1] == tasks.length) + statusActivity = 1; + else + statusActivity = 2; + + todoStatus('addActivity', statusActivity); UI.dialogs.addActivity.find('select[name="activityStatus"] option[value="'+statusActivity+'"]').attr('selected','selected'); @@ -230,5 +248,5 @@ modal:true, autoOpen: false, - width:734, + width:735, position: 'center', close: function(event, ui) { Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js (revision 6951) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js (revision 6959) @@ -450,5 +450,5 @@ modal:true, autoOpen: false, - width:700, + width:701, position: 'center', close: function(event, ui) { Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js (revision 6954) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js (revision 6959) @@ -256,5 +256,5 @@ modal: true, autoOpen: false, - width: 774, + width: 775, position: 'center', close: function (event, ui) { @@ -359,5 +359,5 @@ /*Seleciona a agenda padrão para visualização edição de um task*/ - if (objTask.id) UI.dialogs.addTask.find('option[value="' + objTask.group + '"]').attr('selected', 'selected').trigger('change'); + if (objTask.id) UI.dialogs.addTask.find('select[name="group"] option[value="' + objTask.group + '"]').attr('selected', 'selected').trigger('change'); UI.dialogs.addTask.find(':input').change(function(event){ Index: /sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs =================================================================== --- /sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs (revision 6958) +++ /sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs (revision 6959) @@ -50,5 +50,5 @@