LP#1942220: tweaks to order identifer handling

- sort order ident types alphabetically
- set 024 ind1 correctly when creating a brief record

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts
index fa82cec..3d5912e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts
@@ -79,7 +79,11 @@ export class BriefRecordComponent implements OnInit {
 
             // Append fields to the document
             dfNode.setAttribute('tag', '' + tags[0]);
-            dfNode.setAttribute('ind1', ' ');
+            if (attr.code() === 'upc') {
+                dfNode.setAttribute('ind1', '1');
+            } else {
+                dfNode.setAttribute('ind1', ' ');
+            }
             dfNode.setAttribute('ind2', ' ');
             sfNode.setAttribute('code', '' + subfields[0]);
             const tNode = doc.createTextNode(value);

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
index 974389c..7f34a73 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html
@@ -402,16 +402,16 @@
                     title="Order Identifier Type" i18n-title [disabled]="!canEditIdent(li)"
                     [ngClass]="{'btn-warning': !selectedIdent(li)}">
                     <ng-container *ngIf="orderIdentTypes[li.id()]=='isbn'" i18n>ISBN</ng-container>
-                    <ng-container *ngIf="orderIdentTypes[li.id()]=='upc'" i18n>UPC</ng-container>
                     <ng-container *ngIf="orderIdentTypes[li.id()]=='issn'" i18n>ISSN</ng-container>
+                    <ng-container *ngIf="orderIdentTypes[li.id()]=='upc'" i18n>UPC</ng-container>
                   </button>
                   <div ngbDropdownMenu>
                     <button class="btn-sm" ngbDropdownItem
                       (click)="orderIdentTypes[li.id()]='isbn'" i18n>ISBN</button>
                     <button class="btn-sm" ngbDropdownItem
-                      (click)="orderIdentTypes[li.id()]='upc'" i18n>UPC</button>
-                    <button class="btn-sm" ngbDropdownItem
                       (click)="orderIdentTypes[li.id()]='issn'" i18n>ISSN</button>
+                    <button class="btn-sm" ngbDropdownItem
+                      (click)="orderIdentTypes[li.id()]='upc'" i18n>UPC</button>
                   </div>
                 </div>
               </div>