LP#1775466 stat sip config continued; sync Cataloging menu

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/core/auth.service.ts b/Open-ILS/src/eg2/src/app/core/auth.service.ts
index 4398ab2..6c3ef91 100644 (file)
--- a/Open-ILS/src/eg2/src/app/core/auth.service.ts
+++ b/Open-ILS/src/eg2/src/app/core/auth.service.ts
@@ -216,10 +216,7 @@ export class EgAuthService {
         // to expire on the server.
         const pollTime = this.authtime() * 1000 + 5000;
 
-        console.debug('polling with timeout ' + pollTime);
-
         this.pollTimeout = setTimeout(() => {
-            console.debug('poll checking for auth session...');
             this.net.request(
                 'open-ils.auth',
                 'open-ils.auth.session.retrieve',
@@ -230,10 +227,7 @@ export class EgAuthService {
             // EgNetService intercepts NO_SESSION events.
             // If the promise resolves, the session is valid.
             ).subscribe(
-                user => {
-                    console.debug('auth poll returned: ' + user);
-                    this.sessionPoll();
-                },
+                user => this.sessionPoll(),
                 err  => console.warn('auth poll error: ' + err)
             );
 
@@ -279,10 +273,12 @@ export class EgAuthService {
 
     deleteSession(): void {
         if (this.token()) {
+            // note we have to subscribe to the net.request or it will
+            // not fire -- observables only run when subscribed to.
             this.net.request(
                 'open-ils.auth',
                 'open-ils.auth.session.delete', this.token())
-            .subscribe(x => console.debug('logged out'));
+            .subscribe(x => {});
         }
     }
 

diff --git a/Open-ILS/src/eg2/src/app/core/pcrud.service.ts b/Open-ILS/src/eg2/src/app/core/pcrud.service.ts
index 66c4fa8..759d81e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/core/pcrud.service.ts
+++ b/Open-ILS/src/eg2/src/app/core/pcrud.service.ts
@@ -189,7 +189,7 @@ export class EgPcrudContext {
     private sendRequest(method: string,
             params: any[]): Observable<EgPcrudResponse> {
 
-        this.log(`sendRequest(${method})`);
+        // this.log(`sendRequest(${method})`);
 
         return this.net.requestCompiled(
             new EgNetRequest(

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
index 8627ff6..fd301a4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-toolbar.component.html
@@ -43,11 +43,15 @@
         class="material-icons mat-icon-in-button">keyboard_arrow_right</span>
   </button>
 
+  <!--
+  Hiding jump-to-last since there's no analog in the angularjs grid and
+  it has limited value since the size of the data set is often unknown.
   <button [disabled]="!gridContext.pager.resultCount || gridContext.pager.isLastPage()" 
     type="button" class="btn btn-outline-dark mr-1" (click)="gridContext.pager.toLast()">
     <span title="First Page" i18n-title 
         class="material-icons mat-icon-in-button">last_page</span>
   </button>
+  -->
 
   <div ngbDropdown class="mr-1" placement="bottom-right">
     <button ngbDropdownToggle class="btn btn-outline-dark text-button">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts
new file mode 100644 (file)
index 0000000..e23cd70
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/common.module.ts
@@ -0,0 +1,31 @@
+import {NgModule} from '@angular/core';
+import {EgStaffCommonModule} from '@eg/staff/common.module';
+import {EgLinkTableComponent, EgLinkTableLinkComponent} from '@eg/staff/share/link-table/link-table.component';
+import {EgGridModule} from '@eg/share/grid/grid.module';
+import {EgAdminPageComponent} from '@eg/staff/share/admin-page/admin-page.component';
+
+@NgModule({
+  declarations: [
+    EgLinkTableComponent,
+    EgLinkTableLinkComponent,
+    EgAdminPageComponent
+  ],
+  imports: [
+    EgStaffCommonModule,
+    EgGridModule
+  ],
+  exports: [
+    EgStaffCommonModule,
+    EgLinkTableComponent,
+    EgLinkTableLinkComponent,
+    EgAdminPageComponent,
+    EgGridModule
+  ],
+  providers: [
+  ]
+})
+
+export class EgAdminCommonModule {
+}
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/actor/actor.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/actor.module.ts
new file mode 100644 (file)
index 0000000..eef2506
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/actor.module.ts
@@ -0,0 +1,21 @@
+import {NgModule} from '@angular/core';
+import {EgAdminCommonModule} from '@eg/staff/admin/common.module';
+import {EgAdminServerActorRoutingModule} from './routing.module';
+import {StatCatSipFieldsComponent} from './stat_cat_sip_fields.component';
+
+@NgModule({
+  declarations: [
+      StatCatSipFieldsComponent
+  ],
+  imports: [
+    EgAdminCommonModule,
+    EgAdminServerActorRoutingModule
+  ],
+  providers: [
+  ]
+})
+
+export class EgAdminServerActorModule {
+}
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/actor/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/routing.module.ts
new file mode 100644 (file)
index 0000000..66acc97
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/routing.module.ts
@@ -0,0 +1,15 @@
+import {NgModule} from '@angular/core';
+import {RouterModule, Routes} from '@angular/router';
+import {StatCatSipFieldsComponent} from './stat_cat_sip_fields.component';
+
+const routes: Routes = [{
+  path: 'stat_cat_sip_fields',
+  component: StatCatSipFieldsComponent
+}];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+
+export class EgAdminServerActorRoutingModule {}

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/actor/stat_cat_sip_fields.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/stat_cat_sip_fields.component.ts
new file mode 100644 (file)
index 0000000..ae33053
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/actor/stat_cat_sip_fields.component.ts
@@ -0,0 +1,14 @@
+import {Component, OnInit} from '@angular/core';
+
+@Component({
+    template: `
+      <eg-staff-banner bannerText="Actor Stat Cat SIP Fields Configuration" i18n-bannerText>
+      </eg-staff-banner>
+      <eg-admin-page idlClass="actscsf" sortField="name">
+      </eg-admin-page>
+    `
+})
+
+export class StatCatSipFieldsComponent {}
+
+

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts
index 733ac8f..c099b0f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/login.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts
@@ -29,8 +29,6 @@ export class EgStaffLoginComponent implements OnInit {
     ) {}
 
     ngOnInit() {
-        console.debug('login ngOnInit()');
-
         // clear out any stale auth data
         this.auth.logout();
 

diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html
index 4d2fbcf..e3b60b3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/nav.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html
@@ -123,22 +123,82 @@
       </div>
     </div>
 
-
+    <!-- CATALOGING -->
+    
     <div class="navbar-nav">
       <div ngbDropdown class="nav-item dropdown">
         <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">
          Cataloging
         </a>
         <div class="dropdown-menu" ngbDropdownMenu>
+
+          <a href="/eg/staff/cat/catalog/index" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Search the Catalog</span>
+          </a>
           <a class="dropdown-item"
               routerLink="/staff/catalog/search">
             <span class="material-icons">search</span>
-            <span i18n>Search the Catalog</span>
+            <span i18n>Staff Catalog (Experimental)</span>
+          </a>
+          <a href="/eg/staff/cat/bucket/record/view" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Record Buckets</span>
+          </a>
+          <a href="/eg/staff/cat/bucket/copy/view" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Copy Buckets</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a href="/eg/staff/cat/catalog/retrieve_by_id" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Retrieve Bib Record by ID</span>
+          </a>
+          <a href="/eg/staff/cat/catalog/retrieve_by_tcn"
+            eg-accesskey="shift+f3" 
+            eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Retrieve Bib Record by TCN</span>
+          </a>
+          <a href="" ng-click="retrieveLastRecord()"
+            eg-accesskey="shift+f8" 
+            eg-accesskey-desc="Retrieve Last Bib Record" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Retrieve Last Bib Record</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a href="/eg/staff/cat/catalog/new_bib" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Create New MARC Record</span>
+          </a>
+          <a href="/eg/staff/cat/z3950/index" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Import Record from Z39.50</span>
+          </a>
+          <a href="/eg/staff/cat/catalog/vandelay" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>MARC Batch Import/Export</span>
+          </a>
+          <a href="/eg/staff/cat/catalog/batchEdit" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>MARC Batch Edit</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a href="/eg/staff/cat/catalog/verifyURLs" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Link Checker</span>
+          </a>
+          <div class="dropdown-divider"></div>
+          <a href="/eg/staff/cat/catalog/manageAuthorities" class="dropdown-item">
+            <span class="material-icons">thumb_up</span>
+            <span i18n>Manage Authorities</span>
           </a>
         </div>
       </div>
     </div>
 
+    <!-- ACQUISITIONS -->
+
     <div class="navbar-nav">
       <div ngbDropdown class="nav-item dropdown">
         <a ngbDropdownToggle i18n class="nav-link dropdown-toggle">