From 8a10722c55d7f02f484c862fd16c1b4c9d23d977 Mon Sep 17 00:00:00 2001
From: Jamie Little <jamie@jamielittle.org>
Date: Mon, 14 Oct 2024 07:04:49 -0500
Subject: [PATCH] Fix double display of holdings info

---
 .../html/prm-location-holdings-after.html     | 186 +++++++++---------
 1 file changed, 94 insertions(+), 92 deletions(-)

diff --git a/01JHU_INST-JHU/html/prm-location-holdings-after.html b/01JHU_INST-JHU/html/prm-location-holdings-after.html
index ad64be16..59cac006 100644
--- a/01JHU_INST-JHU/html/prm-location-holdings-after.html
+++ b/01JHU_INST-JHU/html/prm-location-holdings-after.html
@@ -22,117 +22,119 @@
             </md-card-title-text>
         </md-card-title>
         <md-card-content>
-            <div ng-repeat="line in $ctrl.holdings">
-                <span ng-if="$ctrl.isAvailabilityLine(line)">
-                    <div class="margin-bottom-medium">
-                        This item is physically bound with another item.
-                    </div>
-                    <span class="bold-text">For availability see:</span>
-                    <a
-                        ng-if="$ctrl.hasValidLink(line)"
-                        ng-href="{{$ctrl.getAvailabilityLink(line)}}"
+            <div ng-init="$ctrl.hasAvailabilityLine = false">
+                <div ng-repeat="line in $ctrl.holdings">
+                    <span
+                        ng-if="$ctrl.isAvailabilityLine(line)"
+                        ng-init="$ctrl.hasAvailabilityLine = true"
                     >
-                        {{$ctrl.getLinkText(line)}}
-                    </a>
-                </span>
-            </div>
+                        <div class="margin-bottom-medium">
+                            This item is physically bound with another item.
+                        </div>
+                        <span class="bold-text">For availability see:</span>
+                        <a
+                            ng-if="$ctrl.hasValidLink(line)"
+                            ng-href="{{$ctrl.getAvailabilityLink(line)}}"
+                        >
+                            {{$ctrl.getLinkText(line)}}
+                        </a>
+                    </span>
+                </div>
 
-            <div
-                ng-if="$ctrl.shouldShowBaseSummary()"
-                class="display-block"
-                layout="row"
-                layout-align="start start"
-            >
-                <div layout="column">
+                <div ng-if="!$ctrl.hasAvailabilityLine">
                     <div
-                        ng-repeat="summaryLine in $ctrl.getBaseSummaryLines() track by $index"
+                        ng-if="!$ctrl.parentCtrl.summaryLinesVisible"
+                        class="display-block"
                         layout="row"
+                        layout-align="start start"
                     >
-                        <div
-                            translate="{{summaryLine.key}}"
-                            class="margin-right-small summary-brief-header"
-                            ng-class="{'margin-right-medium': $ctrl.parentCtrl.mediaQueries.xs}"
-                        ></div>
-                        <span
-                            class="summary-brief word-break-all"
-                            ng-style="$ctrl.getStyle()"
-                        >
-                            <a
-                                ng-if="$ctrl.isLink(summaryLine.value)"
-                                ng-href="{{summaryLine.value}}"
-                                >{{summaryLine.value}}</a
+                        <div layout="column">
+                            <div
+                                ng-repeat="summaryLine in $ctrl.getBaseSummaryLines() track by $index"
+                                layout="row"
                             >
-                            <span
-                                ng-if="!$ctrl.isLink(summaryLine.value)"
-                                ng-bind-html="summaryLine.value"
-                            ></span>
-                        </span>
+                                <div
+                                    translate="{{summaryLine.key}}"
+                                    class="margin-right-small summary-brief-header"
+                                    ng-class="{'margin-right-medium': $ctrl.parentCtrl.mediaQueries.xs}"
+                                ></div>
+                                <span
+                                    class="summary-brief word-break-all"
+                                    ng-style="$ctrl.getStyle()"
+                                >
+                                    <a
+                                        ng-if="$ctrl.isLink(summaryLine.value)"
+                                        ng-href="{{summaryLine.value}}"
+                                        >{{summaryLine.value}}</a
+                                    >
+                                    <span
+                                        ng-if="!$ctrl.isLink(summaryLine.value)"
+                                        ng-bind-html="summaryLine.value"
+                                    ></span>
+                                </span>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </div>
 
-            <div ng-init="$ctrl.hasAvailabilityLine = false">
-                <div
-                    ng-repeat="allLine in $ctrl.getAllLines() track by $index"
-                    layout="row"
-                    layout-align="start start"
-                    class="display-block"
-                >
                     <div
-                        layout="column"
-                        ng-if="!$ctrl.isAvailabilityLine(allLine)"
+                        ng-if="$ctrl.parentCtrl.summaryLinesVisible"
+                        layout="row"
+                        layout-align="start start"
+                        class="display-block"
                     >
-                        <div>
-                            <span
-                                class="bold-text"
-                                translate="{{allLine.key}}"
-                            ></span>
-                            <span
-                                ng-repeat="lineItem in allLine.value track by $index"
+                        <div layout="column">
+                            <div
+                                ng-repeat="allLine in $ctrl.getAllLines() track by $index"
                             >
                                 <div>
-                                    <a
-                                        ng-if="$ctrl.isLink(lineItem)"
-                                        ng-href="{{lineItem}}"
-                                        >{{lineItem}}</a
-                                    >
                                     <span
-                                        ng-if="!$ctrl.isLink(lineItem)"
-                                        ng-bind-html="lineItem"
+                                        class="bold-text"
+                                        translate="{{allLine.key}}"
                                     ></span>
+                                    <span
+                                        ng-repeat="lineItem in allLine.value track by $index"
+                                    >
+                                        <div>
+                                            <a
+                                                ng-if="$ctrl.isLink(lineItem)"
+                                                ng-href="{{lineItem}}"
+                                                >{{lineItem}}</a
+                                            >
+                                            <span
+                                                ng-if="!$ctrl.isLink(lineItem)"
+                                                ng-bind-html="lineItem"
+                                            ></span>
+                                        </div>
+                                    </span>
                                 </div>
-                            </span>
+                            </div>
                         </div>
                     </div>
-                    <div
-                        ng-if="$ctrl.isAvailabilityLine(allLine)"
-                        ng-init="$ctrl.hasAvailabilityLine = true"
-                    ></div>
+
+                    <md-button
+                        class="button-as-link link-alt-color"
+                        ng-click="$ctrl.parentCtrl.viewMore(!$ctrl.parentCtrl.summaryLinesVisible, $event)"
+                        ng-if="!$ctrl.parentCtrl.summaryLinesVisible && $ctrl.parentCtrl.currLoc.summaryHoldings.baseSummaryShort.length > 0 && $ctrl.parentCtrl.currLoc.isHoldingExpandedData"
+                        aria-label="{{'nui.aria.locations.viewMore' | translate}}"
+                    >
+                        <span
+                            translate="nui.locations.viewMore"
+                            class="bold-text"
+                        ></span>
+                    </md-button>
+                    <md-button
+                        class="button-as-link link-alt-color"
+                        ng-click="$ctrl.parentCtrl.viewMore(!$ctrl.parentCtrl.summaryLinesVisible, $event)"
+                        ng-if="$ctrl.parentCtrl.summaryLinesVisible && $ctrl.parentCtrl.currLoc.summaryHoldings.baseSummaryShort.length > 0 && $ctrl.parentCtrl.currLoc.isHoldingExpandedData"
+                        aria-label="{{'nui.aria.locations.viewLess' | translate}}"
+                    >
+                        <span
+                            translate="nui.locations.viewLess"
+                            class="bold-text"
+                        ></span>
+                    </md-button>
                 </div>
             </div>
-
-            <md-button
-                class="button-as-link link-alt-color"
-                ng-click="$ctrl.parentCtrl.viewMore(!$ctrl.parentCtrl.summaryLinesVisible, $event)"
-                ng-if="!$ctrl.hasAvailabilityLine && ($ctrl.parentCtrl.currLoc.locationNoItems ?  !$ctrl.parentCtrl.summaryLinesVisible : $ctrl.parentCtrl.summaryLinesVisible) && $ctrl.parentCtrl.currLoc.summaryHoldings.baseSummaryShort.length > 0 && $ctrl.parentCtrl.currLoc.isHoldingExpandedData"
-                aria-label="{{'nui.aria.locations.viewLess' | translate}}"
-            >
-                <span
-                    translate="nui.locations.viewLess"
-                    class="bold-text"
-                ></span>
-            </md-button>
-            <md-button
-                class="button-as-link link-alt-color"
-                ng-click="$ctrl.parentCtrl.viewMore(!$ctrl.parentCtrl.summaryLinesVisible, $event)"
-                ng-if="!$ctrl.hasAvailabilityLine && ($ctrl.parentCtrl.currLoc.locationNoItems ?  $ctrl.parentCtrl.summaryLinesVisible : !$ctrl.parentCtrl.summaryLinesVisible) && $ctrl.parentCtrl.currLoc.summaryHoldings.baseSummaryShort.length > 0 && $ctrl.parentCtrl.currLoc.isHoldingExpandedData"
-                aria-label="{{'nui.aria.locations.viewMore' | translate}}"
-            >
-                <span
-                    translate="nui.locations.viewMore"
-                    class="bold-text"
-                ></span>
-            </md-button>
         </md-card-content>
     </md-card>
 </div>