From 858031642742eef62024985f5a373e5c78f9db74 Mon Sep 17 00:00:00 2001 From: miker Date: Wed, 23 Jul 2008 01:44:00 +0000 Subject: [PATCH] marc code editor works (sans vr format map) git-svn-id: svn://svn.open-ils.org/ILS/trunk@10091 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../conify/global/config/marc_code_maps.html | 218 ++++++++++-------- .../conify/global/config/marc_code_maps.js | 2 +- 2 files changed, 129 insertions(+), 91 deletions(-) diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.html b/Open-ILS/web/conify/global/config/marc_code_maps.html index 85f2668cd5..ea7d1dd52f 100644 --- a/Open-ILS/web/conify/global/config/marc_code_maps.html +++ b/Open-ILS/web/conify/global/config/marc_code_maps.html @@ -83,8 +83,7 @@ 'instantiate('+ 'openils.widget.TranslatorPopup,{field:"value",'+ 'targetObject:"grid_row_object_cache.cam['+row+']"}'+ - ');'+ - 'cam_grid.rowHeightChanged('+row+');', + ');cam_grid.rowHeightChanged('+row+');', 0 ); var oldnode = dojo.byId('value_translation_cam_' + row); @@ -107,8 +106,7 @@ 'instantiate('+ 'openils.widget.TranslatorPopup,{field:"description",'+ 'targetObject:"grid_row_object_cache.cam['+row+']"}'+ - ');'+ - 'cam_grid.rowHeightChanged('+row+');', + ');cam_grid.rowHeightChanged('+row+');', 0 ); var oldnode = dojo.byId('description_translation_cam_' + row); @@ -123,71 +121,75 @@ } ]; - var codelist = ['cam','cblvl','cifm','citm','clm','clfm'];//,'cvrfm']; + var codelist = ['cam','cblvl','cifm','citm','clm','clfm','cvrfm']; var hashes = {}; var objects = {}; - var models = {}; + var stores = {}; console.log('about to loop over codelist: ' + codelist); for (var i in codelist) { - var classname = codelist[i]; - - hashes[classname] = fieldmapper.standardRequest( - [ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'], - [ { query : { code : { '!=' : null } } } ] - ); - - console.log('created hashes for ' + classname); - - if (!hashes[classname]) continue; - - objects[classname] = dojo.map( - hashes[classname].concat(), - new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );') - ); - - console.log('created objects for ' + classname); - - stores[classname] = new dojo.data.ItemFileWriteStore( - { data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) } - ); - - console.log('create store for ' + classname); - - if (classname != 'cam') { - layouts[classname] = [ - { cells : [ - [ - { name : "Code", field : "code", width : "5em", editor : dojox.grid.editors.Dijit, rowSpan : "2" }, - { name : "Value", field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }, - { name : "Translation", - width : "10em", - height : "2em", - get : function (row) { - if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = []; - var r = this.grid.model.getRow(row); - if (r) { - grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(this.grid.model.getRow(row)); - setTimeout( - 'dojo.query(".'+classname+'_value_' + row + '").'+ - 'instantiate('+ - 'openils.widget.TranslatorPopup,{field:"value",'+ - 'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+ - ');'+ - classname+'_grid.rowHeightChanged('+row+');', - 0 - ); - return ''; - } - return ''; - } - } - ] - ] - } - ]; - } + + (function (classname) { + + hashes[classname] = fieldmapper.standardRequest( + [ 'open-ils.fielder', 'open-ils.fielder.' + classname + '.atomic'], + [ { query : { code : { '!=' : null } } } ] + ); + + console.log('created hashes for ' + classname); + + if (!hashes[classname]) return; + + objects[classname] = dojo.map( + hashes[classname].concat(), + new Function('x', 'return new fieldmapper.' + classname + '().fromHash( x );') + ); + + console.log('created objects for ' + classname); + + stores[classname] = new dojo.data.ItemFileWriteStore( + { data : fieldmapper[classname].toStoreData( objects[classname], 'value' ) } + ); + + console.log('create store for ' + classname); + + if (classname != 'cam') { + layouts[classname] = [ + { cells : [ + [ + { name : "Code", field : "code", width : "5em", editor : dojox.grid.editors.Dijit }, + { name : "Value", field : "value", width : "auto", editor : dojox.grid.editors.Editor, style : "minHeight:1em;" }, + { name : "Translation", + width : "10em", + height : "2em", + get : function (row) { + if (!grid_row_object_cache[classname]) grid_row_object_cache[classname] = []; + var r = this.grid.model.getRow(row); + if (r) { + grid_row_object_cache[classname][row] = new fieldmapper[classname]().fromHash(r); + setTimeout( + 'dojo.query(".'+classname+'_value_' + row + '").'+ + 'instantiate('+ + 'openils.widget.TranslatorPopup,{field:"value",'+ + 'targetObject:"grid_row_object_cache.'+classname+'['+row+']"}'+ + ');'+classname+'_grid.rowHeightChanged('+row+');', + 0 + ); + var oldnode = dojo.byId('value_translation_' + classname + '_' + row); + if (oldnode) dijit.byNode(oldnode).destroyRecursive(); + return ''; + } + return ''; + } + } + ] + ] + } + ]; + } + })(codelist[i]) + } @@ -199,11 +201,6 @@
- -
@@ -218,18 +215,24 @@
-
-
+
+
+ +
+
-
+
@@ -245,7 +248,13 @@
-
+
+ +
+
@@ -254,10 +263,9 @@
-
@@ -272,7 +280,13 @@
-
+
+ +
+
@@ -281,8 +295,8 @@
@@ -299,7 +313,13 @@
-
+
+ +
+
@@ -308,8 +328,8 @@
@@ -326,7 +346,13 @@
-
+
+ +
+
@@ -335,8 +361,8 @@
@@ -353,7 +379,13 @@
-
+
+ +
+
@@ -362,8 +394,8 @@
@@ -380,7 +412,13 @@
-
+
+ +
+
diff --git a/Open-ILS/web/conify/global/config/marc_code_maps.js b/Open-ILS/web/conify/global/config/marc_code_maps.js index 4eed81b1d3..4c32ddddf5 100644 --- a/Open-ILS/web/conify/global/config/marc_code_maps.js +++ b/Open-ILS/web/conify/global/config/marc_code_maps.js @@ -105,7 +105,7 @@ function save_them_all (event) { store.fetch({ query : { ischanged : 1 }, onItem : function (item, req) { try { if (this.isItem( item )) window.dirtyStore.push( item ); } catch (e) { /* meh */ } }, - scope : perm_store + scope : store }); var confirmation = true; -- 2.43.2