Changeset 6959 for sandbox/2.4.2-expresso1

Timestamp:

08/08/12 15:03:59 (12 years ago)

Author:

douglasz

Message:

Ticket #2966 - Correcoes de interface e validacoes das atividades.

Location:

sandbox/2.4.2-expresso1/prototype/modules/calendar

Files:

• js/activity.helpers.js (modified) (5 diffs)
• js/helpers.js (modified) (1 diff)
• js/task.helpers.js (modified) (2 diffs)
• templates/activity_add.ejs (modified) (1 diff)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/activity.helpers.js

@@ -18 +18 @@
         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 +43 @@
                         
             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 +57 @@
             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 +74 @@
                 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 +248 @@
                 modal:true, 
                 autoOpen: false,
-                width:734, 
+                width:735, 
                 position: 'center', 
                 close: function(event, ui) {

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/helpers.js

@@ -450 +450 @@
         modal:true, 
         autoOpen: false,
-        width:700, 
+        width:701, 
         position: 'center', 
         close: function(event, ui) {

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js

@@ -256 +256 @@
             modal: true,
             autoOpen: false,
-            width: 774,
+            width: 775,
             position: 'center',
             close: function (event, ui) {
@@ -359 +359 @@
 
     /*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){

sandbox/2.4.2-expresso1/prototype/modules/calendar/templates/activity_add.ejs

@@ -50 +50 @@
                 </p>
                 <div class="subitem">
-                % Conclusão: <input type="number" name="percentage" class="done" readonly="readonly" value="<%= data.activity.percentage %>"> 
+                % Conclusão: <input type="text" name="percentage" class="done" readonly="readonly" value="<%= data.activity.percentage %>"> 
                 <span style="margin:0 0 0 5px;">Status:<span> 
                 <select name="activityStatus" >