From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 18 Jul 2005 14:24:22 +0000 (+0000)
Subject: bill mockup, grid list tweaks
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=95cf4eb5340a52479a84bc64f69bb72eeefd1fbc;p=Evergreen.git

bill mockup, grid list tweaks


git-svn-id: svn://svn.open-ils.org/ILS/trunk@1255 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
index dff25a0818..1d74811307 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
@@ -20,6 +20,7 @@
 		<script src="chrome://evergreen/content/patron/patron_checkout_items.js" />
 		<script src="chrome://evergreen/content/patron/patron_items.js" />
 		<script src="chrome://evergreen/content/patron/patron_holds.js" />
+		<script src="chrome://evergreen/content/patron/patron_bills.js" />
 		<script src="chrome://evergreen/content/circ/circ_utils.js" />
 		<script src="chrome://evergreen/content/circ/checkin.js" />
 		<script src="chrome://evergreen/content/circ/checkin_items.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 315cd93555..495d4afb1f 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/grid_list.js
@@ -12,16 +12,23 @@ function grid_list_init(p) {
 	p._context_function = function (ev) { alert('default _context_function'); };
 	p.popup.addEventListener('popupshowing',function (ev) { return p._context_function(ev); },false);
 
-	grid_list_make_columns( p, p.grid_columns, p.cols )
+	grid_list_make_columns( p, p.cols )
 
 	p.clear_grid = function () {
 		sdump('D_GRID_LIST','p.clear_grid()\n');
-		empty_widget( p.grid_rows );
+		while( p.grid_rows.childNodes.length > 1 ) {
+			p.grid_rows.removeChild( p.grid_rows.lastChild );
+		}
 	}
 
 	p.add_rows = function (new_rows) { 
 		sdump('D_GRID_LIST','p.add_rows()\n');
-		return grid_list_add_rows(p,p.grid_rows,new_rows); 
+		return grid_list_add_rows(p,new_rows); 
+	}
+
+	p.remove_row_by_id = function (id) {
+		sdump('D_GRID_LIST','p.remove_row_by_id()\n');
+		return grid_list_remove_row_by_id(p,id); 
 	}
 
 	p.register_context_builder = function (f) {
@@ -33,41 +40,46 @@ function grid_list_init(p) {
 	return p;
 }
 
-function grid_list_make_columns( p, gridcols, cols ) {
+function grid_list_make_columns( p, cols ) {
 	sdump('D_GRID_LIST',arg_dump(arguments,{2:'.length'}));
 	sdump('D_TRACE_ENTER',arg_dump(arguments));
 	var d = p.w.document;
 	// cols[ idx ] = { 'id':???, 'label':???, 'primary':???, 'flex':??? }
+	var header = p.w.document.createElement('row');
+	p.grid_rows.appendChild( header );
 	for (var i = 0; i < cols.length; i++) {
 		var col = cols[i];
 		sdump('D_GRID_LIST','Col ' + i + ' : ' + js2JSON( col ) + '\n');
 		var gridcol = d.createElement( 'column' );
-		gridcols.appendChild( gridcol );
+		p.grid_columns.appendChild( gridcol );
 		for (var j in col) {
 			gridcol.setAttribute( j, col[j] );
 		}
+		var th = p.w.document.createElement('label');
+		header.appendChild( th );
+		th.setAttribute('value', col.label);
+		th.setAttribute('style','font-weight: bold;');
 	}
 	sdump('D_TRACE_EXIT',arg_dump(arguments));
-	return gridcols;
 }
 
-function grid_list_add_rows( p, grid_rows, new_rows ) {
+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 (grid_rows.childNodes.length > 0) { offset = grid_rows.lastChild.id; }
+	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];
 
-		gridrows.appendChild( newrow );
+		p.grid_rows.appendChild( new_row );
 
 	}
 	sdump('D_TRACE_EXIT',arg_dump(arguments));
 }
 
-function grid_list_remove_row_by_id( p, grid_rows, id ) {
+function grid_list_remove_row_by_id( p, id ) {
 	sdump('D_GRID_LIST',arg_dump(arguments));
-	var row = grid_rows.getElementsByAttribute('id',id)[0];
-	grid_rows.removeChild( row );
+	var row = p.grid_rows.getElementsByAttribute('id',id)[0];
+	p.grid_rows.removeChild( row );
 }
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 c03f7e5700..ed50eeabbb 100755
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.js
@@ -17,6 +17,9 @@ function patron_display_init(p) {
 	// gives: p.patron_holds, p.redraw_patron_holds
 	patron_display_patron_holds_init(p);
 
+	// gives: p.patron_bills, p.redraw_patron_bills
+	patron_display_patron_bills_init(p);
+
 	p.set_patron = function (au) {
 		return p._patron = au;
 	}
@@ -437,4 +440,36 @@ function patron_display_patron_holds_init(p) {
 	);
 }
 
+function patron_display_patron_bills_init(p) {
+	p.patron_bills = patron_bills_init( { 'w' : p.w, 'node' : p.patron_bills_node, 'debug' : p.app } );
+
+	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 ] );
+		}
+	}
+
+	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/patron/patron_display.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
index 4e2700821d..e81df12093 100755
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display.xul
@@ -14,6 +14,7 @@
 			params.patron_items_node = document.getElementById('PatronItems_main');
 			params.patron_checkout_items_node = document.getElementById('PatronCheckoutItems_main');
 			params.patron_holds_node = document.getElementById('PatronHolds_main');
+			params.patron_bills_node = document.getElementById('GridList_main');
 			params.commandset_node = document.getElementById('universal_cmds');
 			mw.focus_widget( document, 'patron_checkout_barcode_entry_textbox' );
 			mw.OpenILS_init(params);
diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
index 26f7014a71..0a7669d0ec 100755
--- a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_display_overlay.xul
@@ -6,6 +6,7 @@
 	<script>mw.sdump('D_TRACE','Loading patron_display_overlay.xul\n');</script>
 
 	<?xul-overlay href="chrome://evergreen/content/main/clam_shell_overlay.xul"?>
+	<?xul-overlay href="chrome://evergreen/content/main/grid_list_overlay.xul"?>
 	<?xul-overlay href="chrome://evergreen/content/patron/patron_items_overlay.xul"?>
 	<?xul-overlay href="chrome://evergreen/content/patron/patron_checkout_items_overlay.xul"?>
 	<?xul-overlay href="chrome://evergreen/content/patron/patron_display_status_overlay.xul"?>
@@ -52,10 +53,13 @@
 		<box id="PatronItems_main" />
 	</groupbox>
 	<groupbox id="cssdgb3">
-		<caption id="cssdgb3c" label="&patron_navbar.items;"/>
+		<caption id="cssdgb3c" label="&patron_navbar.holds;"/>
 		<box id="PatronHolds_main" />
 	</groupbox>
-	<box id="PatronBills_main"><label value="bills" /></box>
+	<groupbox id="cssdgb4">
+		<caption id="cssdgb4c" label="&patron_navbar.bills;"/>
+		<box id="GridList_main" />
+	</groupbox>
 	<box id="PatronEdit_main"><label value="edit" /></box>
 	<box id="PatronInfo_main"><label value="info" /></box>
 </deck>
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
index d79239e138..45795826cf 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
@@ -20,6 +20,7 @@ var sdump_levels = {
 
 	'D_CLAM' : false,
 	'D_PAGED_TREE' : false,
+	'D_GRID_LIST' : true,
 	'D_TAB' : false,
 
 	'D_AUTH' : false,
@@ -36,6 +37,8 @@ var sdump_levels = {
 
 	'D_PATRON_ITEMS' : false,
 	'D_PATRON_CHECKOUT_ITEMS' : false,
+	'D_PATRON_HOLDS' : true,
+	'D_PATRON_BILLS' : true,
 
 	'D_CHECKIN' : true,
 	'D_CHECKIN_ITEMS' : true,