From: erickson Date: Thu, 15 May 2008 02:29:04 +0000 (+0000) Subject: added logic to extract the tag and subfield from the xpath for display X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=99941f174fdb35bd8f8ff41e7ee318d6204ad51c;p=Evergreen.git added logic to extract the tag and subfield from the xpath for display git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9611 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js index 3175909a8f..84a3bbd69e 100644 --- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js +++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js @@ -8,6 +8,7 @@ dojo.require('openils.Event'); dojo.require('openils.User'); var provider = null; +var marcRegex = /\/\/\*\[@tag="(\d+)"]\/\*\[@code="(\w)"]/; function getOrgInfo(rowIndex) { data = providerGrid.model.getRow(rowIndex); @@ -15,6 +16,19 @@ function getOrgInfo(rowIndex) { return fieldmapper.aou.findOrgUnit(data.owner).shortname(); } +function getTag(rowIdx) { + data = padGrid.model.getRow(rowIdx); + if(!data) return; + return data.xpath.replace(marcRegex, '$1'); +} + +function getSubfield(rowIdx) { + data = padGrid.model.getRow(rowIdx); + if(!data) return; + return data.xpath.replace(marcRegex, '$2'); +} + + function loadProviderGrid() { var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData([provider])}); var model = new dojox.grid.data.DojoData( @@ -22,6 +36,7 @@ function loadProviderGrid() { providerGrid.setModel(model); providerGrid.update(); } + function loadPADGrid() { openils.acq.Provider.retrieveLineitemAttrDefs(providerId, function(attrs) { @@ -34,6 +49,7 @@ function loadPADGrid() { ); } + function fetchProvider() { fieldmapper.standardRequest( ['open-ils.acq', 'open-ils.acq.provider.retrieve'], diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html index ebd169829c..43535c8e9e 100644 --- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html +++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html @@ -72,8 +72,8 @@ {name: '${_("Code")}', field:'code'}, {name: '${_("Description")}', field: "description", width:'auto'}, {name: '${_("XPath")}', field:'xpath', width:'auto'}, - {name: '${_("Tag")}', value:'test'}, - {name: '${_("Subfield")}', value:'test'} + {name: '${_("Tag")}', get:getTag}, + {name: '${_("Subfield")}', get:getSubfield} ]] }];