more date formatting. added link from search results to po details

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
index ad048ab..29d0783 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
@@ -5,6 +5,8 @@ dojo.require('dijit.form.NumberTextBox');
 dojo.require('dojox.grid.Grid');
 dojo.require('openils.acq.Provider');
 dojo.require('fieldmapper.OrgUtils');
+dojo.require('dojo.date.locale');
+dojo.require('dojo.date.stamp');
 
 function getOrgInfo(rowIndex) {
     data = poGrid.model.getRow(rowIndex);
@@ -24,6 +26,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 doSearch(fields) {
     var itemList = [];
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
index 3aad74f..28a5fec 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
@@ -10,6 +10,14 @@
 <!-- load the page-specific JS -->
 <script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/acq/po/search.js'> </script>
 
+<script>
+    function getId(rowIndex) {
+        data = poGrid.model.getRow(rowIndex);
+        if(!data) return;
+        return '<a href="${c.oils.acq.prefix.value}/po/view/' + data.id + '">'+data.id;
+    }
+</script>
+
 
 <form dojoType='dijit.form.Form' action='' method=''>
     <script type="dojo/method" event="onSubmit">
@@ -31,12 +39,12 @@
 <script>
     var poGridStructure = [{
         cells : [[
-            {name: '${_("ID")}', field: 'id'},
+            {name: '${_("ID")}', field: 'id', get:getId},
             {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', get:getDateTimeField, width:'auto'},
+            {name: '${_("Edit Time")}', field: "edit_time", get:getDateTimeField, width:'auto'},
+            {name: '${_("Provider")}', get:getProvider, width:'auto'},
             {name: '${_("State")}', field:'state'}
         ]]
     }];