From 540fd32c41374045a6492250b44e836cb4134481 Mon Sep 17 00:00:00 2001
From: Alicia Zangger <alicia.zangger@rero.ch>
Date: Tue, 25 Feb 2020 17:17:25 +0100
Subject: [PATCH] item: fix 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>
---
 .../item-detail-view.component.html              | 16 +---------------
 .../item-availability.component.html             |  6 ++++--
 .../item-availability.component.ts               |  1 +
 projects/admin/src/app/service/loan.service.ts   |  4 ++--
 4 files changed, 8 insertions(+), 19 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
index 4134eeeda..c8b28955c 100644
--- 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/projects/admin/src/app/record/item-availability/item-availability.component.html b/projects/admin/src/app/record/item-availability/item-availability.component.html
index 67b0d93ca..d24faa8f7 100644
--- 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 modify this component 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
index 7908a679c..1145b07f5 100644
--- a/projects/admin/src/app/record/item-availability/item-availability.component.ts
+++ b/projects/admin/src/app/record/item-availability/item-availability.component.ts
@@ -16,6 +16,7 @@
  */
 import { Component, Input } from '@angular/core';
 
+
 @Component({
   selector: 'admin-item-availability',
   templateUrl: './item-availability.component.html',
diff --git a/projects/admin/src/app/service/loan.service.ts b/projects/admin/src/app/service/loan.service.ts
index 940eaea4f..1cbb2f1f6 100644
--- 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
       ))