From 57e7a8eb12e380094812f3ad65d731eb6eca90a0 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Wed, 3 Jan 2024 10:34:37 -0500
Subject: [PATCH] LP#2036296: always show note field in Hours of Operation form

This patch removes the checkbox to show or hide the notes
fields in the hours of operation editor in favor of always
displaying them.

This patch also adjusts the label to indicate that the note
is optional and ensures that the label is properly bound to
each note input.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Gina Monti <gmonti@biblio.org>
Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
---
 .../admin/server/org-unit.component.html      | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
index 1dd6615b83..b2e3d98c30 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/org-unit.component.html
@@ -70,7 +70,6 @@
             <div class="row fw-bold mb-2">
               <div class="col-lg-3 offset-lg-2" i18n>Open Time</div>
               <div class="col-lg-3" i18n>Close Time</div>
-              <div class="col-lg-2 offset-lg-2" i18n>Edit Note Field?</div>
             </div>
             <div class="row mb-2" *ngFor="let dow of [0,1,2,3,4,5,6]">
               <div class="col-lg-2" [ngSwitch]="dow">
@@ -96,20 +95,14 @@
                 <button type="button" class="btn btn-outline-dark" (click)="closedOn(dow)" 
                   [disabled]="isClosed(dow)" i18n>Closed</button>
               </div>
-              <div class="col-lg-2">
-                 <input type="checkbox" [(ngModel)]="editNote"/>
-              </div>
-              <div class="col-lg-6 offset-lg-6" *ngIf="editNote">
-                <div class="row">
-                  <div class="col-lg-12">
-                    <div class="input-group">
-                      <div class="input-group-text" i18n>Note: </div>
-                      <input class="form-control" type='text'
-                        [ngModel]="getNote(dow)" 
-                        (ngModelChange)="setNote(dow, $event)"
-                        placeholder="e.g. 'Closed for lunch from Noon to 1PM'" i18n-placeholder />
-                    </div>
-                  </div>
+              <div class="col-lg-6 offset-lg-2">
+                <div class="input-group mt-1">
+                  <label class="form-label input-group-text" for="org-unit-edit-note-{{dow}}" i18n>Note (optional)</label>
+                  <input class="form-control" type='text'
+                    id="org-unit-edit-note-{{dow}}"
+                    [ngModel]="getNote(dow)" 
+                    (ngModelChange)="setNote(dow, $event)"
+                    placeholder="e.g. 'Closed for lunch from Noon to 1PM'" i18n-placeholder />
                 </div>
               </div>
             </div>
-- 
2.43.2