From 09df092b53c644959a57c31a31db1fb2679748a0 Mon Sep 17 00:00:00 2001
From: Alicia Zangger <alicia.zangger@rero.ch>
Date: Tue, 25 Feb 2020 11:02:11 +0100
Subject: [PATCH] circulation: display pickup location name when transit for
 pickup

* Displays pickup location name when the item is in transit for pickup.
* Highlights items with action needed in checkin form.
* Closes rero/rero-ils#770.

Co-Authored-by: Alicia Zangger <alicia.zangger@rero.ch>
---
 projects/admin/src/app/circulation/item/item.component.html | 5 +++--
 projects/admin/src/app/circulation/item/item.component.ts   | 5 -----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/projects/admin/src/app/circulation/item/item.component.html b/projects/admin/src/app/circulation/item/item.component.html
index badd617d5..6193eae85 100644
--- a/projects/admin/src/app/circulation/item/item.component.html
+++ b/projects/admin/src/app/circulation/item/item.component.html
@@ -15,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<div [ngClass]="{'border-danger': patronLoan && (item.status === 'in_transit' || item.pending_loans || totalAmountOfFee > 0),
+<div [ngClass]="{'border-danger': item.status === 'in_transit' || item.pending_loans || totalAmountOfFee > 0,
   'text-secondary': item.status !== 'on_loan'}"
   class="row p-2 mb-1 border rounded align-middle"
   *ngIf="item">
@@ -40,7 +40,8 @@
         <li *ngSwitchCase="'in_transit'">{{ item.status | translate }}
           <ng-container *ngIf="getTransitLocationPid(item) | getRecord: 'locations' | async as location">
             ({{ 'to' | translate }}
-            {{ location.metadata.library.pid | getRecord: 'libraries' : 'field' : 'name' | async }})
+            {{ location.metadata.library.pid | getRecord: 'libraries' : 'field' : 'name' | async }}
+            <ng-container *ngIf="item.loan.state === 'ITEM_IN_TRANSIT_FOR_PICKUP'"> - {{ location.metadata.pickup_name }}</ng-container>)
           </ng-container>
         </li>
         <li *ngSwitchCase="'on_shelf'">{{ item.status | translate }}</li>
diff --git a/projects/admin/src/app/circulation/item/item.component.ts b/projects/admin/src/app/circulation/item/item.component.ts
index 3d2c3e1f2..60f7693ab 100644
--- a/projects/admin/src/app/circulation/item/item.component.ts
+++ b/projects/admin/src/app/circulation/item/item.component.ts
@@ -84,11 +84,6 @@ export class ItemComponent implements OnInit {
     return total;
   }
 
-  /** Check if current item is a patron loan */
-  get patronLoan(): boolean {
-    return this.item.status !== 'on_loan' && this.patron;
-  }
-
   /** Get transit location pid
    * @param item: current item
    * @return: transit location pid