|
19 | 19 | title="Pickup"></mat-icon> |
20 | 20 | </span> |
21 | 21 | <!-- title --> |
22 | | - <ng-container *ngIf="postSolve && visit; else visitRequestTitleTemplate"> |
| 22 | + <ng-container *ngIf="shipment; else visitRequestTitleTemplate"> |
23 | 23 | <span> |
24 | 24 | Shipment: |
25 | 25 | <span [ngClass]="{ link: navigation }" (click)="onShipmentClick()"> |
|
32 | 32 | </ng-template> |
33 | 33 | </div> |
34 | 34 | <div class="text__caption mt-1"> |
35 | | - <div> |
36 | | - <span>{{ visit | entityName: 'Visit:' }}</span> |
37 | | - </div> |
38 | | - <div *ngIf="visit"> |
39 | | - Visit Type: <span class="strong">{{ visit.isPickup ? 'Pickup' : 'Delivery' }}</span> |
40 | | - </div> |
41 | | - <div *ngIf="shipment?.shipmentType"> |
42 | | - Shipment Type: <span class="strong">{{ shipment.shipmentType }}</span> |
43 | | - </div> |
44 | | - <div *ngIf="visit"> |
| 35 | + <div *ngIf="postSolve; else preSolve"> |
45 | 36 | <div> |
46 | | - Arrival: <span class="strong">{{ buildFormattedArrival() }}</span> |
| 37 | + <span>{{ visit | entityName: 'Visit:' }}</span> |
47 | 38 | </div> |
48 | | - <div *ngIf="buildFormattedDeparture() as formattedDeparture"> |
49 | | - Departure: <span class="strong">{{ formattedDeparture }}</span> |
| 39 | + <div *ngIf="visit"> |
| 40 | + Visit Type: <span class="strong">{{ visit.isPickup ? 'Pickup' : 'Delivery' }}</span> |
50 | 41 | </div> |
51 | | - <div> |
52 | | - Vehicle: <span class="strong">{{ getVehicleName(vehicle) }}</span> |
| 42 | + <div *ngIf="shipment?.shipmentType"> |
| 43 | + Shipment Type: <span class="strong">{{ shipment.shipmentType }}</span> |
| 44 | + </div> |
| 45 | + <div *ngIf="visit"> |
| 46 | + <div> |
| 47 | + Arrival: <span class="strong">{{ buildFormattedArrival() }}</span> |
| 48 | + </div> |
| 49 | + <div *ngIf="buildFormattedDeparture() as formattedDeparture"> |
| 50 | + Departure: <span class="strong">{{ formattedDeparture }}</span> |
| 51 | + </div> |
| 52 | + <div> |
| 53 | + Vehicle: <span class="strong">{{ getVehicleName(vehicle) }}</span> |
| 54 | + </div> |
53 | 55 | </div> |
54 | 56 | </div> |
| 57 | + <ng-template #preSolve> |
| 58 | + <div *ngIf="visitRequest"> |
| 59 | + <div> |
| 60 | + Visit Request Type: |
| 61 | + <span class="strong">{{ visitRequest.pickup ? 'Pickup' : 'Delivery' }}</span> |
| 62 | + </div> |
| 63 | + <div *ngIf="visitRequest.duration"> |
| 64 | + Duration: {{ formattedDurationSeconds(durationSeconds(visitRequest.duration)) }} |
| 65 | + </div> |
| 66 | + </div> |
| 67 | + </ng-template> |
55 | 68 | </div> |
56 | 69 | <div *ngIf="savePending" class="updating-overlay"> |
57 | 70 | <mat-spinner [diameter]="50"></mat-spinner> |
|
0 commit comments