From a455ab8502b4795c789355293e173e1f64c738d8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 12 Apr 2018 21:26:18 +0000 Subject: [PATCH] LP#1626157 Ang5 file names best practices; more dialog stuff Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/src/app/core/README | 9 +++++---- Open-ILS/src/eg2/src/app/core/pcrud.ts | 2 +- Open-ILS/src/eg2/src/app/migration.module.ts | 16 +++++++++++++--- Open-ILS/src/eg2/src/app/routing.module.ts | 2 +- .../src/eg2/src/app/share/dialog/dialog.component.ts | 2 +- .../src/eg2/src/app/share/dialog/prompt.component.ts | 2 +- Open-ILS/src/eg2/src/app/share/hello-world.component.ts | 14 ++++++++++++++ .../src/app/staff/admin/workstation/routing.module.ts | 2 +- .../admin/workstation/workstations/routing.module.ts | 2 +- .../{app.component.html => workstations.component.html} | 0 .../{app.component.ts => workstations.component.ts} | 2 +- .../{app.module.ts => workstations.module.ts} | 2 +- .../{app.component.html => catalog.component.html} | 0 .../catalog/{app.component.ts => catalog.component.ts} | 4 ++-- .../staff/catalog/{app.module.ts => catalog.module.ts} | 4 ++-- .../staff/catalog/{app.service.ts => catalog.service.ts} | 0 .../eg2/src/app/staff/catalog/record/copies.component.ts | 2 +- .../src/app/staff/catalog/record/pagination.component.ts | 2 +- .../eg2/src/app/staff/catalog/record/record.component.ts | 2 +- .../src/eg2/src/app/staff/catalog/resolver.service.ts | 2 +- .../eg2/src/app/staff/catalog/result/facets.component.ts | 2 +- .../src/app/staff/catalog/result/pagination.component.ts | 2 +- .../eg2/src/app/staff/catalog/result/record.component.ts | 2 +- .../src/app/staff/catalog/result/results.component.ts | 2 +- Open-ILS/src/eg2/src/app/staff/catalog/routing.module.ts | 2 +- .../eg2/src/app/staff/catalog/search-form.component.ts | 2 +- .../{app.component.html => bcsearch.component.html} | 0 .../bcsearch/{app.component.ts => bcsearch.component.ts} | 2 +- .../bcsearch/{app.module.ts => bcsearch.module.ts} | 2 +- .../src/app/staff/circ/patron/bcsearch/routing.module.ts | 2 +- Open-ILS/src/eg2/src/app/staff/circ/routing.module.ts | 2 +- Open-ILS/src/eg2/src/app/staff/routing.module.ts | 4 ++-- .../app/staff/{app.component.css => staff.component.css} | 0 .../staff/{app.component.html => staff.component.html} | 0 .../app/staff/{app.component.ts => staff.component.ts} | 4 ++-- .../eg2/src/app/staff/{app.module.ts => staff.module.ts} | 2 +- Open-ILS/src/eg2/src/app/welcome.component.html | 4 ++-- 37 files changed, 65 insertions(+), 40 deletions(-) create mode 100644 Open-ILS/src/eg2/src/app/share/hello-world.component.ts rename Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/{app.component.html => workstations.component.html} (100%) rename Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/{app.component.ts => workstations.component.ts} (99%) rename Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/{app.module.ts => workstations.module.ts} (84%) rename Open-ILS/src/eg2/src/app/staff/catalog/{app.component.html => catalog.component.html} (100%) rename Open-ILS/src/eg2/src/app/staff/catalog/{app.component.ts => catalog.component.ts} (82%) rename Open-ILS/src/eg2/src/app/staff/catalog/{app.module.ts => catalog.module.ts} (92%) rename Open-ILS/src/eg2/src/app/staff/catalog/{app.service.ts => catalog.service.ts} (100%) rename Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/{app.component.html => bcsearch.component.html} (100%) rename Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/{app.component.ts => bcsearch.component.ts} (95%) rename Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/{app.module.ts => bcsearch.module.ts} (84%) rename Open-ILS/src/eg2/src/app/staff/{app.component.css => staff.component.css} (100%) rename Open-ILS/src/eg2/src/app/staff/{app.component.html => staff.component.html} (100%) rename Open-ILS/src/eg2/src/app/staff/{app.component.ts => staff.component.ts} (97%) rename Open-ILS/src/eg2/src/app/staff/{app.module.ts => staff.module.ts} (91%) diff --git a/Open-ILS/src/eg2/src/app/core/README b/Open-ILS/src/eg2/src/app/core/README index 58828bed85..3cf0ec4708 100644 --- a/Open-ILS/src/eg2/src/app/core/README +++ b/Open-ILS/src/eg2/src/app/core/README @@ -1,8 +1,9 @@ Core Angular services and assocated types/classes. -Core services are imported and exported by the base module, which means -they are automatically added as dependencies to ALL applications. +Core services are imported and exported by the base module and +automatically added as dependencies to ALL applications. -1. Only add services here that are universally required! -2. Avoid path navigation in the core services as paths will vary by application. +1. Only add services here that are universally required. +2. Avoid URL path navigation in the core services as paths will vary + by application. diff --git a/Open-ILS/src/eg2/src/app/core/pcrud.ts b/Open-ILS/src/eg2/src/app/core/pcrud.ts index e8a3ec5cf6..6a8dc7dcf9 100644 --- a/Open-ILS/src/eg2/src/app/core/pcrud.ts +++ b/Open-ILS/src/eg2/src/app/core/pcrud.ts @@ -8,7 +8,7 @@ import {EgAuthService} from './auth'; declare var js2JSON: (jsThing:any) => string; declare var OpenSRF: any; // creating sessions -export interface EgPcrudReqOps { +interface EgPcrudReqOps { authoritative?: boolean; anonymous?: boolean; idlist?: boolean; diff --git a/Open-ILS/src/eg2/src/app/migration.module.ts b/Open-ILS/src/eg2/src/app/migration.module.ts index bf3bd6966a..92cec105e6 100644 --- a/Open-ILS/src/eg2/src/app/migration.module.ts +++ b/Open-ILS/src/eg2/src/app/migration.module.ts @@ -31,7 +31,8 @@ import {EgPcrudService} from '@eg/core/pcrud'; import {EgOrgService} from '@eg/core/org'; // Downgraded components -//import {EgConfirmDialogComponent} from '@eg/share/confirm-dialog.component'; +//import {EgDialogComponent} from '@eg/share/dialog/dialog.component'; +//import {EgConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {EgHelloWorldComponent} from '@eg/share/hello-world.component'; declare var angular: any; @@ -44,10 +45,15 @@ declare var angular: any; CookieModule.forRoot(), EgCommonModule.forRoot() ], - declarations: [EgHelloWorldComponent], + declarations: [ + EgHelloWorldComponent, + //EgDialogComponent, + //EgConfirmDialogComponent + ], entryComponents: [ EgHelloWorldComponent, - //EgConfirmDialogComponent // declared in EgCommonModule + //EgDialogComponent, + //EgConfirmDialogComponent ] }) @@ -77,6 +83,10 @@ export class EgMigrationModule { .factory('ng2Title', downgradeInjectable(Title)) .directive('eg2HelloWorld', downgradeComponent({component: EgHelloWorldComponent})) + /* + .directive('eg2ConfirmDialog', + downgradeComponent({component: EgConfirmDialogComponent})) + */ ; diff --git a/Open-ILS/src/eg2/src/app/routing.module.ts b/Open-ILS/src/eg2/src/app/routing.module.ts index a1547f824f..594521303f 100644 --- a/Open-ILS/src/eg2/src/app/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/routing.module.ts @@ -16,7 +16,7 @@ const routes: Routes = [ }, { path: 'staff', resolve : {startup : EgBaseResolver}, - loadChildren: './staff/app.module#EgStaffModule' + loadChildren: './staff/staff.module#EgStaffModule' } ]; diff --git a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts index 27828058fc..397a6db4a7 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/dialog.component.ts @@ -8,7 +8,7 @@ import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; */ @Component({ - selector: 'eg-component', + selector: 'eg-dialog', template: '' }) export class EgDialogComponent { diff --git a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts index abf96ece0a..179efeb6bc 100644 --- a/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts +++ b/Open-ILS/src/eg2/src/app/share/dialog/prompt.component.ts @@ -7,7 +7,7 @@ import {EgDialogComponent} from '@eg/share/dialog/dialog.component'; }) /** - * Promptation dialog that asks a yes/no question. + * Promptation dialog that requests user input. */ export class EgPromptDialogComponent extends EgDialogComponent { // What question are we asking? diff --git a/Open-ILS/src/eg2/src/app/share/hello-world.component.ts b/Open-ILS/src/eg2/src/app/share/hello-world.component.ts new file mode 100644 index 0000000000..92daf1ccfa --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/hello-world.component.ts @@ -0,0 +1,14 @@ +import {Component, Input} from '@angular/core'; + +@Component({ + selector: 'eg-hello-world', + template: ` +
Hello, World {{message}}!
+ ` +}) +export class EgHelloWorldComponent { + @Input() public message: string; + constructor() {} +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts index 114c312f3d..bd300d7a2b 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/routing.module.ts @@ -3,7 +3,7 @@ import {RouterModule, Routes} from '@angular/router'; const routes: Routes = [{ path: 'workstations', - loadChildren: '@eg/staff/admin/workstation/workstations/app.module#ManageWorkstationsModule' + loadChildren: '@eg/staff/admin/workstation/workstations/workstations.module#ManageWorkstationsModule' }]; @NgModule({ diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/routing.module.ts index f1ac37ed0c..a29f19b686 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {WorkstationsComponent} from './app.component'; +import {WorkstationsComponent} from './workstations.component'; // Note that we need a path value (e.g. 'manage') because without it // there is nothing for the router to match, unless we rely on the parent diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.component.html b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.component.html rename to Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.html diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts similarity index 99% rename from Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.component.ts rename to Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts index 2e04c35977..690a485e62 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.component.ts @@ -17,7 +17,7 @@ interface Workstation { } @Component({ - templateUrl: 'app.component.html' + templateUrl: 'workstations.component.html' }) export class WorkstationsComponent implements OnInit { diff --git a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.module.ts similarity index 84% rename from Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.module.ts rename to Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.module.ts index 00d9593f3b..064b24dd45 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/app.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/workstation/workstations/workstations.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {EgStaffCommonModule} from '@eg/staff/common.module'; import {WorkstationsRoutingModule} from './routing.module'; -import {WorkstationsComponent} from './app.component'; +import {WorkstationsComponent} from './workstations.component'; @NgModule({ declarations: [ diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/app.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.component.html similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/catalog/app.component.html rename to Open-ILS/src/eg2/src/app/staff/catalog/catalog.component.html diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/app.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.component.ts similarity index 82% rename from Open-ILS/src/eg2/src/app/staff/catalog/app.component.ts rename to Open-ILS/src/eg2/src/app/staff/catalog/catalog.component.ts index 8fffa13ed2..0324ed406b 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/app.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit} from '@angular/core'; -import {StaffCatalogService} from './app.service'; +import {StaffCatalogService} from './catalog.service'; @Component({ - templateUrl: 'app.component.html' + templateUrl: 'catalog.component.html' }) export class EgCatalogComponent implements OnInit { diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/app.module.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts similarity index 92% rename from Open-ILS/src/eg2/src/app/staff/catalog/app.module.ts rename to Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts index fbcf894586..80a1499746 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/app.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts @@ -4,7 +4,7 @@ import {EgUnapiService} from '@eg/share/unapi'; import {EgCatalogRoutingModule} from './routing.module'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; -import {EgCatalogComponent} from './app.component'; +import {EgCatalogComponent} from './catalog.component'; import {SearchFormComponent} from './search-form.component'; import {ResultsComponent} from './result/results.component'; import {RecordComponent} from './record/record.component'; @@ -13,7 +13,7 @@ import {EgBibSummaryComponent} from '../share/bib-summary.component'; import {ResultPaginationComponent} from './result/pagination.component'; import {ResultFacetsComponent} from './result/facets.component'; import {ResultRecordComponent} from './result/record.component'; -import {StaffCatalogService} from './app.service'; +import {StaffCatalogService} from './catalog.service'; import {RecordPaginationComponent} from './record/pagination.component'; @NgModule({ diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/app.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/catalog/app.service.ts rename to Open-ILS/src/eg2/src/app/staff/catalog/catalog.service.ts diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts index b8e05f0baa..cae7920175 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, Input} from '@angular/core'; import {EgNetService} from '@eg/core/net'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; import {Pager} from '@eg/share/util/pager'; import {EgOrgService} from '@eg/core/org'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/pagination.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/pagination.component.ts index a7535f6514..31fee2cde6 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/pagination.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/pagination.component.ts @@ -3,7 +3,7 @@ import {Router} from '@angular/router'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext} from '@eg/share/catalog/search-context'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; import {Pager} from '@eg/share/util/pager'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts index 78552eb443..61e5759cd8 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/record.component.ts @@ -5,7 +5,7 @@ import {EgIdlObject} from '@eg/core/idl'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; import {EgBibSummaryComponent} from '../../share/bib-summary.component'; @Component({ diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts index 45fc8c5927..8452323a94 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/resolver.service.ts @@ -8,7 +8,7 @@ import {EgOrgService} from '@eg/core/org'; import {EgAuthService} from '@eg/core/auth'; import {EgPcrudService} from '@eg/core/pcrud'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; -import {StaffCatalogService} from './app.service'; +import {StaffCatalogService} from './catalog.service'; @Injectable() export class EgCatalogResolver implements Resolve> { diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/facets.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/facets.component.ts index 8101ceda01..be689686c4 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/facets.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/facets.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit, Input} from '@angular/core'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext, FacetFilter} from '@eg/share/catalog/search-context'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; export const FACET_CONFIG = { display: [ diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/pagination.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/pagination.component.ts index 8dbb4d84c9..189fbced81 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/pagination.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/pagination.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit, Input} from '@angular/core'; import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext} from '@eg/share/catalog/search-context'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; @Component({ selector: 'eg-catalog-result-pagination', diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts index beee4cfbb0..cf903f56c2 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/record.component.ts @@ -5,7 +5,7 @@ import {EgCatalogService} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext} from '@eg/share/catalog/search-context'; import {EgNetService} from '@eg/core/net'; import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; @Component({ selector: 'eg-catalog-result-record', diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts index ff2d36ce29..ff9c259a25 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/result/results.component.ts @@ -7,7 +7,7 @@ import {EgCatalogUrlService} from '@eg/share/catalog/catalog-url.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; import {EgPcrudService} from '@eg/core/pcrud'; -import {StaffCatalogService} from '../app.service'; +import {StaffCatalogService} from '../catalog.service'; import {EgIdlObject} from '@eg/core/idl'; @Component({ diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/catalog/routing.module.ts index 9125c9d7eb..2376f80cb4 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {EgCatalogComponent} from './app.component'; +import {EgCatalogComponent} from './catalog.component'; import {ResultsComponent} from './result/results.component'; import {RecordComponent} from './record/record.component'; import {EgCatalogResolver} from './resolver.service'; diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts index 9e5b807593..615e608f34 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts @@ -4,7 +4,7 @@ import {EgOrgService} from '@eg/core/org'; import {EgCatalogService,} from '@eg/share/catalog/catalog.service'; import {CatalogSearchContext, CatalogSearchState} from '@eg/share/catalog/search-context'; -import {StaffCatalogService} from './app.service'; +import {StaffCatalogService} from './catalog.service'; @Component({ selector: 'eg-catalog-search-form', diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.html similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.component.html rename to Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.html diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts similarity index 95% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.component.ts rename to Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts index 294a88e3c8..35e9e85a78 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts @@ -4,7 +4,7 @@ import {EgNetService} from '@eg/core/net'; import {EgAuthService} from '@eg/core/auth'; @Component({ - templateUrl: 'app.component.html' + templateUrl: 'bcsearch.component.html' }) export class EgBcSearchComponent implements OnInit { diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.module.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.module.ts similarity index 84% rename from Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.module.ts rename to Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.module.ts index bb5f6881fb..cbb97b54be 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/app.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {EgStaffCommonModule} from '@eg/staff/common.module'; import {EgBcSearchRoutingModule} from './routing.module'; -import {EgBcSearchComponent} from './app.component'; +import {EgBcSearchComponent} from './bcsearch.component'; @NgModule({ declarations: [ diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/routing.module.ts index a8c5a040d7..82f8a8bfc2 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/routing.module.ts @@ -1,6 +1,6 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; -import {EgBcSearchComponent} from './app.component'; +import {EgBcSearchComponent} from './bcsearch.component'; const routes: Routes = [ { path: '', diff --git a/Open-ILS/src/eg2/src/app/staff/circ/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/circ/routing.module.ts index a61417a923..969decd546 100644 --- a/Open-ILS/src/eg2/src/app/staff/circ/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/circ/routing.module.ts @@ -5,7 +5,7 @@ const routes: Routes = [ { path: 'patron', children: [{ path: 'bcsearch', - loadChildren: '@eg/staff/circ/patron/bcsearch/app.module#EgBcSearchModule' + loadChildren: '@eg/staff/circ/patron/bcsearch/bcsearch.module#EgBcSearchModule' }] } ]; diff --git a/Open-ILS/src/eg2/src/app/staff/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/routing.module.ts index a25baf9f23..49a04a35c7 100644 --- a/Open-ILS/src/eg2/src/app/staff/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/routing.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; import {EgStaffResolver} from './resolver.service'; -import {EgStaffComponent} from './app.component'; +import {EgStaffComponent} from './staff.component'; import {EgStaffLoginComponent} from './login.component'; import {EgStaffSplashComponent} from './splash.component'; @@ -28,7 +28,7 @@ const routes: Routes = [{ loadChildren : '@eg/staff/circ/routing.module#EgCircRoutingModule' }, { path: 'catalog', - loadChildren : '@eg/staff/catalog/app.module#EgCatalogModule' + loadChildren : '@eg/staff/catalog/catalog.module#EgCatalogModule' }, { path: 'admin', loadChildren : '@eg/staff/admin/routing.module#EgAdminRoutingModule' diff --git a/Open-ILS/src/eg2/src/app/staff/app.component.css b/Open-ILS/src/eg2/src/app/staff/staff.component.css similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/app.component.css rename to Open-ILS/src/eg2/src/app/staff/staff.component.css diff --git a/Open-ILS/src/eg2/src/app/staff/app.component.html b/Open-ILS/src/eg2/src/app/staff/staff.component.html similarity index 100% rename from Open-ILS/src/eg2/src/app/staff/app.component.html rename to Open-ILS/src/eg2/src/app/staff/staff.component.html diff --git a/Open-ILS/src/eg2/src/app/staff/app.component.ts b/Open-ILS/src/eg2/src/app/staff/staff.component.ts similarity index 97% rename from Open-ILS/src/eg2/src/app/staff/app.component.ts rename to Open-ILS/src/eg2/src/app/staff/staff.component.ts index f4bf36fe8d..864beab8eb 100644 --- a/Open-ILS/src/eg2/src/app/staff/app.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/staff.component.ts @@ -4,8 +4,8 @@ import {EgAuthService, EgAuthWsState} from '@eg/core/auth'; import {EgNetService} from '@eg/core/net'; @Component({ - templateUrl: 'app.component.html', - styleUrls: ['app.component.css'] + templateUrl: 'staff.component.html', + styleUrls: ['staff.component.css'] }) export class EgStaffComponent implements OnInit { diff --git a/Open-ILS/src/eg2/src/app/staff/app.module.ts b/Open-ILS/src/eg2/src/app/staff/staff.module.ts similarity index 91% rename from Open-ILS/src/eg2/src/app/staff/app.module.ts rename to Open-ILS/src/eg2/src/app/staff/staff.module.ts index dfdd41b512..52f6abdd31 100644 --- a/Open-ILS/src/eg2/src/app/staff/app.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/staff.module.ts @@ -1,7 +1,7 @@ import {NgModule} from '@angular/core'; import {EgStaffCommonModule} from '@eg/staff/common.module'; -import {EgStaffComponent} from './app.component'; +import {EgStaffComponent} from './staff.component'; import {EgStaffRoutingModule} from './routing.module'; import {EgStaffNavComponent} from './nav.component'; import {EgStaffLoginComponent} from './login.component'; diff --git a/Open-ILS/src/eg2/src/app/welcome.component.html b/Open-ILS/src/eg2/src/app/welcome.component.html index 3ce97cc247..eaa1c71896 100644 --- a/Open-ILS/src/eg2/src/app/welcome.component.html +++ b/Open-ILS/src/eg2/src/app/welcome.component.html @@ -5,7 +5,7 @@

- But maybe you meant to go to the staff page - or the catalog. + But maybe you meant to go to the + staff page

-- 2.11.0