Changeset 8040

Timestamp:

03/19/13 16:16:18 (11 years ago)

Author:

thiago

Message:

Ticket #3383 - Correcao de problemas com PM e AM, e outras funcoes.

File:

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

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

@@ -1006 +1006 @@
 dateSameValue();
 
+var fixHour = function(){
+    currentTimeStart = UI.dialogs.addEvent.find("input.start-time").val();
+    UI.dialogs.addEvent.find("input.start-time").val(currentTimeStart.replace(".","").replace(".",""));
+}   
 
 var setTime = function( selectedDateTime ) {
@@ -1015 +1019 @@
 
     if( Date.parse(selectedDateTime) < Date.parse(oldTime) ) return true;
-
+    
     var time = selectedDateTime.split(":");
 
@@ -1031 +1035 @@
     var minutes = dt.getMinutes().toString();
     var hours = dt.getHours();
-
+UI.dialogs.addEvent.find("input.start-time").val(selectedDateTime.replace(".","").replace(".",""));
+    
+    
     if (time[1].indexOf("p.m.") != -1 ) {
         var startHours = startHours == 12 ? 12 : startHours;
@@ -1048 +1054 @@
         var startHours = startHours == 12 ? 00 : startHours;
     }
-    dtFormat = (time[1].indexOf("p.m.") != -1 || time[1].indexOf("a.m.") != -1) ? ((((User.preferences.defaultDuration / 60) + startHours) >= 12 && (startHours + 4) < 24) ? " pm" : " am") : "";
+
+
+    dtFormat = (time[1].indexOf("p.m.") != -1 || time[1].indexOf("a.m.") != -1) ? ((((User.preferences.defaultDuration / 60) + startHours) >= 12 && (startHours + (User.preferences.defaultDuration / 60)) < 24) ? " pm" : " am") : "";
        
     var newHours = "";
@@ -1089 +1097 @@
         timeFormat: "hh:mm tt",
         onSelect: function( selectedDateTime ){
+
+            if ( selectedDateTime.indexOf("p.m.") == -1 || !selectedDateTime.indexOf("a.m.") == -1 ) {
+                
+                var selectedTime = selectedDateTime.split(":");
+                var endTime = UI.dialogs.addEvent.find(".end-time").val();
+                endTime = endTime.split(":");
+
+                var t1 = new Date(false,false,false,selectedTime[0],selectedTime[1],false);
+                var t2 = new Date(false,false,false,endTime[0],endTime[1],false);
+
+                if (t1 < t2) return true;
+            }
+
             setTime( selectedDateTime );
-        }   
+        },
+        onClose : function (selectedDateTime){
+            fixHour();
+        }
+
     });
 
 }
 
-UI.dialogs.addEvent.find('input.time').timepicker({ 
+UI.dialogs.addEvent.find('input.end-time').timepicker({ 
     closeText: 'Ok',
     hourGrid: 4,
@@ -1107 +1132 @@
                 $(this).val(selectedDateTime.replace(/[\.]/gi, ""));                                                            
                 updateMap();
+
+        if ( selectedDateTime.indexOf("p.m.") == -1 || !selectedDateTime.indexOf("a.m.") == -1 ) {
+            var startT = UI.dialogs.addEvent.find('input.start-time');
+
+            var lessZeroTime = function( sTime ) {
+                sTime = sTime.split(":");
+                sTime = new Date(false,false,false,sTime[0],sTime[1],false);
+                sTimeReady = parseInt(sTime.getHours() - (User.preferences.defaultDuration / 60));
+
+                if( sTimeReady < 0 )
+                    return false; // If the value is less than 0, return false.
+                    
+                return sTimeReady.toString().length == 1 ? "0"+sTimeReady+":00" : sTimeReady+":00";
+            }
+
+            var hEnd = new Date(false,false,false,selectedDateTime.split(":")[0],selectedDateTime.split(":")[1],false);
+            var hStart = new Date(false,false,false,startT.val().split(":")[0],startT.val().split(":")[1],false);
+            
+            if ( hEnd <= hStart ){
+                var lessTime = lessZeroTime( selectedDateTime );
+                if ( !lessTime ){
+                    startT.val( "00:00" );
+                    return true;
+                }
+                startT.val( lessTime );
+            }
+        }
     },
     onClose : function (selectedDateTime){
         if(!(User.preferences.hourFormat.length == 5))
             $(this).val(selectedDateTime.replace(/[\.]/gi, ""));
+    fixHour();
     },
+
     beforeShow: function (selectedDateTime) {
                 if ((selectedDateTime.value == '__:__') || (selectedDateTime.value == '__:__ __'))