From: Bill Erickson Date: Thu, 1 Aug 2019 14:36:06 +0000 (-0400) Subject: LP1837059 Address alert config help text X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9cb7a6b2000c4691f67012da339b19c14d3ef56d;p=evergreen%2Fequinox.git LP1837059 Address alert config help text Support passing a helpTemplate value to the staff admin page builder. Create an Address Alert component so it may define and pass its own help text to the admin page builder. Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html new file mode 100644 index 0000000000..892a465375 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html @@ -0,0 +1,17 @@ + + +
    +
  • Address Alert fields support regular expressions and are case-insensitive by default.
  • +
  • Example wildcard match: 742 Evergr.*n Terrace
  • +
  • Example case-sensitive match: (?c)742 Evergr.*n Terrace
  • +
  • If the billing or mailing address fields are selected, the + tested address must be a billing or mailing address to match.
  • +
+
+ + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts new file mode 100644 index 0000000000..56d37d3686 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.ts @@ -0,0 +1,13 @@ +import {Component, OnInit, ViewChild, TemplateRef} from '@angular/core'; + +@Component({ + templateUrl: './address-alert.component.html' +}) + +export class AddressAlertComponent { + + @ViewChild('helpTemplate') helpTemplate: TemplateRef; + + constructor() {} +} + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts index a18d3e6de6..c2b5041962 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-local.module.ts @@ -4,10 +4,12 @@ import {StaffCommonModule} from '@eg/staff/common.module'; import {AdminLocalRoutingModule} from './routing.module'; import {AdminCommonModule} from '@eg/staff/admin/common.module'; import {AdminLocalSplashComponent} from './admin-local-splash.component'; +import {AddressAlertComponent} from './address-alert.component'; @NgModule({ declarations: [ - AdminLocalSplashComponent + AdminLocalSplashComponent, + AddressAlertComponent ], imports: [ AdminCommonModule, diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts index c46dec9431..12030dde0f 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/local/routing.module.ts @@ -2,6 +2,7 @@ import {NgModule} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; import {AdminLocalSplashComponent} from './admin-local-splash.component'; import {BasicAdminPageComponent} from '@eg/staff/admin/basic-admin-page.component'; +import {AddressAlertComponent} from './address-alert.component'; const routes: Routes = [{ path: 'splash', @@ -11,6 +12,9 @@ const routes: Routes = [{ component: BasicAdminPageComponent, data: [{schema: 'config', table: 'hold_matrix_matchpoint', disableOrgFilter: true}] }, { + path: 'actor/address_alert', + component: AddressAlertComponent +}, { path: ':schema/:table', component: BasicAdminPageComponent }]; diff --git a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html index ab6c263249..a69dabd001 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/admin-page/admin-page.component.html @@ -24,6 +24,10 @@ + + + + ; + @ViewChild('grid') grid: GridComponent; @ViewChild('editDialog') editDialog: FmRecordEditorComponent; @ViewChild('successString') successString: StringComponent;