added some date formatting

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9581 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
index c56a27c..6ada92a 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
@@ -9,6 +9,8 @@ dojo.require('openils.User');
 dojo.require('fieldmapper.OrgUtils');
 dojo.require('openils.acq.Provider');
 dojo.require('openils.acq.Picklist');
+dojo.require('dojo.date.locale');
+dojo.require('dojo.date.stamp');
 
 var PO = null;
 var lineitems = [];
@@ -31,6 +33,13 @@ function getPOOwner(rowIndex) {
     return new openils.User({id:data.owner}).user.usrname();
 }
 
+function getDateTimeField(rowIndex) {
+    data = poGrid.model.getRow(rowIndex);
+    if(!data) return;
+    var date = dojo.date.stamp.fromISOString(data[this.field]);
+    return dojo.date.locale.format(date, {formatLength:'medium'});
+}
+
 function getJUBTitle(rowIndex) {
     var data = liGrid.model.getRow(rowIndex);
     if(!data) return '';
@@ -55,7 +64,6 @@ function getJUBPrice(rowIndex) {
     }
 }
 
-
 function loadPOGrid() {
     if(!PO) return;
     var store = new dojo.data.ItemFileReadStore({data:acqpo.toStoreData([PO])});

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
index b015724..5678a9c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/view_po.html
@@ -13,7 +13,6 @@
     <div id='oils-acq-list-header-label'>${_('PO Details')}</div>
 </div>
 
-
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top">
     <div dojoType="dijit.layout.TabContainer">
 
@@ -25,9 +24,9 @@
                         {name: '${_("ID")}', field: 'id'},
                         {name: '${_("Owner")}', get:getPOOwner},
                         {name: '${_("Ordering Agency")}', get:getOrgInfo},
-                        {name: '${_("Create Time")}', field:'create_time'},
-                        {name: '${_("Edit Time")}', field: "edit_time"},
-                        {name: '${_("Provider")}', get:getProvider},
+                        {name: '${_("Create Time")}', field:'create_time', width:'auto', get:getDateTimeField},
+                        {name: '${_("Edit Time")}', field: "edit_time", width:'auto', get:getDateTimeField},
+                        {name: '${_("Provider")}', get:getProvider, width:'auto'},
                         {name: '${_("State")}', field:'state'}
                     ]]
                 }];
@@ -43,7 +42,7 @@
                         {name: '${_("ID")}', field: 'id'},
                         {name: '${_("Title")}', width: 'auto', get:getJUBTitle},
                         {name: '${_("Price")}', get:getJUBPrice},
-                        {name: '${_("Vendor")}', field: 'provider'},
+                        {name: '${_("Vendor")}', get:getProvider},
                         {name: '${_("# of Copies")}', field: 'item_count'},
                         {name: '${_("State")}', field: 'state'}
                     ]]