From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 12 May 2008 20:24:31 +0000 (+0000)
Subject: moving to external JS files
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ec75a0bcf8bec1c988495afa88c5790a7bef637f;p=Evergreen.git

moving to external JS files



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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/list_providers.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/list_providers.js
new file mode 100644
index 0000000000..dcb61b12cd
--- /dev/null
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/list_providers.js
@@ -0,0 +1,29 @@
+dojo.require("dijit.Dialog");
+dojo.require("dijit.form.FilteringSelect");
+dojo.require('dijit.form.Button');
+dojo.require('dojox.grid.Grid');
+
+dojo.require('openils.acq.CurrencyType');
+dojo.require('openils.Event');
+dojo.require('openils.acq.Provider');
+dojo.require("fieldmapper.OrgUtils");
+
+function getOrgInfo(rowIndex) {
+    data = providerListGrid.model.getRow(rowIndex);
+    if(!data) return;
+    return fieldmapper.aou.findOrgUnit(data.owner).shortname();
+}
+
+function loadProviderGrid() {
+    openils.acq.Provider.createStore(
+        function(storeData) {
+            var store = new dojo.data.ItemFileReadStore({data:storeData});
+            var model = new dojox.grid.data.DojoData(null, store, 
+                {rowsPerPage: 20, clientSort: true, query:{id:'*'}});
+            providerListGrid.setModel(model);
+            providerListGrid.update();
+        }
+    );
+}
+
+dojo.addOnLoad(loadProviderGrid);
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
new file mode 100644
index 0000000000..7943b802c2
--- /dev/null
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
@@ -0,0 +1,40 @@
+dojo.require("dijit.Dialog");
+dojo.require('dijit.layout.TabContainer');
+dojo.require('dijit.layout.ContentPane');
+dojo.require('dojox.grid.Grid');
+dojo.require("fieldmapper.OrgUtils");
+dojo.require('openils.acq.Provider');
+dojo.require('openils.Event');
+dojo.require('openils.User');
+
+var provider = null;
+
+function getOrgInfo(rowIndex) {
+    data = providerGrid.model.getRow(rowIndex);
+    if(!data) return;
+    return fieldmapper.aou.findOrgUnit(data.owner).shortname();
+}
+
+function loadProviderGrid() {
+    var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData([provider])});
+    var model = new dojox.grid.data.DojoData(
+        null, store, {rowsPerPage: 20, clientSort: true, query:{id:'*'}});
+    providerGrid.setModel(model);
+    providerGrid.update();
+}
+
+function fetchProvider() {
+    fieldmapper.standardRequest(
+        ['open-ils.acq', 'open-ils.acq.provider.retrieve'],
+        {   async: true,
+            params: [ openils.User.authtoken, providerId ],
+            oncomplete: function(r) {
+                provider = r.recv().content();
+                loadProviderGrid(provider);
+            }
+        }
+    );
+}
+
+dojo.addOnLoad(fetchProvider);
+
diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
index 6211d068cc..dd39eae8b8 100644
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/list_providers.html
@@ -3,66 +3,31 @@
 <%def name="page_title()">${_('Providers')}</%def>
 <%def name="block_content()">
 
-<script type="text/javascript">
-    dojo.require("dijit.Dialog");
-    dojo.require("dijit.form.FilteringSelect");
-    dojo.require('dijit.form.Button');
-    dojo.require('dojox.grid.Grid');
 
-    dojo.require('openils.acq.CurrencyType');
-    dojo.require('openils.Event');
-    dojo.require('openils.acq.Provider');
-    dojo.require("fieldmapper.OrgUtils");
-</script>
+<!-- load the page-specific JS -->
+<script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/acq/financial/list_providers.js'> </script>
 
 <div id='oils-acq-list-header' class='container'>
     <div id='oils-acq-list-header-label'>${_('Providers')}</div>
 </div>
 
 <!-- The main grid lives here -->
-<div jsId='providerListGrid' dojoType="dojox.Grid"></div>
-
 <script>
-
-    function loadProviderGrid() {
-        new openils.User().getBySession();
-
-        /** define how the primary grid is rendered */
-
-        function getOrgInfo(rowIndex) {
-            data = providerListGrid.model.getRow(rowIndex);
-            if(!data) return;
-            return fieldmapper.aou.findOrgUnit(data.owner).shortname();
-        }
-
-        function getName(rowIndex) {
-            data = providerListGrid.model.getRow(rowIndex);
-            if(!data) return;
-            return '<a href="${c.oils.acq.prefix.value}/provider/view/'+data.id+'">'+data.name+'</a>';
-        }
-    
-        var gridStructure = [{
-            cells : [[
-                {name: '${_("ID")}', field: 'id'},
-                {name: '${_("Name")}', get:getName, width:'auto'}, 
-                {name: '${_("Owner")}', get:getOrgInfo}, 
-                {name: '${_("Currency Type")}', field: "currency_type"}
-            ]]
-        }];
-
-        openils.acq.Provider.createStore(
-            function(storeData) {
-                var store = new dojo.data.ItemFileReadStore({data:storeData});
-                var model = new dojox.grid.data.DojoData(null, store, 
-                    {rowsPerPage: 20, clientSort: true, query:{id:'*'}});
-                providerListGrid.setStructure(gridStructure);
-                providerListGrid.setModel(model);
-                providerListGrid.update();
-            }
-        );
+    function getName(rowIndex) {
+        data = providerListGrid.model.getRow(rowIndex);
+        if(!data) return;
+        return '<a href="${c.oils.acq.prefix.value}/provider/view/'+data.id+'">'+data.name+'</a>';
     }
 
-    dojo.addOnLoad(loadProviderGrid);
+    var providerGridStructure = [{
+        cells : [[
+            {name: '${_("ID")}', field: 'id'},
+            {name: '${_("Name")}', get:getName, width:'auto'}, 
+            {name: '${_("Owner")}', get:getOrgInfo}, 
+            {name: '${_("Currency Type")}', field: "currency_type"}
+        ]]
+    }];
 </script>
+<div jsId='providerListGrid' dojoType="dojox.Grid" structure='providerGridStructure'></div>
 
 </%def>
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 efed380026..f531ba8cb5 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
@@ -3,48 +3,9 @@
 <%def name="page_title()">${_('View Provider')}</%def>
 <%def name="block_content()">
 
-<script>
-    dojo.require("dijit.Dialog");
-    dojo.require('dijit.layout.TabContainer');
-    dojo.require('dijit.layout.ContentPane');
-    dojo.require('dojox.grid.Grid');
-    dojo.require("fieldmapper.OrgUtils");
-    dojo.require('openils.acq.Provider');
-    dojo.require('openils.Event');
-    dojo.require('openils.User');
-
-    var providerId = ${c.oils.acq.provider_id};
-    var provider = null;
-
-    function getOrgInfo(rowIndex) {
-        data = providerGrid.model.getRow(rowIndex);
-        if(!data) return;
-        return fieldmapper.aou.findOrgUnit(data.owner).shortname();
-    }
-
-    function loadProviderGrid() {
-        var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData([provider])});
-        var model = new dojox.grid.data.DojoData(
-            null, store, {rowsPerPage: 20, clientSort: true, query:{id:'*'}});
-        providerGrid.setModel(model);
-        providerGrid.update();
-    }
-
-    function fetchProvider() {
-        fieldmapper.standardRequest(
-            ['open-ils.acq', 'open-ils.acq.provider.retrieve'],
-            {   async: true,
-                params: [ openils.User.authtoken, providerId ],
-                oncomplete: function(r) {
-                    provider = r.recv().content();
-                    loadProviderGrid(provider);
-                }
-            }
-        );
-    }
-
-    dojo.addOnLoad(fetchProvider);
-</script>
+<script>var providerId = ${c.oils.acq.provider_id};</script>
+<!-- load the page-specific JS -->
+<script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/acq/financial/view_provider.js'> </script>
 
 
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top">