Changeset 5510 for trunk/prototype/modules/calendar/js/calendar.date.js

Timestamp:

02/14/12 09:21:16 (12 years ago)

Author:

fernando

Message:

Ticket #2434 - Calendário diario e semanal exibido a partir da hora inicial padrão

Location:

trunk

Files:

• . (modified) (1 prop)
• prototype/modules/calendar/js (modified) (1 prop)
• prototype/modules/calendar/js/calendar.date.js (modified) (1 diff)

trunk

@@ -1 +1 @@
 nbproject
-
 header.inc.php
+._header.inc.php

@@ -1 +1 @@
 nbproject
-
 header.inc.php
+._header.inc.php

trunk/prototype/modules/calendar/js/calendar.date.js

@@ -102 +102 @@
                         Hour += (Hour.length == 5) ? " pm" : "";
                 }else
-                        Hour = "0"+(HourAmPm[0]-12)+":"+HourAmPm[1]+ ((Hour.length == 5) ? " pm" : "");
+                        Hour = (((HourAmPm[0]-12)>=10) ? "" : "0") +(HourAmPm[0]-12)+":"+HourAmPm[1]+ ((Hour.length == 5) ? " pm" : "");
                 return Hour;
+        },
+        
+        AmPmTo24 : function (Hour)
+        {
+                var Hour24h = Hour.trim();
+                var AmPm;
+                if (Hour24h.length == 0) return;
+                if (Hour24h.length > 5) {
+                  AmPm = Hour24h.slice(-2);
+                  Hour24h = Hour24h.substring(0,5);
+                }
+                
+                var Hour24h = Hour24h.split(":");
+                
+                if (Hour24h[0] == 12)
+                  Hour24h[0] = "00";
+
+                if (AmPm === "pm") {
+                  Hour24h[0] = parseInt(Hour24h[0]) + 12;
+                } 
+                
+                return Hour24h[0] + ":" + Hour24h[1];
+        },
+        
+    // 01:00 retorna 1, 10:00 retorna 10, 22:00 retorna 10
+    getShortestTime : function(Hour) {
+                var _hour = this.defaultToAmPm(Hour);
+                if (_hour[0] == 0)
+                  _hour = _hour[1];
+                else
+                  _hour = _hour.substring(0,2);
+                
+                return _hour;
         },
         

@@ -1 +1 @@
 nbproject
-
 header.inc.php
+._header.inc.php