LP 1855781 Circulation Policy Configuration

	I fixed some UI issues with the banners clipping some fields, the cancel
	button being too low, and the limit set name from showing the list.
	There is still an issue with the required fields however. Checkboxes
	and org unit selectors cannot be labeled as required. So
	there are fields that are required, but can't be labeled
	as such.

Signed-off-by: Zavier Banks <zbanks@catalyte.io>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint-dialog.component.html
index 06861fc..d21bcd5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint-dialog.component.html
@@ -2,7 +2,7 @@
     <div class="modal-body">
         <ng-content>
         </ng-content>
-        <button type="button" class="btn btn-warning ml-2"
+        <button type="button" class="btn btn-warning ml-2 mb-6" [ngStyle]="{marginTop:'-12%'}"
           (click)="closeEditor()" i18n>Cancel
         </button>
     </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint.component.html
index ae4d404..9bedaa5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/circ-matrix-matchpoint.component.html
@@ -28,6 +28,7 @@
       </eg-linked-circ-limit-sets>
     </ng-container>
   </div>
+
   <ng-template #active let-idPrefix="idPrefix" let-field="field" let-record="record">
     <div class="col-lg-9">
       <input
@@ -40,16 +41,15 @@
         (ngModelChange)="record[field.name]($event)"/>
     </div>
     <div class="row" [ngStyle]="{
-      width:'100%',
-      marginTop:'3.5%',
-      marginBottom:'-4%',
-      marginLeft:'-10%',
+      width:'150%',
+      backgroundColor:'black',
+      marginLeft:'-43%',
+      marginTop:'6%',
+      marginBottom:'-1%',
       opacity:'90%',
       fontSize:'18px',
       textAlign:'center'}">
-      <div [ngStyle]="{backgroundColor:'black', height:'3px', marginTop:'3%', width:'25%'}"></div>
-      <div [ngStyle]="{width:'40%'}">Circulation Policies</div>
-      <div [ngStyle]="{backgroundColor:'black', height:'3px', marginTop:'3%', width:'25%'}"></div>
+      <div [ngStyle]="{width:'100%', color:'white'}">Circulation Policies</div>
     </div>
   </ng-template>
 
@@ -65,16 +65,19 @@
         (ngModelChange)="record[field.name]($event)"/>
     </div>
     <div class="row" [ngStyle]="{
-      width:'100%',
-      marginTop:'1%',
-      marginLeft:'-10%',
-      marginBottom:'-3.5%',
+      width:'150%',
+      backgroundColor:'black',
+      marginLeft:'-43%',
+      marginTop:'3%',
+      marginBottom:'-1%',
       opacity:'90%',
       fontSize:'18px',
-      textAlign:'center'}">
-      <div [ngStyle]="{backgroundColor:'black', height:'3px', marginTop:'2.5%', width:'25%'}"></div>
-      <div [ngStyle]="{width:'40%'}">Circulation Policy Effects</div>
-      <div [ngStyle]="{backgroundColor:'black', height:'3px', marginTop:'2.5%', width:'25%'}"></div>
+      textAlign:'center',
+      paddingTop:'3.5%',
+      paddingBottom:'5.5%',
+      paddingLeft:'3.5%',
+      paddingRight:'3.5%'}">
+      <div [ngStyle]="{width:'100%', color:'white'}">Circulation Policy Effects</div>
     </div>
   </ng-template>
 
@@ -84,6 +87,7 @@
     readonlyFields="name"
     displayMode="inline"
     fieldOrder="id,active,grp,org_unit,copy_circ_lib,copy_owning_lib,user_home_ou,is_renewal,juvenile_flag,circ_modifier,copy_location,marc_type,marc_form,marc_bib_level,marc_vr_format,ref_flag,usr_age_lower_bound,usr_age_upper_bound,item_age,circulate,duration_rule,renewals,hard_due_date,recurring_fine_rule,grace_period,max_fine_rule,available_copy_hold_ratio,total_copy_hold_ratio,script_test,description"
+    requiredFields="active,grp,org_unit"
     (recordSaved)="configureLimitSets($event); clearLinkedCircLimitSets(); closeDialog()"
     [fieldOptions]="{active:{customTemplate:{template:active}}, item_age:{customTemplate:{template:item_age}}}">
   </eg-fm-record-editor>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
index 9b3dbe0..07ef8c5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/circ_matrix_matchpoint/linked-circ-limit-sets.component.html
@@ -53,6 +53,7 @@
                 name="linkedLimitName"
                 idlClass="ccls" 
                 idlField="name" 
+                asyncSupportsEmptyTermClick="true"
                 (onChange)="onChange($event)">
             </eg-combobox>
         </div>
@@ -63,6 +64,7 @@
                 (click)="addLinkedSet()"
                 i18n-title title="Add" i18n>Add
             </button>
+            <eg-help-popover [helpText]="'Go to Local Admin -> Circulation Limit Sets to Create a Link Limit Set'" ></eg-help-popover>
         </div>
     </div>
 </div>