Changeset 7068 for trunk/prototype/modules/calendar/js/task.helpers.js

Timestamp:

08/20/12 11:15:00 (12 years ago)

Author:

acoutinho

Message:

Ticket #3054 - Inconsistencia ao importar alguma tarefa individual

File:

• trunk/prototype/modules/calendar/js/task.helpers.js (modified) (2 diffs)

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

@@ -3 +3 @@
         var errors = {
                 'emptyInitData': 'Por favor, informe uma data inicial',
-                'emptyEndData': 'Por favor, informe uma data final',
                 'emptyInitHour': 'Por favor, informe uma hora inicial',
-                'emptyEndHour': 'Por favor, informe uma hora final',
                 
                 'invalidInitData' : 'Data inicial inválida',
-                'invalidEndData' : 'Data final inválida',
-                
+
                 'equalData' : 'Hora inicial igual a final',
                 'theirData' : 'Data final menor que a inicial',         
@@ -22 +19 @@
 
     var start_date = $(".new-task-win.active .start-date").val();
-    var end_date   = $(".new-task-win.active .end-date").val();
     var start_time = $(".new-task-win.active .start-time").val();
-    var end_time   = $(".new-task-win.active .end-time").val();
         var due_date   = $(".new-task-win.active .date-prevision").val();
         var due_time   =  $.trim($(".new-task-win.active .time-prevision").val());
-    var isAllDay   = $('.new-task-win.active input[name="allDay"]').is(':checked');
-    var customDate = $(".endRepeat").val() == "customDate";
-    var occurrences = $(".endRepeat").val() == "occurrences";
-    var taskInterval = $('.taskInterval').val();
-    
+
     if(start_date == "")
                 return errors['emptyInitData'];
-    else if(end_date == "")
-                return errors['emptyEndData'];
-    else if(!isAllDay && start_time == "")
-                return errors['emptyInitHour'];
-    else if(!isAllDay && end_time == "")
-                return errors['emptyEndHour'];
         else if(due_date != "" && due_time == "")
                 return errors['dueTime'];
         else if(due_date == "" && due_time != "")
                 return errors['dueDate'];
-        
+
     var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat;
-                
     var startDate = Date.parseExact( start_date + " " + $.trim(start_time) , formatString );
-    var endDate = Date.parseExact( end_date + " " + $.trim(end_time) , formatString );
-        var dueDate = Date.parseExact( due_date + " " + $.trim(due_time) , formatString );
 
     if(startDate == null || startDate.getTime() < 0 )
                 return errors['invalidInitData'];
-    if(endDate == null || endDate.getTime() < 0)
-                return errors['invalidEndData'];
-        if(dueDate == null &&  due_time != "")
-                return errors['invalidDueData'];
-                
-        if(isAllDay){
-                startDate.clearTime();
-                endDate.clearTime();
-                if(endDate.compareTo(startDate) == -1)
-                        return errors['theirData'];
-        }else{
-                var condition = endDate.compareTo(startDate);
-                if(condition != 1){
-                        if(condition < 0){
-                                startDate.clearTime();
-                                endDate.clearTime();
-                                condition = endDate.compareTo(startDate);                               
-                                return (errors[ condition == 0 ? 'theirHour' : 'theirData'] );
-                        }
-                        else
-                                return errors['equalData'];
-                }
-                
-                if (dueDate != null && dueDate.compareTo(startDate) == -1)
-                        return errors['dueInitDate'];           
-        }
-    
-    if (customDate)    
-                if ( !($('.new-task-win.active .customDateEnd').val().length) )
-                   return errors['emptyEndData'];
+
+    if(due_date != '' && due_time != '')
+    {
+        var dueDate = Date.parseExact( due_date + " " + $.trim(due_time) , formatString );
+
+        if(dueDate.compareTo(startDate) == -1)
+            return errors['dueInitDate'];
+    }
 
     return false;