[open-ils-commits] r14891 - trunk/Open-ILS/xul/staff_client/server/patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-11-12 23:01:27 -0500 (Thu, 12 Nov 2009)
New Revision: 14891

Modified:
   trunk/Open-ILS/xul/staff_client/server/patron/trigger_events.js
Log:
more columns for the triggered events UI.  Some label collisions/ambiguity; could override/hand-craft the labels, but maybe something like adding the class label for the column-come-lately's

Modified: trunk/Open-ILS/xul/staff_client/server/patron/trigger_events.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/trigger_events.js	2009-11-13 03:59:20 UTC (rev 14890)
+++ trunk/Open-ILS/xul/staff_client/server/patron/trigger_events.js	2009-11-13 04:01:27 UTC (rev 14891)
@@ -107,7 +107,32 @@
         list = new util.list( 'atev_list' );
         list.init( 
             {
-                'columns' : [ 'atev' ],
+                'columns' : [].concat(
+                    list.fm_columns('atev', {
+                        'atev_target' : { 'render' : function(my) { return fieldmapper.IDL.fmclasses[my.atev.target().classname].label; } }
+                    })
+                ).concat(
+                    list.fm_columns('atevdef', { 
+                        '*' : { 'hidden' : true }, 
+                        'atevdef_name' : { 'hidden' : false }, 
+                        'atevdef_reactor' : { 'hidden' : false } 
+                    })
+                ).concat(
+                    list.fm_columns('circ', { 
+                        '*' : { 'hidden' : true }, 
+                        'circ_due_date' : { 'hidden' : false } 
+                    })
+                ).concat(
+                    list.fm_columns('acp', { 
+                        '*' : { 'hidden' : true }, 
+                        'acp_barcode' : { 'hidden' : false } 
+                    })
+                ).concat(
+                    list.fm_columns('ahr', { 
+                        '*' : { 'hidden' : true },
+                        'ahr_id' : { 'hidden' : false } 
+                    })
+                ),
                 'retrieve_row' : retrieve_row,
                 'on_select' : handle_selection
             }
@@ -149,7 +174,11 @@
             var row_params = {
                 'row' : {
                     'my' : {
-                        'atev' : evt
+                        'atev' : evt,
+                        'atevdef' : evt.event_def(),
+                        'circ' : evt.target().classname == 'circ' ? evt.target() : null,
+                        'ahr' : evt.target().classname == 'ahr' ? evt.target() : null,
+                        'acp' : evt.target().classname == 'circ' ? evt.target().target_copy() : evt.target().current_copy()
                     }
                 }
             };