item: circulation info in detail view

* Removes redundant requests information. * Adds item status. * Displays requests for items at desk. * Closes rero/rero-ils#798. Co-Authored-by: Alicia Zangger <alicia.zangger@rero.ch>
AoNoOokami · Feb 26, 2020 · 0d73707 · 0d73707
1 parent bd85eb5
commit 0d73707
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/projects/admin/src/app/record/detail-view/item-detail-view/item-detail-view.component.html b/projects/admin/src/app/record/detail-view/item-detail-view/item-detail-view.component.html
@@ -14,6 +14,7 @@
    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
+
 <ng-container *ngIf="record">
   <header class="row">
     <h1>{{ 'Barcode' | translate }} {{ record.metadata.barcode }}</h1>
@@ -64,21 +65,6 @@ <h1>{{ 'Barcode' | translate }} {{ record.metadata.barcode }}</h1>
       <dd class="col-sm-7 col-md-8 mb-0">
         <admin-item-availability [item]="record"></admin-item-availability>
       </dd>
-      <!-- NUMBER OF REQUEST -->
-      <ng-container *ngIf="numberOfRequests > 0">
-        <dt class="col-sm-3 offset-sm-2 offset-md-0">
-          {{ 'Request queue' | translate }}:
-        </dt>
-        <dd class="col-sm-7 col-md-8 mb-0">
-          {{ numberOfRequests }}
-          <ng-container *ngIf="numberOfRequests > 1; else request">
-            {{ 'requests' | translate }}
-          </ng-container>
-          <ng-template #request>
-            {{ 'request' | translate }}
-          </ng-template>
-        </dd>
-      </ng-container>
     </dl>
   </section>
 

diff --git a/.../app/record/detail-view/item-detail-view/item-transactions/item-transactions.component.ts b/.../app/record/detail-view/item-detail-view/item-transactions/item-transactions.component.ts
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, OnInit, Input, ɵConsole } from '@angular/core';
 import { LoanService } from 'projects/admin/src/app/service/loan.service';
 import { Observable } from 'rxjs';
 

diff --git a/projects/admin/src/app/record/item-availability/item-availability.component.html b/projects/admin/src/app/record/item-availability/item-availability.component.html
@@ -16,10 +16,12 @@
 -->
 <ng-container *ngIf="item">
   <i class="fa fa-circle text-{{ item.metadata.available ? 'success': 'danger' }}"></i>
-   <ng-container *ngIf="item.metadata.available; else unavailable">
+  <!-- TODO: There will be a US to uniformize the display of availability. Remove or uncomment the following code accordingly:  -->
+   <!-- <ng-container *ngIf="item.metadata.available; else unavailable">
     {{ 'available' | translate }}
    </ng-container>
    <ng-template #unavailable>
     {{ 'unavailable' | translate }}
-   </ng-template>
+   </ng-template> -->
+  ({{ item.metadata.status | translate }})
 </ng-container>
diff --git a/projects/admin/src/app/record/item-availability/item-availability.component.ts b/projects/admin/src/app/record/item-availability/item-availability.component.ts
@@ -14,15 +14,31 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { LoanService } from '../../service/loan.service';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'admin-item-availability',
   templateUrl: './item-availability.component.html',
   styles: []
 })
-export class ItemAvailabilityComponent {
+export class ItemAvailabilityComponent implements OnInit {
 
   /** Item record */
   @Input() item: any;
+
+  /** Number of requests */
+  numberOfRequest$: Observable<any>;
+
+  /**
+   * Constructor
+   * @param loanService - LoanService
+   */
+  constructor(private loanService: LoanService) { }
+
+  ngOnInit() {
+    this.numberOfRequest$ = this.loanService.numberOfRequests$(this.item.metadata.pid);
+    console.log(this.numberOfRequest$);
+  }
 }
diff --git a/projects/admin/src/app/service/loan.service.ts b/projects/admin/src/app/service/loan.service.ts
@@ -28,7 +28,7 @@ export class LoanService {
   };
 
   statusRequest = {
-    ON_DESK: 'ITEM_ON_DESK',
+    AT_DESK: 'ITEM_AT_DESK',
     PENDING: 'PENDING',
     IN_TRANSIT_FOR_PICKUP: 'ITEM_IN_TRANSIT_FOR_PICKUP'
   };
@@ -73,7 +73,7 @@ export class LoanService {
   requestedBy$(itemPid: string) {
     return this.loans$(itemPid).pipe(
       map(results => results.hits.hits.filter((data: any) =>
-          data.metadata.state === this.statusRequest.ON_DESK
+          data.metadata.state === this.statusRequest.AT_DESK
           || data.metadata.state === this.statusRequest.PENDING
           || data.metadata.state === this.statusRequest.IN_TRANSIT_FOR_PICKUP
       ))