[open-ils-commits] r9590 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb:
public/oils/media/ui_js/oils/default/acq/po
templates/oils/default/acq/financial templates/oils/default/acq/po
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue May 13 17:15:46 EDT 2008
Author: erickson
Date: 2008-05-13 17:15:42 -0400 (Tue, 13 May 2008)
New Revision: 9590
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
Log:
making use of code fields on fund, funding_source, and provider
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/view_po.js 2008-05-13 21:15:42 UTC (rev 9590)
@@ -24,7 +24,7 @@
function getProvider(rowIndex) {
data = poGrid.model.getRow(rowIndex);
if(!data) return;
- return openils.acq.Provider.retrieve(data.provider).name();
+ return openils.acq.Provider.retrieve(data.provider).code();
}
function getPOOwner(rowIndex) {
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funding_sources.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -45,6 +45,10 @@
<td><input dojoType="dijit.form.TextBox" name="name"></td>
</tr>
<tr>
+ <td><label for="name">${_('Code:')} </label></td>
+ <td><input dojoType="dijit.form.TextBox" name="code"></td>
+ </tr>
+ <tr>
<td><label for="currency_type">${_('Currency Type:')}</label></td>
<td>
<input jsId='fsCurrencySelector' name="currency_type"
@@ -87,6 +91,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', width:'auto', get:getName},
+ {name: '${_("Code")}', field:'code'},
{name: '${_("Owner")}', width:'auto', get:getOrgInfo},
{name: '${_("Currency Type")}', field: "currency_type"},
{name: '${_("Balance")}', get:getBalanceInfo}
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_funds.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -17,7 +17,6 @@
fields,
function(fundId) {
var evt = openils.Event.parse(fundId);
- alert(evt);
if(evt) {
alert(evt); /* XXX */
return;
@@ -46,6 +45,10 @@
<td><input dojoType="dijit.form.TextBox" name="name"></td>
</tr>
<tr>
+ <td><label for="name">${_('Code:')} </label></td>
+ <td><input dojoType="dijit.form.TextBox" name="code"></td>
+ </tr>
+ <tr>
<td><label for="year">${_('Year:')} </label></td>
<td><input dojoType="dijit.form.TextBox" name="year"></td>
</tr>
@@ -92,6 +95,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', width:'auto', get:getName},
+ {name: '${_("Code")}', field:'code'},
{name: '${_("Year")}', field: "year"},
{name: '${_("Location")}', get:getOrgInfo},
{name: '${_("Currency Type")}', field: "currency_type"},
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -23,6 +23,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', get:getName, width:'auto'},
+ {name: '${_("Code")}', field:'code'},
{name: '${_("Owner")}', get:getOrgInfo},
{name: '${_("Currency Type")}', field: "currency_type"}
]]
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -31,7 +31,7 @@
function(store) {
fundingSourceSelector.store =
new dojo.data.ItemFileReadStore({data:store});
- fundingSourceSelector.setValue(store.items[0].id);
+ fundingSourceSelector.setValue(store.items[0].code);
}, 'MANAGE_FUNDING_SOURCE'
);
</script>
@@ -40,7 +40,7 @@
<td><label for="amount">${_('Funding Source:')} </label></td>
<td>
<input jsId='fundingSourceSelector' name="funding_source"
- dojoType="dijit.form.FilteringSelect" searchAttr='name' labelAttr='name'>
+ dojoType="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
</input>
</td>
</tr>
@@ -89,6 +89,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', field: "name", width:'auto'},
+ {name: '${_("Code")}', field: "code"},
{name: '${_("Currency Type")}', field: "currency_type"},
{name: '${_("Owner")}', get:getOrgInfo},
/*
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_funding_source.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -10,7 +10,7 @@
data = fsAllocationGrid.model.getRow(rowIndex);
if(data) {
var fund = openils.acq.Fund.retrieve(data.fund);
- return '<a href="${c.oils.acq.prefix.value}/fund/view/'+fund.id()+'">'+fund.name()+'</a>';
+ return '<a href="${c.oils.acq.prefix.value}/fund/view/'+fund.id()+'">'+fund.code()+'</a>';
}
}
</script>
@@ -62,7 +62,7 @@
function(store) {
fundingSourceFundSelector.store =
new dojo.data.ItemFileReadStore({data:store});
- fundingSourceFundSelector.setValue(store.items[0].id);
+ fundingSourceFundSelector.setValue(store.items[0].code);
}, 'MANAGE_FUND'
);
</script>
@@ -71,7 +71,7 @@
<td><label for="amount">${_('Fund:')} </label></td>
<td>
<input jsId='fundingSourceFundSelector' name="fund"
- dojoType="dijit.form.FilteringSelect" searchAttr='name' labelAttr='name'>
+ dojoType="dijit.form.FilteringSelect" searchAttr='code' labelAttr='code'>
</input>
</td>
</tr>
@@ -119,6 +119,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', field: "name", width:'auto'},
+ {name: '${_("Code")}', field: "code"},
{name: '${_("Balance")}', get:getSummaryInfo},
{name: '${_("Total Credits")}', get:getSummaryInfo},
{name: '${_("Total Debits")}', get:getSummaryInfo},
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -17,6 +17,7 @@
cells : [[
{name: '${_("ID")}', field: 'id'},
{name: '${_("Name")}', field: "name", width:'auto'},
+ {name: '${_("Code")}', field:'code'},
{name: '${_("Owner")}', get:getOrgInfo},
{name: '${_("Currency Type")}', field: "currency_type"},
]]
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html 2008-05-13 20:34:35 UTC (rev 9589)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html 2008-05-13 21:15:42 UTC (rev 9590)
@@ -32,7 +32,8 @@
<label for='id'>${_('ID')}</label>
<input dojoType='dijit.form.NumberTextBox' name='id'> </input>
<label for='provider'>${_('Provider')}</label>
- <select name='provider' style='overflow-y:auto;' jsId="providerSelector" dojoType="dijit.form.FilteringSelect"> </select>
+ <select labelAttr='code' searchAttr='code' name='provider'
+ style='overflow-y:auto;' jsId="providerSelector" dojoType="dijit.form.FilteringSelect"> </select>
<div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div>
</form>
More information about the open-ils-commits
mailing list