Holdings Subfield tab
authorMike Rylander <mrylander@gmail.com>
Wed, 25 Mar 2020 20:08:17 +0000 (16:08 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Wed, 25 Mar 2020 21:39:46 +0000 (17:39 -0400)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
foo

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.module.ts
Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html [new file with mode: 0644]
Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts [new file with mode: 0644]
Open-ILS/src/eg2/src/app/staff/acq/provider/provider-record.service.ts

index 28c3ca2..0534127 100644 (file)
@@ -8750,6 +8750,7 @@ SELECT  usr,
                        <field reporter:label="Default # Copies" name="default_copy_count" reporter:datatype="int" />
                        <field reporter:label="Contacts" name="contacts" oils_persist:virtual="true" reporter:datatype="link" />
                        <field reporter:label="Notes" name="provider_notes" oils_persist:virtual="true" reporter:datatype="link" />
+                       <field reporter:label="Holdings Subfields" name="holdings_subfields" oils_persist:virtual="true" reporter:datatype="link" />
                </fields>
                <links>
                        <link field="currency_type" reltype="has_a" key="code" map="" class="acqct"/>
@@ -8759,6 +8760,7 @@ SELECT  usr,
             <link field="edi_default" reltype="has_a" map="" key="id" class="acqedi"/>
                        <link field="default_claim_policy" reltype="has_a" map="" key="id" class="acqclp"/>
                        <link field="provider_notes" reltype="has_many" map="" key="provider" class="acqpron"/>
+                       <link field="holdings_subfields" reltype="has_many" map="" key="provider" class="acqphsm"/>
                </links>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
             <actions>
index a0356ee..8a92b77 100644 (file)
@@ -43,7 +43,9 @@
         <ng-template ngbTabContent>PROVIDER ATTRIBUTES TAB</ng-template>
       </ngb-tab>
       <ngb-tab title="Holdings Definitions" i18n-title id="holdings" [disabled]="!id">
-        <ng-template ngbTabContent>PROVIDER HOLDINGS TAB</ng-template>
+        <ng-template ngbTabContent>
+          <eg-provider-holdings></eg-provider-holdings>
+        </ng-template>
       </ngb-tab>
       <ngb-tab title="EDI" i18n-title id="edi_accounts" [disabled]="!id">
         <ng-template ngbTabContent>PROVIDER EDI TAB</ng-template>
index a8a6925..aa52908 100644 (file)
@@ -7,6 +7,7 @@ import {AcqProviderSummaryPaneComponent} from './summary-pane.component';
 import {ProviderResultsComponent} from './provider-results.component';
 import {ProviderAddressesComponent} from './provider-addresses.component';
 import {ProviderContactsComponent} from './provider-contacts.component';
+import {ProviderHoldingsComponent} from './provider-holdings.component';
 import {ProviderInvoicesComponent} from './provider-invoices.component';
 import {ProviderPurchaseOrdersComponent} from './provider-purchase-orders.component';
 import {OrgFamilySelectModule} from '@eg/share/org-family-select/org-family-select.module';
@@ -21,6 +22,7 @@ import {ProviderRecordService} from './provider-record.service';
     ProviderResultsComponent,
     ProviderAddressesComponent,
     ProviderContactsComponent,
+    ProviderHoldingsComponent,
     ProviderInvoicesComponent,
     ProviderPurchaseOrdersComponent,
     AcqProviderSummaryPaneComponent
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.html
new file mode 100644 (file)
index 0000000..2caac69
--- /dev/null
@@ -0,0 +1,46 @@
+<eg-string #createString i18n-text text="New Provider Holdings Subfield Added"></eg-string>
+<eg-string #createErrString i18n-text text="Failed to Create New Provider Holdings Subfield"></eg-string>
+<eg-string #successString i18n-text text="Provider Holdings Subfield Update Succeeded"></eg-string>
+<eg-string #updateFailedString i18n-text text="Provider Holdings Subfield Update Failed"></eg-string>
+<eg-string #deleteFailedString i18n-text text="Delete of Provider Holdings Subfield failed or was not allowed"></eg-string>
+<eg-string #deleteSuccessString i18n-text text="Delete of Provider Holdings Subfield succeeded"></eg-string>
+
+<eg-grid #acqProviderHoldingsGrid
+  persistKey="acq.provider.holdings.grid"
+  idlClass="acqphsm" [dataSource]="gridSource"
+  [sortable]="true"
+  hideFields="provider"
+  [cellTextGenerator]="cellTextGenerator">
+
+  <eg-grid-toolbar-button label="New Holdings Subfield" i18n-label (onClick)="createNew()"></eg-grid-toolbar-button>
+  <eg-grid-toolbar-action label="Edit Selected" i18n-label (onClick)="editSelected($event)"></eg-grid-toolbar-action>
+  <eg-grid-toolbar-action label="Delete Selected" i18n-label (onClick)="deleteSelected($event)"></eg-grid-toolbar-action>
+
+</eg-grid>
+
+<ng-template #nameTemplate let-field="field" let-record="record">
+  <eg-combobox
+    [startId]="record[field.name]()"
+    [required]="field.isRequired()"
+    (onChange)="record[field.name]($event)"
+    [allowFreeText]="false">
+    <eg-combobox-entry entryId="quantity" entryLabel="Quantity" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="estimated_price" entryLabel="Estimated Price" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="owning_lib" entryLabel="Owning Lib" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="call_number" entryLabel="Call Number" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="fund_code" entryLabel="Fund Code" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="circ_modifier" entryLabel="Circulation Modifier" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="note" entryLabel="Note" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="copy_location" entryLabel="Copy Location" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="barcode" entryLabel="Barcode" i18n-entryLabel></eg-combobox-entry>
+    <eg-combobox-entry entryId="collection_code" entryLabel="Collection Code" i18n-entryLabel></eg-combobox-entry>
+  </eg-combobox>
+</ng-template>
+
+<eg-fm-record-editor #editDialog
+  idlClass="acqphsm"
+  readonlyFields="id,provider"
+  [fieldOptions]="{name:{customTemplate:{template:nameTemplate}}}"
+  fieldOrder="id,provider,name,subfield">
+</eg-fm-record-editor>
+
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-holdings.component.ts
new file mode 100644 (file)
index 0000000..55007e9
--- /dev/null
@@ -0,0 +1,178 @@
+import {Component, OnInit, AfterViewInit, Input, ViewChild} from '@angular/core';
+import {empty, throwError, Observable, from} from 'rxjs';
+import {map} from 'rxjs/operators';
+import {Router, ActivatedRoute, ParamMap} from '@angular/router';
+import {Pager} from '@eg/share/util/pager';
+import {IdlService, IdlObject} from '@eg/core/idl.service';
+import {NetService} from '@eg/core/net.service';
+import {AuthService} from '@eg/core/auth.service';
+import {GridComponent} from '@eg/share/grid/grid.component';
+import {GridDataSource, GridCellTextGenerator} from '@eg/share/grid/grid';
+import {ProviderRecordService} from './provider-record.service';
+import {AcqProviderSearchFormComponent} from './acq-provider-search-form.component';
+import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component';
+import {StringComponent} from '@eg/share/string/string.component';
+import {ToastService} from '@eg/share/toast/toast.service';
+
+
+@Component({
+  selector: 'eg-provider-holdings',
+  templateUrl: 'provider-holdings.component.html',
+})
+export class ProviderHoldingsComponent implements OnInit, AfterViewInit {
+
+    @Input() providerId: any;
+    holdings: any[] = [];
+
+    gridSource: GridDataSource;
+    @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent;
+    @ViewChild('acqProviderHoldingsGrid', { static: true }) providerHoldingsGrid: GridComponent;
+    @ViewChild('successString', { static: true }) successString: StringComponent;
+    @ViewChild('createString', { static: false }) createString: StringComponent;
+    @ViewChild('createErrString', { static: false }) createErrString: StringComponent;
+    @ViewChild('updateFailedString', { static: false }) updateFailedString: StringComponent;
+    @ViewChild('deleteFailedString', { static: true }) deleteFailedString: StringComponent;
+    @ViewChild('deleteSuccessString', { static: true }) deleteSuccessString: StringComponent;
+
+    cellTextGenerator: GridCellTextGenerator;
+    provider: IdlObject;
+
+    canCreate: boolean;
+    canDelete: boolean;
+    deleteSelected: (rows: IdlObject[]) => void;
+
+    permissions: {[name: string]: boolean};
+
+    // Size of create/edito dialog.  Uses large by default.
+    @Input() dialogSize: 'sm' | 'lg' = 'lg';
+
+    constructor(
+        private router: Router,
+        private route: ActivatedRoute,
+        private net: NetService,
+        private auth: AuthService,
+        private idl: IdlService,
+        private providerRecord: ProviderRecordService,
+        private toast: ToastService) {
+
+    }
+
+    ngOnInit() {
+        this.gridSource = this.getDataSource()
+        this.cellTextGenerator = {};
+        this.deleteSelected = (idlThings: IdlObject[]) => {
+            idlThings.forEach(idlThing => idlThing.isdeleted(true));
+            this.providerRecord.batchUpdate(idlThings).subscribe(
+                val => {
+                    console.debug('deleted: ' + val);
+                    this.deleteSuccessString.current()
+                        .then(str => this.toast.success(str));
+                },
+                err => {
+                    this.deleteFailedString.current()
+                        .then(str => this.toast.danger(str));
+                },
+                ()  => {
+                    this.providerRecord.refreshCurrent().then(
+                        () => this.providerHoldingsGrid.reload()
+                    );
+                }
+            );
+        };
+        this.providerHoldingsGrid.onRowActivate.subscribe(
+            (idlThing: IdlObject) => this.showEditDialog(idlThing)
+        );
+    }
+
+    ngAfterViewInit() {
+        console.log('this.providerRecord',this.providerRecord);
+    }
+
+    getDataSource(): GridDataSource {
+        const gridSource = new GridDataSource();
+
+        gridSource.getRows = (pager: Pager, sort: any[]) => {
+            this.provider = this.providerRecord.current();
+            if (!this.provider) {
+                return empty();
+            }
+            let holdings = this.provider.holdings_subfields()
+
+            if (sort.length > 0) {
+                holdings = holdings.sort((a, b) => {
+                    for (let i = 0; i < sort.length; i++) {
+                        let lt = -1;
+                        let sfield = sort[i].name;
+                        if (sort[i].dir.substring(0,1).toLowerCase() === 'd') {
+                            lt *= -1;
+                        }
+                        if (a[sfield]() < b[sfield]()) { return lt }
+                        if (a[sfield]() > b[sfield]()) { return lt * -1 }
+                    }
+                    return 0;
+                });
+
+            }
+
+            return from(holdings.slice(pager.offset, pager.offset + pager.limit - 1));
+        };
+        return gridSource;
+    }
+
+    showEditDialog(providerHolding: IdlObject): Promise<any> {
+        this.editDialog.mode = 'update';
+        this.editDialog.recordId = providerHolding['id']();
+        return new Promise((resolve, reject) => {
+            this.editDialog.open({size: this.dialogSize}).subscribe(
+                result => {
+                    this.successString.current()
+                        .then(str => this.toast.success(str));
+                    this.providerRecord.refreshCurrent().then(
+                        () => this.providerHoldingsGrid.reload()
+                    );
+                    resolve(result);
+                },
+                error => {
+                    this.updateFailedString.current()
+                        .then(str => this.toast.danger(str));
+                    reject(error);
+                }
+            );
+        });
+    }
+
+    editSelected(providerHoldingsFields: IdlObject[]) {
+        // Edit each IDL thing one at a time
+        const editOneThing = (providerHoldings: IdlObject) => {
+            if (!providerHoldings) { return; }
+
+            this.showEditDialog(providerHoldings).then(
+                () => editOneThing(providerHoldingsFields.shift()));
+        };
+
+        editOneThing(providerHoldingsFields.shift());
+    }
+
+    createNew() {
+        this.editDialog.mode = 'create';
+        const holdings = this.idl.create('acqphsm');
+        holdings.provider(this.provider.id());
+        this.editDialog.record = holdings;
+        this.editDialog.recordId = null;
+        this.editDialog.open({size: this.dialogSize}).subscribe(
+            ok => {
+                this.createString.current()
+                    .then(str => this.toast.success(str));
+                this.providerRecord.refreshCurrent().then(
+                    () => this.providerHoldingsGrid.reload()
+                );
+            },
+            rejection => {
+                if (!rejection.dismissed) {
+                    this.createErrString.current()
+                        .then(str => this.toast.danger(str));
+                }
+            }
+        );
+    }
+}
index 49893ed..4ab5c89 100644 (file)
@@ -39,9 +39,10 @@ export class ProviderRecordService {
         return this.pcrud.search('acqpro', { id: id },
             {
                 flesh: 3,
-                flesh_fields: { acqpro: ['contacts', 'addresses', 'provider_notes'],
+                flesh_fields: { acqpro: ['holdings_subfields', 'contacts', 'addresses', 'provider_notes'],
                                 acqpa:  ['provider'],
                                 acqpc:  ['provider'],
+                                acqphsm:['provider'],
                               }
             },
             {}