Merge branch 'April-release'

ExLibrisGroup · Apr 14, 2022 · 95c9ea5 · 95c9ea5
2 parents 4b06df9 + f987b07
commit 95c9ea5
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 55 deletions.
diff --git a/cloudapp/src/app/catalog/results-types/name.ts b/cloudapp/src/app/catalog/results-types/name.ts
@@ -110,7 +110,7 @@ export class NameFullDisplay extends IDisplayLines {
             fieldsArray.push(new ViewFieldBuilder().label("Create date: ").content(this.dateFormatDisplay(this.record.CRTDT)).build());
             fieldsArray.push(new ViewFieldBuilder().label("Creating institution: ").content(this.record.CRTFA).build());
             fieldsArray.push(new ViewFieldBuilder().label("Update date: ").content(this.dateFormatDisplay(this.record.RNWDT)).build());
-            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").content(this.record.RNWFA).build());
+            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").link(SearchType.Members).content(this.record.RNWFA).build());
         this.addLine(new ViewFieldBuilder().build(), fieldsArray);
         fieldsArray = new Array<ViewField>()
             fieldsArray.push(new ViewFieldBuilder().content(this.record.ID).build());

diff --git a/cloudapp/src/app/catalog/results-types/serials.ts b/cloudapp/src/app/catalog/results-types/serials.ts
@@ -230,7 +230,7 @@ export class SerialFullDisplay extends IDisplayLines {
             fieldsArray.push(new ViewFieldBuilder().label("Create date: ").content(this.dateFormatDisplay(this.record.CRTDT)).build());
             fieldsArray.push(new ViewFieldBuilder().label("Creating institution: ").content(this.record.CRTFA).build());
             fieldsArray.push(new ViewFieldBuilder().label("Update date: ").content(this.dateFormatDisplay(this.record.RNWDT)).build());
-            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").content(this.record.RNWFA).build());
+            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").link(SearchType.Members).content(this.record.RNWFA).build());
         this.addLine(new ViewFieldBuilder().build(), fieldsArray);
         fieldsArray = new Array<ViewField>()
             fieldsArray.push(new ViewFieldBuilder().content(this.record.ID).build());

diff --git a/cloudapp/src/app/catalog/results-types/uniformTitle.ts b/cloudapp/src/app/catalog/results-types/uniformTitle.ts
@@ -114,7 +114,7 @@ export class UniformTitleFullDisplay extends IDisplayLines {
             fieldsArray.push(new ViewFieldBuilder().label("Create date: ").content(this.dateFormatDisplay(this.record.CRTDT)).build());
             fieldsArray.push(new ViewFieldBuilder().label("Creating institution: ").content(this.record.CRTFA).build());
             fieldsArray.push(new ViewFieldBuilder().label("Update date: ").content(this.dateFormatDisplay(this.record.RNWDT)).build());
-            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").content(this.record.RNWFA).build());
+            fieldsArray.push(new ViewFieldBuilder().label("Modifying institution: ").link(SearchType.Members).content(this.record.RNWFA).build());
         this.addLine(new ViewFieldBuilder().build(), fieldsArray);
         fieldsArray = new Array<ViewField>()
             fieldsArray.push(new ViewFieldBuilder().content(this.record.ID).build());

diff --git a/cloudapp/src/app/user-controls/full-view-display/full-view-display.component.html b/cloudapp/src/app/user-controls/full-view-display/full-view-display.component.html
@@ -1,6 +1,5 @@
 <div class="full-view-record">
   <ng-container *ngFor="let line of resultFullDisplay;index as i ">
-    <!-- <div *ngFor="let line of resultFullDisplay;index as i" class="full-view-line {{isEvenRow(i)}}"> -->
     <div class="full-view-line-header {{isEvenRow(i)}}">
       {{line.getHeaderLabel() | translate}}
     </div>
@@ -9,14 +8,23 @@
         <div class="full-view-line-field-label" *ngIf="field.hasLabel()">
           {{field.getLabel() | translate}}
         </div>
-        <a *ngIf="field.isInternalLink() else noLink" (click)="onFullViewLink(field.getLink(), field.getContent())">
-          {{field.getContent()}}
-        </a>
+        <div *ngIf="field.isInternalLink() else otherLink">
+          <a (click)="onFullViewLink(field.getLink(), field.getContent())">
+            {{field.getContent()}}
+          </a>
+        </div>
+        <ng-template #otherLink>
+          <div *ngIf="(field.getExternalLink() != null) else noLink">
+            <a href="{{field.getExternalLink()}}" 
+            target="_blank">
+              {{field.getContent()}}
+            </a>
+          </div>
+        </ng-template>
         <ng-template #noLink>
           {{field.getContent()}}
         </ng-template>
       </div>
     </div>
   </ng-container>
-<!-- </div> -->
 </div>
diff --git a/cloudapp/src/i18n/en.json b/cloudapp/src/i18n/en.json
@@ -124,6 +124,9 @@
   "Members" : {
     "Main" : {
       "SearchMembers":"Search for NACSIS member information"
+    },
+    "Form": {
+      "Success": "The member information was successfully saved"
     }
   },
   "ILL": {
@@ -176,23 +179,20 @@
        "FAXServiceType":"FAX service type"
     },
     "HoldingSearchResult":{
-      "INDEX":"ID",
-      "CHECKBOX":"check",
       "NAME":"Name",
       "VOL":"VOL",
       "HLV":"HLV",
       "HLYR":"HLYR",
       "BID":"Bibliographic ID",
       "COPYS":"Photocopy",
+      "LOANS":"LOANS",
       "CRTDT":"Create date",
       "FANO":"Member ID",
       "FAXS":"FAXS",
       "GRPCODE":"Offset charge",
       "ILLFLG":"ILL",
       "KENCODE":"Region",
-      "LIBABL":"Name",
       "LOC":"Location",
-      "LOANS":"LOANS",
       "ORGCODE":"Institution type",
       "RNWDT":"Update date",
       "SETCODE":"Establisher",
@@ -421,14 +421,14 @@
       "COPYS":"Copy service type",
       "LOANS":"Lending service type",
       "FAXS":"FAX service type",
-      "CATTEL":"CATTEL",
-      "CATDEPT":"CATDEPT",
-      "CATFAX":"CATFAX",
-      "SYSDEPT":"SYSDEPT",
-      "SYSTEL":"SYSTEL",
-      "SYSFAX":"SYSFAX",
-      "EMAIL":"EMAIL",
-      "POLICY":"POLICY",
+      "CATTEL":"Phone num. (Ext.)",
+      "CATDEPT":"Cataloging department",
+      "CATFAX":"Fax",
+      "SYSDEPT":"System department",
+      "SYSTEL":"Phone num.",
+      "SYSFAX":"Fax",
+      "EMAIL":"Email",
+      "POLICY":"ILL policy",
       "CLN": "CLN",
       "RGTN": "RGTN",
       "CPYR": "CPYR",

diff --git a/cloudapp/src/i18n/jp.json b/cloudapp/src/i18n/jp.json
@@ -176,27 +176,24 @@
        "FAXServiceType":"FAXサービス種別"
     },
     "HoldingSearchResult":{
-      "INDEX":"ID",
-      "CHECKBOX":"check",
-      "NAME":"Name",
-      "VOL":"VOL",
+      "NAME":"所蔵館略称",
+      "VOL":"巻冊次等",
       "HLV":"HLV",
       "HLYR":"HLYR",
       "BID":"BID",
-      "COPYS":"Photocopy",
+      "COPYS":"複写サービス種別",
+      "LOANS":"貸借サービス種別",
       "CRTDT":"Create date",
       "FANO":"Member ID",
-      "FAXS":"FAXS",
-      "GRPCODE":"Offset charge",
-      "ILLFLG":"ILL",
-      "KENCODE":"Region",
-      "LIBABL":"Name",
+      "FAXS":"FAXサービス種別",
+      "GRPCODE":"料金相殺グループ",
+      "ILLFLG":"ILL参加種別",
+      "KENCODE":"地域(県)コード",
       "LOC":"LOC",
-      "LOANS":"LOANS",
-      "ORGCODE":"Institution type",
+      "ORGCODE":"機関種別",
       "RNWDT":"Update date",
-      "SETCODE":"Establisher",
-      "STAT":"STAT",
+      "SETCODE":"設置者種別",
+      "STAT":"サービスステータス",
       "type":"Type",
       "SUM":"Photocopy fee",
       "Volume":"VOL",
@@ -410,27 +407,27 @@
       "FID": "FID",
       "DATE": "DATE",
       "SAID": "SAID",
-      "FANO": "Participating organization code",
-      "NAME": "Participating organization name",
-      "LOC": "Location",
-      "KENCODE": "Region(prefeture) code",
-      "SETCODE" : "Establisher type",
-      "ORGCODE" : "Institution type",
-      "ILLFLG" : "ILL participation type",
-      "STAT" : "Service status",
-      "GRPCODE":"Offset charge",
-      "CATFLG" : "Cataloging participation type",
-      "COPYS":"Copy service type",
-      "LOANS":"Lending service type",
-      "FAXS":"FAX service type",
-      "CATTEL":"CATTEL",
-      "CATDEPT":"CATDEPT",
-      "CATFAX":"CATFAX",
-      "SYSDEPT":"SYSDEPT",
-      "SYSTEL":"SYSTEL",
-      "SYSFAX":"SYSFAX",
-      "EMAIL":"EMAIL",
-      "POLICY":"POLICY",
+      "FANO": "参加組織コード",
+      "NAME": "参加組織名称",
+      "LOC": "配置コード",
+      "KENCODE": "地域(県)コード",
+      "SETCODE" : "設置者種別",
+      "ORGCODE" : "機関種別",
+      "ILLFLG" : "ILL参加種別",
+      "STAT" : "サービスステータス",
+      "GRPCODE":"料金相殺グループ",
+      "CATFLG" : "CAT参加種別",
+      "COPYS":"複写サービス種別",
+      "LOANS":"貸借サービス種別",
+      "FAXS":"FAXサービス種別",
+      "CATTEL":"目録担当電話番号(内線)",
+      "CATDEPT":"目録担当部局名",
+      "CATFAX":"目録担当FAX番号",
+      "SYSDEPT":"システム担当部局",
+      "SYSTEL":"システム担当部局電話番号",
+      "SYSFAX":"システム担当部局FAX番号",
+      "EMAIL":"E-mailアドレス",
+      "POLICY":"レンディングポリシー",
       "CLN": "請求記号",
       "RGTN": "登録番号",
       "CPYR": "刷の出版年",