LP1904036 billing history tabs; sql cleanup

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
index 90fa88b..bc72130 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
@@ -125,7 +125,7 @@ export class GridColumnSet {
     insertColumn(col: GridColumn): boolean {
 
         if (col.isAuto) {
-            if (this.getColByName(col.name)) {
+            if (this.getColByName(col.name) || this.getColByPath(col.path)) {
                 // New auto-generated column conflicts with existing
                 // column.  Skip it.
                 return false;
@@ -176,6 +176,12 @@ export class GridColumnSet {
         return this.columns.filter(c => c.name === name)[0];
     }
 
+    getColByPath(path: string): GridColumn {
+        if (path) {
+            return this.columns.filter(c => c.path === path)[0];
+        }
+    }
+
     idlInfoFromDotpath(dotpath: string): any {
         if (!dotpath || !this.idlClass) { return null; }
 

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html
index 06d59b0..37ad704 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.html
@@ -17,7 +17,8 @@
 </ng-template>
 
 
-<ul ngbNav #nav="ngbNav" class="nav-tabs" [(activeId)]="tab">
+<ul ngbNav #nav="ngbNav" class="nav-tabs" 
+  [activeId]="tab" (navChange)="beforeTabChange($event)">
   <li ngbNavItem="transactions">
     <a ngbNavLink i18n>Transactions</a>
     <ng-template ngbNavContent>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts
index 67dcb8e..d231be0 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/billing-history.component.ts
@@ -71,6 +71,11 @@ export class BillingHistoryComponent implements OnInit {
 
     ngOnInit() {
 
+        this.route.paramMap.subscribe((params: ParamMap) => {
+            this.tab = params.get('billingHistoryTab') || 'transactions';
+        });
+
+
         const start = new Date();
         const end = new Date();
         start.setFullYear(start.getFullYear() - 1);
@@ -116,6 +121,14 @@ export class BillingHistoryComponent implements OnInit {
         }
     }
 
+    beforeTabChange(evt: NgbNavChangeEvent) {
+        // tab will change with route navigation.
+        evt.preventDefault();
+        this.router.navigate([
+            `/staff/circ/patron/${this.patronId}/bills/history/${evt.nextId}`]);
+    }
+
+
     showStatement(row: any | any[], forPayment?: boolean) {
         row = [].concat(row)[0];
         const id = forPayment ? row['xact.id'] : row.id;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql
index 842855c..708808f 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.angular-patron.sql
@@ -3,8 +3,6 @@ BEGIN;
 
 -- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version); 
 
-/*
-
 -- insert then update for easier iterative development tweaks
 INSERT INTO config.print_template 
     (name, label, owner, active, locale, content_type, template)
@@ -633,8 +631,6 @@ UPDATE config.print_template SET template = $TEMPLATE$
 </div>
 $TEMPLATE$ WHERE name = 'bills_historical';
 
-*/
-
 COMMIT;