Changeset 7012

Timestamp:

08/14/12 18:08:46 (12 years ago)

Author:

acoutinho

Message:

Ticket #3022 - Inconsistencia no percentual de conclusao de atividade

File:

• trunk/prototype/modules/calendar/js/activity.helpers.js (modified) (1 diff)

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

@@ -463 +463 @@
     for (var i in tasks){
 
-        if(i == 'length')
-            continue;
-
-        statusTasks[tasks[i].status]++;
-
-        var stTime = Date.parseExact( tasks[i].startDate + " "+$.trim( tasks[i].startHour) , formatString);
-        var enTime = Date.parseExact( tasks[i].endDate + " "+$.trim( tasks[i].endHour), formatString );
-
-        startDate = (startDate && startDate.compareTo(stTime) == -1) ? startDate : stTime;
-        endDate = endDate.compareTo(enTime) == -1 ? enTime : endDate;
-
-        if(tasks[i].dueDate != ''){
-            var pvTime = Date.parseExact( tasks[i].dueDate + " "+$.trim( tasks[i].dueTime), formatString );
-            dueDate = dueDate.compareTo(pvTime) == -1 ? pvTime : dueDate;
-        }
-
-        if(parseInt(tasks[i].percentage) > 0)
-            percentage += parseInt(parseInt((100 / tasks.length)) * ( parseInt(tasks[i].percentage) / 100));
-    }
+        if(i == 'length')
+            continue;
+
+        statusTasks[tasks[i].status]++;
+
+        var stTime = Date.parseExact( tasks[i].startDate + " "+$.trim( tasks[i].startHour) , formatString);
+        var enTime = Date.parseExact( tasks[i].endDate + " "+$.trim( tasks[i].endHour), formatString );
+
+        startDate = (startDate && startDate.compareTo(stTime) == -1) ? startDate : stTime;
+        endDate = endDate.compareTo(enTime) == -1 ? enTime : endDate;
+
+        if(tasks[i].dueDate != ''){
+            var pvTime = Date.parseExact( tasks[i].dueDate + " "+$.trim( tasks[i].dueTime), formatString );
+            dueDate = dueDate.compareTo(pvTime) == -1 ? pvTime : dueDate;
+        }
+
+        percentage += parseInt(tasks[i].percentage);
+    }
+
+
+    if((percentage > 0) && (tasks.length > 0))
+        percentage = parseInt(percentage / tasks.length);
+    
     var statusActivity = 1;