Pman.Tab.XtupleReports.bjs

Pman.Tab.XtupleReports.js

diff --git a/Pman.Tab.XtupleReports.bjs b/Pman.Tab.XtupleReports.bjs
index 4c95fef..f6f0baf 100644 (file)
--- a/Pman.Tab.XtupleReports.bjs
+++ b/Pman.Tab.XtupleReports.bjs
@@ -237,13 +237,13 @@
                                             "*prop": "colModel[]"
                                         },
                                         {
-                                            "xtype": "ColumnModel",
+                                            "*prop": "colModel[]",
+                                            "dataIndex": "report_loaddate",
                                             "header": "Report loaddate",
                                             "width": 75,
-                                            "dataIndex": "report_loaddate",
-                                            "|renderer": "function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }",
-                                            "|xns": "Roo.grid",
-                                            "*prop": "colModel[]"
+                                            "xtype": "ColumnModel",
+                                            "|renderer": "function(v) { \n    var vv =   Date.parseDate(r.json.report_loaddatesplit('.')[0], 'Y-m-d H:i:s').format('d/M/Y h:ia');\n    return String.format('{0}', vv? vv.format('d/M/Y') : ''); \n\n    }",
+                                            "|xns": "Roo.grid"
                                         }
                                     ]
                                 }

diff --git a/Pman.Tab.XtupleReports.js b/Pman.Tab.XtupleReports.js
index 6e02a5b..1150361 100644 (file)
--- a/Pman.Tab.XtupleReports.js
+++ b/Pman.Tab.XtupleReports.js
@@ -382,10 +382,14 @@ Pman.Tab.XtupleReports = new Roo.XComponent({
                                 {
                                     xtype: 'ColumnModel',
                                     xns: Roo.grid,
+                                    dataIndex : 'report_loaddate',
                                     header : 'Report loaddate',
                                     width : 75,
-                                    dataIndex : 'report_loaddate',
-                                    renderer : function(v) { return String.format('{0}', v ? v.format('d/M/Y') : ''); }
+                                    renderer : function(v) { 
+                                        var vv =   Date.parseDate(r.json.report_loaddatesplit('.')[0], 'Y-m-d H:i:s').format('d/M/Y h:ia');
+                                        return String.format('{0}', vv? vv.format('d/M/Y') : ''); 
+                                    
+                                        }
                                 }
                             ]
                         }