From 3cc2cd763f190b2ca22f653f9fa80884831657e5 Mon Sep 17 00:00:00 2001 From: phasefx Date: Mon, 18 Jul 2005 19:07:30 +0000 Subject: [PATCH] patron_bills, currently broken git-svn-id: svn://svn.open-ils.org/ILS/trunk@1270 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../chrome/content/evergreen/main/grid_list.js | 7 +- .../content/evergreen/patron/patron_bills.js | 93 ++++++++++++++++++++++ .../content/evergreen/patron/patron_display.js | 28 +------ .../chrome/content/evergreen/util/error.js | 16 ++-- .../locale/en-US/evergreen/OpenILS.properties | 10 +++ 5 files changed, 117 insertions(+), 37 deletions(-) create mode 100644 Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js b/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js index 495d4afb1f..4d18a2d6b7 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js +++ b/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js @@ -5,12 +5,12 @@ function grid_list_init(p) { sdump('D_CONSTRUCTOR',arg_dump(arguments)); p.grid = p.node.getElementsByAttribute('name','grid')[0]; - p.popup = p.node.getElementsByTagName('popup')[0]; + //p.popup = p.node.getElementsByTagName('popup')[0]; p.grid_columns = p.grid.firstChild; p.grid_rows = p.grid.lastChild; p._context_function = function (ev) { alert('default _context_function'); }; - p.popup.addEventListener('popupshowing',function (ev) { return p._context_function(ev); },false); + //p.popup.addEventListener('popupshowing',function (ev) { return p._context_function(ev); },false); grid_list_make_columns( p, p.cols ) @@ -66,9 +66,6 @@ function grid_list_make_columns( p, cols ) { function grid_list_add_rows( p, new_rows ) { sdump('D_GRID_LIST',arg_dump(arguments,{2:'.length'})); sdump('D_TRACE_ENTER',arg_dump(arguments)); - var d = p.w.document; - var offset = 0; - if (p.grid_rows.childNodes.length > 0) { offset = p.grid_rows.lastChild.id; } for (var i = 0; i < new_rows.length; i++) { var new_row = new_rows[i]; diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js new file mode 100644 index 0000000000..9be3962843 --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_bills.js @@ -0,0 +1,93 @@ +sdump('D_TRACE','Loading patron_bills.js\n'); + +function patron_bills_init(p) { + sdump('D_PATRON_BILLS',"TESTING: patron_bills.js: " + mw.G['main_test_variable'] + '\n'); + sdump('D_CONSTRUCTOR',arg_dump(arguments)); + + p.patron_bills_cols = [ + { + 'id' : 'checkbox', 'label' : ' ', 'flex' : 0, 'render_xul' : 'checkbox' + }, + { + 'id' : 'id', 'label' : getString('mbts_id_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.id()' + }, + { + 'id' : 'xact_start', 'label' : getString('mbts_xact_start_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.xact_start().toString().substr(0,10);' + }, + { + 'id' : 'xact_finish', 'label' : getString('mbts_xact_finish_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.xact_finish().toString().substr(0,10);' + }, + { + 'id' : 'total_owed', 'label' : getString('mbts_total_owed_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.total_owed()' + }, + { + 'id' : 'total_paid', 'label' : getString('mbts_total_paid_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.total_paid()' + }, + { + 'id' : 'balance_owed', 'label' : getString('mbts_balance_owed_label'), 'flex' : 1, + 'primary' : false, 'hidden' : false, 'fm_class' : 'mbts', 'fm_field_render' : '.balance_owed()' + }, + { + 'id' : 'current_pay', 'label' : getString('bills_current_payment_label'), 'flex' : 1, 'render_xul' : 'textbox' + } + ]; + + p.grid_list = grid_list_init( { 'w' : p.w, 'node' : p.node, 'cols' : p.patron_bills_cols, 'debug' : p.app } ); + p.add_patron_bills = function (bills) { + sdump('D_PATRON_BILLS','p.add_patron_bills(' + bills + ')\n'); + return patron_bills_add_patron_bills(p,bills); + } + p.clear_patron_bills = p.grid_list.clear_grid; + + p.register_bill_context_builder = function (f) { + sdump('D_PATRON_BILLS','p.register_context_builder(' + f + ')\n'); + p.grid_list.register_context_builder( f ); + } + + sdump('D_TRACE_EXIT',arg_dump(arguments)); + return p; +} + +function cols() { + sdump('D_PATRON_BILLS',arg_dump(arguments,{1:true})); + for (var i = 0; i < p.mbts_cols.length; i++) { + var hash = p.mbts_cols[i]; + var obj_string = 'mbts'; + var cmd = parse_render_string( obj_string, hash.fm_field_render ); + var col = ''; + try { + col = eval( cmd ); + } catch(E) { + sdump('D_ERROR',js2JSON(E) + '\n'); + } + var label = p.w.document.createElement('label'); + row.appendChild( label ); + label.setAttribute('value',col); + } +} + +function patron_bills_add_patron_bills(p, bills) { + sdump('D_PATRON_BILLS',arg_dump(arguments,{1:true})); + // grid_columns: checkbox, line item, bill amount, payment + + var obj_string ='mbts'; + + for (var i = 0; i < bills.length; i++) { + + var mbts = bills[i]; + + var row = p.w.document.createElement('row'); + p.grid_list.add_rows( [ row ] ); + + for (var j = 0; j < p.patron_bills_cols.length; i++) { + var hash = p.patron_bills_cols[j]; + if (hash.fm_field_render) { + } + } + } +} diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js index ed50eeabbb..9af6df9780 100755 --- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js +++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js @@ -18,7 +18,7 @@ function patron_display_init(p) { patron_display_patron_holds_init(p); // gives: p.patron_bills, p.redraw_patron_bills - patron_display_patron_bills_init(p); + //patron_display_patron_bills_init(p); p.set_patron = function (au) { return p._patron = au; @@ -29,6 +29,7 @@ function patron_display_init(p) { p.redraw_patron_checkout_items(); p.redraw_patron_items(); p.redraw_patron_holds(); + //p.redraw_patron_bills(); return render_fm(p.w.document, { 'au' : p._patron }); } @@ -445,31 +446,10 @@ function patron_display_patron_bills_init(p) { p.redraw_patron_bills = function() { p.patron_bills.clear_patron_bills(); - if (!p._patron.bills()) patron_get_bills( p._patron ); - for (var i = 0; i < p._patron.bills().length; i++) { - p.patron_bills.add_patron_bills( [ i ] ); - } + if (!p._patron.bills) patron_get_bills( p._patron ); + p.patron_bills.add_patron_bills( p._patron.bills ); } - var test = p.patron_bills.w.document.createElement('row'); - test.setAttribute('style','border: dotted;'); - var test1 = p.patron_bills.w.document.createElement('checkbox'); - test.appendChild( test1 ); - var test2 = p.patron_bills.w.document.createElement('vbox'); - test.appendChild( test2 ); - var test2a = p.patron_bills.w.document.createElement('label'); - test2.appendChild( test2a ); - test2a.setAttribute('value','Late Fee: Harry Potter'); - var test2b = p.patron_bills.w.document.createElement('label'); - test2.appendChild( test2b ); - test2b.setAttribute('value','Due: 05-19-05 Received: 05-21-05 Original Fee: $0.40'); - var test3 = p.patron_bills.w.document.createElement('label'); - test.appendChild( test3 ); - test3.setAttribute('value','$0.20'); - var test4 = p.patron_bills.w.document.createElement('textbox'); - test.appendChild( test4 ); - - p.patron_bills.add_patron_bills( [ test ] ); } diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js index 45795826cf..19588b263d 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js +++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js @@ -20,12 +20,12 @@ var sdump_levels = { 'D_CLAM' : false, 'D_PAGED_TREE' : false, - 'D_GRID_LIST' : true, + 'D_GRID_LIST' : false, 'D_TAB' : false, 'D_AUTH' : false, - 'D_OPAC' : true, + 'D_OPAC' : false, 'D_PATRON_SEARCH' : false, 'D_PATRON_SEARCH_FORM' : false, @@ -37,15 +37,15 @@ var sdump_levels = { 'D_PATRON_ITEMS' : false, 'D_PATRON_CHECKOUT_ITEMS' : false, - 'D_PATRON_HOLDS' : true, + 'D_PATRON_HOLDS' : false, 'D_PATRON_BILLS' : true, - 'D_CHECKIN' : true, - 'D_CHECKIN_ITEMS' : true, + 'D_CHECKIN' : false, + 'D_CHECKIN_ITEMS' : false, - 'D_CAT' : true, + 'D_CAT' : false, - 'D_PATRON_UTILS' : false, + 'D_PATRON_UTILS' : true, 'D_CIRC_UTILS' : false, 'D_EXPLODE' : false, @@ -53,7 +53,7 @@ var sdump_levels = { 'D_PRINT' : false, 'D_SES' : true, 'D_SES_FUNC' : false, - 'D_SPAWN' : true, + 'D_SPAWN' : false, 'D_STRING' : false, 'D_UTIL' : false, 'D_WIN' : false, diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties index fdd7c1b7f3..2fc3ed8afb 100644 --- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties +++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties @@ -80,3 +80,13 @@ ahr_selection_depth_label=Selection Depth ahr_target_label=Target ahr_usr_label=Usr +bills_total_owed_label=Total Owed +bills_current_payment_label=Current Payment + +mbts_balance_owed_label=Balance Owed +mbts_id_label=Id +mbts_total_owed_label=Total Owed +mbts_total_paid_label=Total Paid +mbts_xact_finish_label=Finish +mbts_xact_start_label=Start + -- 2.11.0