LP1953181 Adds optional LabelText to eg-combobox

Signed-off-by: Tiffany Little <tlittle@georgialibraries.org>

diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
index e498670..c5c53cf 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
+++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.html
@@ -17,8 +17,14 @@
   </ng-container>
 </ng-container>
 
+<div class="input-group">
+<ng-container *ngIf="labelText">
+<div class="input-group-prepend">
+    <span class="input-group-text">{{labelText}}</span>
+    </div>
+</ng-container>
 <ng-container *ngIf="!readOnly">
-  <div class="d-flex">
+  <span class="d-flex">
     <input type="text" 
       class="form-control"
       [id]="domId"
@@ -43,5 +49,6 @@
       <span class="material-icons">keyboard_arrow_up</span>
       <span class="material-icons">keyboard_arrow_down</span>
     </div>
-  </div>
+  </span>
 </ng-container>
+</div>

diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts
index 735f44a..a7e3eb3 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts
@@ -64,6 +64,8 @@ export class ComboboxComponent
 
     // Applies a name attribute to the input.
     // Useful in forms.
+    @Input() labelText = '';
+    
     @Input() name: string;
 
     // Placeholder text for selector input