LH#1 tweaks to display of search form and summary

- search form now displays above the summary and vendor
- Delete Provider button now only displayed where there is an active provider
- no traces of the summary pane appear when entering the interface fresh

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
index d37e044..bac7472 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/acq-provider.component.html
@@ -5,16 +5,10 @@
 
 <div><div class="row">
 
-<div class="col-lg-auto">
-  <eg-acq-provider-summary-pane #acqSearchProviderSummary
-    (summaryToggled)="onSummaryToggled($event)" [providerId]="id">
-  </eg-acq-provider-summary-pane>
-</div>
-
 <div class="col">
 <div class="row mb-2">
   <div class="col-lg">
-    <h3 i18n *ngIf="id">{{providerRecord.currentProvider.record.name()}} ({{providerRecord.currentProvider.record.code()}})</h3>
+    <h3 i18n *ngIf="id && !showSearchForm">{{providerRecord.currentProvider.record.name()}} ({{providerRecord.currentProvider.record.code()}})</h3>
   </div>
   <div class="col-lg-auto">
     <div class="btn-toolbar" role="toolbar">
@@ -33,6 +27,16 @@
     <eg-provider-results (desireSummarize)="onDesireSummarize($event)"></eg-provider-results>
   </div>
 </div>
+
+<h3 i18n *ngIf="id && showSearchForm">{{providerRecord.currentProvider.record.name()}} ({{providerRecord.currentProvider.record.code()}})</h3>
+<div class="row">
+<div class="col-lg-auto">
+  <eg-acq-provider-summary-pane #acqSearchProviderSummary
+    (summaryToggled)="onSummaryToggled($event)" [providerId]="id">
+  </eg-acq-provider-summary-pane>
+</div>
+
+<div class="col">
 <div class="row" id="acq-provider-page" [hidden]="!id">
   <div class="col-lg-12">
     <ngb-tabset #acqProviderTabs [activeId]="activeTab" (tabChange)="onTabChange($event)">
@@ -128,6 +132,8 @@
   </div>
 </div>
 </div>
+</div>
+</div>
 
 </div></div>
 

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/summary-pane.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/summary-pane.component.html
index b428cf1..7fe963f 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/acq/provider/summary-pane.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/summary-pane.component.html
@@ -1,7 +1,7 @@
-<button class="btn" [hidden]="!collapsed" (click)="toggleCollapse()" type="submit" i18n><span class="material-icons">expand_more</span></button>
-<button class="btn" [hidden]="collapsed" (click)="toggleCollapse()" type="submit" i18n><span class="material-icons">expand_less</span></button>
+<button class="btn" *ngIf="provider_id" [hidden]="!collapsed" (click)="toggleCollapse()" type="submit" i18n><span class="material-icons">expand_more</span></button>
+<button class="btn" *ngIf="provider_id" [hidden]="collapsed" (click)="toggleCollapse()" type="submit" i18n><span class="material-icons">expand_less</span></button>
 
-<div id="acq-provider-summary-pane" [hidden]="collapsed" class="pl-3 pr-3 pt-3 pb-3 mb-3">
+<div id="acq-provider-summary-pane" [hidden]="!provider_id || collapsed" class="pl-3 pr-3 pt-3 pb-3 mb-3">
 
 <ng-template #errorStrTmpl i18n>Provider Deletion Failed</ng-template>
 <eg-string #errorString [template]="errorStrTmpl"></eg-string>
@@ -116,7 +116,8 @@
 
 <button class="btn btn-primary"
   [hidden]="collapsed"
-  [disabled]="!provider_id || !canDeleteProvider()"
+  *ngIf="provider_id"
+  [disabled]="!canDeleteProvider()"
   (click)="deleteProvider()"
   type="submit" i18n>
 Delete Provider</button>