LP1936233 Circ Groups tab continued

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html
index b089e57..e794e3a 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html
@@ -5,6 +5,78 @@
       No Previous Circ Group
     </div>
     <div class="well-table" *ngIf="item && !loading && circInfo.prevCircSummary">
+      <h3 i18n>Previous Circ Group</h3>
+      <div class="well-row">
+        <div class="well-label" i18n>Patron</div>
+        <div class="well-value">
+          <a i18n
+            routerLink="/staff/circ/patron/{{circInfo.prevCircUser.id()}}">
+            {{circInfo.prevCircUser.family_name()}}, 
+            {{circInfo.prevCircUser.first_given_name()}}, 
+            {{circInfo.prevCircUser.second_given_name()}}
+          </a>
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Total Circs</div>
+        <div class="well-value">{{circInfo.prevCircSummary.num_circs()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkout Date</div>
+        <div class="well-value">
+          {{circInfo.prevCircSummary.start_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkout Workstation</div>
+        <div class="well-value">{{circInfo.prevCircSummary.checkout_workstation()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Last Renewed On</div>
+        <div class="well-value">
+          {{circInfo.prevCircSummary.last_renewal_time() |  formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Renewal Workstation</div>
+        <div class="well-value">{{circInfo.prevCircSummary.last_renewal_workstation()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Stop Fines Reason</div>
+        <div class="well-value">{{circInfo.prevCircSummary.last_stop_fines()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Stop Fines Time</div>
+        <div class="well-value">
+          {{circInfo.prevCircSummary.last_stop_fines_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Time</div>
+        <div class="well-value">
+          {{circInfo.prevCircSummary.last_checkin_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Scan Time</div>
+        <div class="well-value">
+          {{circInfo.prevCircSummary.last_checkin_scan_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Workstation</div>
+        <div class="well-value">{{circInfo.prevCircSummary.last_checkin_workstation()}}</div>
+      </div>
     </div>
   </div>
   <div class="col-lg-6">
@@ -12,11 +84,12 @@
       No Recent Circ Group
     </div>
     <div class="well-table" *ngIf="item && !loading && circInfo.currentCirc">
+      <h3 i18n>Most Recent Circ Group</h3>
       <div class="well-row">
         <div class="well-label" i18n>Patron</div>
-        <div class="well-value" *ngIf="circInfo.currentCirc">
+        <div class="well-value">
           <a i18n
-            routerLink="/staff/circInfo.currentCirc/patron/{{circInfo.currentCirc.usr().id()}}">
+            routerLink="/staff/circ/patron/{{circInfo.currentCirc.usr().id()}}">
             {{circInfo.currentCirc.usr().family_name()}}, 
             {{circInfo.currentCirc.usr().first_given_name()}}, 
             {{circInfo.currentCirc.usr().second_given_name()}}
@@ -32,39 +105,58 @@
       <div class="well-row">
         <div class="well-label" i18n>Checkout Date</div>
         <div class="well-value">
-          <ng-container *ngIf="circInfo.currentCirc">
-            {{circInfo.circSummary.start_time() | date:format.dateTimeFormat}}
-          </ng-container>
+          {{circInfo.circSummary.start_time() |  formatValue:'timestamp'}}
         </div>
       </div>
 
       <div class="well-row">
         <div class="well-label" i18n>Checkout Workstation</div>
-        <div class="well-value">
-          <ng-container *ngIf="circInfo.currentCirc">
-            {{circInfo.circSummary.checkout_workstation()}}
-          </ng-container>
-        </div>
+        <div class="well-value">{{circInfo.circSummary.checkout_workstation()}}</div>
       </div>
 
       <div class="well-row">
         <div class="well-label" i18n>Last Renewed On</div>
         <div class="well-value">
-          <ng-container *ngIf="circInfo.circSummary">
-            {{circInfo.circSummary.last_renewal_time() | date:format.dateTimeFormat}}
-          </ng-container>
+          {{circInfo.circSummary.last_renewal_time() |  formatValue:'timestamp'}}
         </div>
       </div>
 
       <div class="well-row">
         <div class="well-label" i18n>Renewal Workstation</div>
+        <div class="well-value">{{circInfo.circSummary.last_renewal_workstation()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Stop Fines Reason</div>
+        <div class="well-value">{{circInfo.currentCirc.stop_fines()}}</div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Stop Fines Time</div>
+        <div class="well-value">
+          {{circInfo.currentCirc.stop_fines_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Time</div>
         <div class="well-value">
-          <ng-container *ngIf="circInfo.currentCirc">
-            {{circInfo.circSummary.last_renewal_workstation()}}
-          </ng-container>
+          {{circInfo.currentCirc.checkin_time() | formatValue:'timestamp'}}
         </div>
       </div>
 
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Scan Time</div>
+        <div class="well-value">
+          {{circInfo.currentCirc.checkin_scan_time() | formatValue:'timestamp'}}
+        </div>
+      </div>
+
+      <div class="well-row">
+        <div class="well-label" i18n>Checkin Workstation</div>
+        <div class="well-value">{{circInfo.currentCirc.checkin_workstation()}}</div>
+      </div>
+
     </div>
   </div>
 </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html
index 4d9065f..b87b92b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html
@@ -48,7 +48,7 @@
     <div class="well-label" i18n>Due Date</div>
     <div class="well-value">
       <ng-container *ngIf="circInfo.currentCirc">
-        {{circInfo.currentCirc | egDueDatePipe}}
+        {{circInfo.currentCirc | egDueDate}}
       </ng-container>
     </div>
   </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
index 314c748..6a99685 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts
@@ -1443,7 +1443,10 @@ export class CircService {
 
                         return this.pcrud.retrieve('au', prevSummary.usr,
                             {flesh : 1, flesh_fields : {au : ['card']}})
-                        .toPromise().then(user => response.prevCircUser = user);
+                        .toPromise().then(user => {
+                            response.prevCircUser = user;
+                            return response;
+                        });
                     }
                 });
             });