LP#1904244: consolidate claiming administration into single page

This patch consolidates the following acquisitions administration
interfaces into a single tabbed page for managing claiming
policies:

- Claim Policies
- Claim Policy Actions
- Claim Types
- Claim Event Types

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
index c0f8961..3efdf6c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq-splash.component.html
@@ -7,14 +7,8 @@
   <eg-link-table columnCount="3">
     <eg-link-table-link i18n-label label="Cancel Reasons"
       routerLink="/staff/admin/acq/cancel_reason"></eg-link-table-link>
-    <eg-link-table-link i18n-label label="Claim Event Types"
-      routerLink="/staff/admin/acq/claim_event_type"></eg-link-table-link>
-    <eg-link-table-link i18n-label label="Claim Policies"
-      routerLink="/staff/admin/acq/claim_policy"></eg-link-table-link>
-    <eg-link-table-link i18n-label label="Claim Policy Actions"
-      routerLink="/staff/admin/acq/claim_policy_action"></eg-link-table-link>
-    <eg-link-table-link i18n-label label="Claim Types"
-      routerLink="/staff/admin/acq/claim_type"></eg-link-table-link>
+    <eg-link-table-link i18n-label label="Claiming"
+      routerLink="/staff/admin/acq/claiming"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Currency Types"
       routerLink="/staff/admin/acq/currency_type"></eg-link-table-link>
     <eg-link-table-link i18n-label label="Distribution Formulas"

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq.module.ts
index 5c57b3d..067ea39 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/admin-acq.module.ts
@@ -3,10 +3,12 @@ import {StaffCommonModule} from '@eg/staff/common.module';
 import {AdminAcqRoutingModule} from './routing.module';
 import {AdminCommonModule} from '@eg/staff/admin/common.module';
 import {AdminAcqSplashComponent} from './admin-acq-splash.component';
+import {ClaimingAdminComponent} from './claiming-admin.component';
 
 @NgModule({
   declarations: [
-      AdminAcqSplashComponent
+      AdminAcqSplashComponent,
+      ClaimingAdminComponent
   ],
   imports: [
     AdminCommonModule,

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.html
new file mode 100644 (file)
index 0000000..81fce0a
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.html
@@ -0,0 +1,40 @@
+<eg-staff-banner bannerText="Claiming Administration" i18n-bannerText>
+</eg-staff-banner>
+
+<eg-title i18n-prefix prefix="Claiming Administration"></eg-title>
+
+<ul ngbNav #claimingAdminNav="ngbNav" class="nav-tabs">
+  <li ngbNavItem>
+    <a ngbNavLink i18n>Claim Policies</a>
+    <ng-template ngbNavContent>
+      <div class="mt-2">
+        <eg-admin-page idlClass="acqclp"></eg-admin-page>
+       </div>
+    </ng-template>
+  </li>
+  <li ngbNavItem>
+    <a ngbNavLink i18n>Claim Policy Actions</a>
+    <ng-template ngbNavContent>
+      <div class="mt-2">
+        <eg-admin-page idlClass="acqclpa"></eg-admin-page>
+       </div>
+    </ng-template>
+  </li>
+  <li ngbNavItem>
+    <a ngbNavLink i18n>Claim Types</a>
+    <ng-template ngbNavContent>
+      <div class="mt-2">
+        <eg-admin-page idlClass="acqclt"></eg-admin-page>
+       </div>
+    </ng-template>
+  </li>
+  <li ngbNavItem>
+    <a ngbNavLink i18n>Claim Event Types</a>
+    <ng-template ngbNavContent>
+      <div class="mt-2">
+        <eg-admin-page idlClass="acqclet"></eg-admin-page>
+       </div>
+    </ng-template>
+  </li>
+</ul>
+<div [ngbNavOutlet]="claimingAdminNav"></div>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.ts
new file mode 100644 (file)
index 0000000..92b9a86
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/claiming-admin.component.ts
@@ -0,0 +1,10 @@
+import {Component, OnInit, Input, ViewChild} from '@angular/core';
+
+@Component({
+    templateUrl: './claiming-admin.component.html'
+})
+export class ClaimingAdminComponent implements OnInit {
+
+    ngOnInit() {
+    }
+}

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/routing.module.ts
index 013fb82..ff1a05a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/routing.module.ts
@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 import {AdminAcqSplashComponent} from './admin-acq-splash.component';
 import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component';
+import {ClaimingAdminComponent} from './claiming-admin.component';
 
 const routes: Routes = [{
     path: 'splash',
@@ -16,6 +17,21 @@ const routes: Routes = [{
         readonlyFields: 'last_activity'
     }]
 }, {
+    path: 'claiming',
+    component: ClaimingAdminComponent
+}, {
+    path: 'claim_event_type',
+    redirectTo: 'claiming' // from legacy auto-generated admin page
+}, {
+    path: 'claim_policy',
+    redirectTo: 'claiming' // from legacy auto-generated admin page
+}, {
+    path: 'claim_policy_action',
+    redirectTo: 'claiming' // from legacy auto-generated admin page
+}, {
+    path: 'claim_type',
+    redirectTo: 'claiming' // from legacy auto-generated admin page
+}, {
     path: ':table',
     component: BasicAdminPageComponent,
     // All ACQ admin pages cover data in the acq.* schema.  No need to