Fixed date & time formatting.

Author: Olivier Giulieri

js/dico.js

@@ -285,7 +285,9 @@ Evol.Dico = {
                 }
                 break;
             case fTypes.date:
+                return Evol.UI.formatDate(v);
             case fTypes.time:
+                return Evol.UI.formatTime(v);
             case fTypes.datetime:
                 return Evol.UI.formatDateTime(v);
             case fTypes.pix:

js/ui.js

@@ -44,8 +44,8 @@ Evol.UI = {
     // --- input fields ---
     input: {
 
-        text: function (fID, fV, fd, css, size) {
-            var fCss= 'evo-field form-control ' + (css || '') + Evol.UI.getSizeCSS(size),
+        text: function (fID, fV, fd, css) {
+            var fCss= 'evo-field form-control ' + (css || ''),
                 h = ['<input type="text" id="',fID,'" value="', fV];
             if(fV.indexOf('"')>-1){
                 fV=fV.replace(/"/g,'\"');
@@ -268,40 +268,34 @@ Evol.UI = {
     },
 
     // --- date formats ---
-    formatDate: function(d){ // TODO use date not string as param
-        return d;
-        //return d.toLocaleDateString();
-        //return (d.getMonth()+1) + "/" + d.getDate() + "/" + d.getFullYear();
+    formatDate: function(d){
+        var dateParts=d.split('-');
+        if(dateParts.length>1){
+            return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+        }
     },
-    formatTime: function(d){ // TODO use date not string as param
-        return d;
-        //return d.toLocaleTimeString();
-        //return (d.getHours()) + ":" + (d.getMinutes());
+    formatTime: function(d){
+        if(!_.isUndefined(d) && d!==''){
+            var timeParts=d.split(':');
+            var hour=parseInt(timeParts[0],10);
+            if(hour>12){
+                return (hour-12)+':'+timeParts[1]+' PM';
+            }else{
+                return hour+':'+timeParts[1]+' AM';
+            }
+        }
+        return '';
     },
-    formatDateTime: function(d){ // TODO use date not string as param
+    formatDateTime: function(d){
         if(!_.isUndefined(d) && d!==''){
-            var dateParts= d.split('-');
+            var dateParts=d.split('T');
             if(dateParts.length>1){
-                return dateParts[1]+'/'+dateParts[2]+'/'+dateParts[0];
+                return this.formatDate(dateParts[0])+', '+this.formatTime(dateParts[1]);
+            }else{
+                return this.formatDate(dateParts[0]);
             }
         }
         return '';
-        /*
-        //var myDate = new Date(v);
-        //if(_.isDate(myDate)){
-            var dv='';
-            //return myDate.toLocaleDateString("en-US");
-            if(f.type!=fTypes.time){
-                dv+=this.formatDate(myDate);
-                if(f.type==fTypes.datetime){
-                    dv+=' ';
-                }
-            }
-            if(f.type!=fTypes.date){
-                dv+=this.formatTime(myDate);
-            }
-            return dv;
-        //}*/
     },
 
     // ---  Misc. ---