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

Timestamp:

08/07/12 12:06:34 (12 years ago)

Author:

douglasz

Message:

Ticket #2966 - Adicionado as validacoes na tela de atividades.

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/js/task.helpers.js (modified) (4 diffs)

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

@@ -86 +86 @@
     return false;
 }
-function taskStatus(status){
+
+function todoStatus(view, status){
         if (status == "1"){
-                UI.dialogs.addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('noAction');
+                UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('noAction');
         }else if (status == "2"){
-                UI.dialogs.addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('inProcess');
+                UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('inProcess');
         }else if (status == "3"){
-                UI.dialogs.addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('finished');
+                UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('finished');
         }else if (status == "4"){
-                UI.dialogs.addTask.find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('canceled');
+                UI.dialogs[view].find('.subitem .span_done').removeClass('finished noAction inProcess canceled').addClass('canceled');
         }
 }
@@ -374 +375 @@
     });
         
-        if (objTask.taskStatus == "1" || objTask.taskStatus == undefined){
-                taskStatus(1);
-        }else if (objTask.taskStatus == "2"){
-                taskStatus(2);
-        }else if (objTask.taskStatus == "3"){
-                taskStatus(3);
-        }else if (objTask.taskStatus == "4"){
-                taskStatus(4);
-        }
+        todoStatus('addTask', (objTask.taskStatus  != undefined) ? objTask.taskStatus  : 1);
         
-        //Concluão das Tarefas
+        //Conclusão das Tarefas
         var conclusionTask = function(e){
                 var percentageTask = UI.dialogs.addTask.find('input[name="percentage"]');
@@ -396 +389 @@
                 if(percentageValue <= 0){
                         statusTask.find('option.taskStatus-noAction').attr('selected', 'selected');
-                        taskStatus(1);          
+                        todoStatus('addTask', 1);               
                 }else if(percentageValue == 100){
                         statusTask.find('option.taskStatus-finished').attr('selected', 'selected');
-                        taskStatus(3);
+                        todoStatus('addTask', 3);
                 }else{
                         statusTask.find('option.taskStatus-inProcess').attr('selected', 'selected');
-                        taskStatus(2);
+                        todoStatus('addTask', 2);
                 }               
                 setTimeout(function(){
@@ -415 +408 @@
                 var statusSelected = $('select[name=taskStatus] option:selected').val();
                 var percentageTask = UI.dialogs.addTask.find('input[name="percentage"]');
+                
                 if (statusSelected == "1"){
                         percentageTask.val(0);
-                        taskStatus(1);
                 }else if(statusSelected == "2"){
                         percentageTask.val(percentageTask.val() != 0 ? (percentageTask.val() == 100 ? 99: percentageTask.val()) : 1);
-                        taskStatus(2);
                 }else if(statusSelected == "3"){
                         percentageTask.val(100);
-                        taskStatus(3);
                 }else if(statusSelected == "4"){
                         percentageTask.val(percentageTask.val() != 100 ? percentageTask.val() : 99);
-                        taskStatus(4);
                 }
+                todoStatus('addTask', statusSelected);
         });