make sure all columns are retrieved even when not displayed; fix title and bib id...

Signed-off-by: Jason Etheridge <phasefx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.html b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.html
index e7f7479..e3c96b8 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.html
@@ -6,14 +6,14 @@
 </div>
 
 <ng-template #bibIdTemplate let-r="row">
-  <ng-container *ngIf="r?.url?.item()?.target_biblio_record_entry()?.id()">
-    <a routerLink="/staff/catalog/record/{{r.url.item().target_biblio_record_entry().id()}}">{{r.url.item().target_biblio_record_entry().id()}}</a>
+  <ng-container *ngIf="r['url.item.target_biblio_record_entry.id']">
+    <a routerLink="/staff/catalog/record/{{r['url.item.target_biblio_record_entry.id']}}">{{r['url.item.target_biblio_record_entry.id']}}</a>
   </ng-container>
 </ng-template>
 
 <ng-template #titleTemplate let-r="row">
-  <ng-container *ngIf="r?.url?.item()?.target_biblio_record_entry()?.id()">
-    <a routerLink="/staff/catalog/record/{{r.url.item().target_biblio_record_entry().id()}}">{{r.url.item().target_biblio_record_entry().simple_record().title()}}</a>
+  <ng-container *ngIf="r['url.item.target_biblio_record_entry.simple_record.title']">
+    <a routerLink="/staff/catalog/record/{{r['url.item.target_biblio_record_entry.id']}}">{{r['url.item.target_biblio_record_entry.simple_record.title']}}</a>
   </ng-container>
 </ng-template>
 
@@ -29,22 +29,30 @@
     [migrateLegacyFilterSets]="'url_verify'">
 
     <eg-grid-column path="id" [index]="true" [required]="true"></eg-grid-column>
-    <eg-grid-column path="url.item.target_biblio_record_entry.id" [cellTemplate]="bibIdTemplate">
+    <eg-grid-column [required]="true" path="url.item.target_biblio_record_entry.id" [cellTemplate]="bibIdTemplate">
         </eg-grid-column>
-    <eg-grid-column path="url.item.target_biblio_record_entry.simple_record.title" [cellTemplate]="titleTemplate">
+    <eg-grid-column [required]="true" path="url.item.target_biblio_record_entry.simple_record.title" [cellTemplate]="titleTemplate">
         </eg-grid-column>
-    <eg-grid-column path="url.item.target_biblio_record_entry.simple_record.author">
+    <eg-grid-column [required]="true" path="url.item.target_biblio_record_entry.simple_record.author">
         </eg-grid-column>
-    <eg-grid-column path="url" label="URL ID" i18n-label>
+    <eg-grid-column [required]="true" path="url" label="URL ID" i18n-label>
         </eg-grid-column>
-    <eg-grid-column path="url.full_url">
+    <eg-grid-column [required]="true" path="url.full_url">
         </eg-grid-column>
-    <eg-grid-column path="url.tag">
+    <eg-grid-column [required]="true" path="url.tag">
         </eg-grid-column>
-    <eg-grid-column path="url.subfield">
+    <eg-grid-column [required]="true" path="url.subfield">
         </eg-grid-column>
-    <eg-grid-column path="url.ord">
+    <eg-grid-column [required]="true" path="url.ord">
         </eg-grid-column>
-    <eg-grid-column path="attempt" label="Batch ID" i18n-label>
+    <eg-grid-column [required]="true" path="attempt" label="Batch ID" i18n-label>
         </eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Verification ID" path="id"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="URL" path="url"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Attempt" path="attempt"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Request Time" path="req_time"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Result Time" path="res_time"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Result Code" path="res_code"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Result Text" path="res_text"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Redirected To" path="redirect_to"></eg-grid-column>
 </eg-grid>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.ts
index 23deba8..25dacee 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/attempts.component.ts
@@ -87,6 +87,7 @@ export class LinkCheckerAttemptsComponent implements OnInit {
 
         this.initDataSource();
         this.gridSelectionChange( [] );
+        console.log('phasefx',this);
     }
 
     gridSelectionChange(keys: string[]) {

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/linkchecker.component.html b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/linkchecker.component.html
index 5141711..7892fa5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/linkchecker.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/linkchecker.component.html
@@ -69,6 +69,17 @@
 
     <eg-grid-column path="id" [index]="true" [required]="true"></eg-grid-column>
     <eg-grid-column path="owning_lib" [required]="true" label="Owning Library" i18n-label></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Session ID" path="session_id"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Name" path="name"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Creator" path="creator"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Record Container" path="container"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Create Time" path="create_time"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Search Constraints" path="search"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Selectors" path="selectors"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Batch ID" path="batch_id"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="User" path="usr"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Start Time" path="start_time"></eg-grid-column>
+    <eg-grid-column [required]="true" i18n-label label="Finish Time" path="finish_time"></eg-grid-column>
 
 </eg-grid>
 

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/urls.component.html b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/urls.component.html
index b04e837..7086c3e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/urls.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/linkchecker/urls.component.html
@@ -37,12 +37,29 @@
         (onClick)="verifySelectedUrls()">
         </eg-grid-toolbar-button>
     <eg-grid-column path="id" [index]="true" [required]="true"></eg-grid-column>
-    <eg-grid-column path="item.target_biblio_record_entry.id" [cellTemplate]="bibIdTemplate">
+    <eg-grid-column [required]="true" path="item.target_biblio_record_entry.id" [cellTemplate]="bibIdTemplate">
         </eg-grid-column>
-    <eg-grid-column path="item.target_biblio_record_entry.simple_record.title" [cellTemplate]="titleTemplate">
+    <eg-grid-column [required]="true" path="item.target_biblio_record_entry.simple_record.title" [cellTemplate]="titleTemplate">
         </eg-grid-column>
-    <eg-grid-column path="item.target_biblio_record_entry.simple_record.author">
+    <eg-grid-column [required]="true" path="item.target_biblio_record_entry.simple_record.author">
         </eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Redirected From" path="redirect_from"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Container Item" path="item"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Session" path="session"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="URL Selector" path="url_selector"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Tag" path="tag"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Subfield" path="subfield"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Ordinal Position" path="ord"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="URL" path="full_url"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Scheme" path="scheme"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Host" path="host"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Domain" path="domain"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="TLD" path="tld"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Path" path="path"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Page" path="page"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Query" path="query"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Fragment" path="fragment"></eg-grid-column>
+        <eg-grid-column [required]="true" i18n-label label="Verifications" path="verifications"></eg-grid-column>
 </eg-grid>
 
 <eg-progress-dialog dialogTitle="{{progressText}}" #progress></eg-progress-dialog>