From 26ec0d1bc111642d2f92d97d136abcc2cc578585 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxOLI.org>
Date: Wed, 2 Jun 2021 17:31:49 -0400
Subject: [PATCH] funds: adjust rollover modal

Removed propagate checkbox and replaced with an explanation; whether
or not propagation happens is strictly depending on the fund's
propagate flag.

Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../acq/funds/fund-rollover-dialog.component.html  | 24 ++++++++++++++--------
 .../acq/funds/fund-rollover-dialog.component.ts    |  2 --
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
index 20c7ff944b..b1540fc0f8 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.html
@@ -12,7 +12,6 @@
   </div>
   <div class="modal-body" [hidden]="!doneLoading">
     <form #rolloverForm="ngForm" role="form" class="form-validated">
-      <div class="row col" i18n>Context Org Unit: {{contextOrg?.shortname()}}</div>
       <div class="row col">
         <label for="year" class="my-1 mr-1" i18n>Year</label>
         <eg-combobox [entries]="years" *ngIf="years"
@@ -20,19 +19,25 @@
           (onChange)="year = $event ? $event.id : null">
         </eg-combobox> 
       </div>    
-      <div class="form-check">
+      <div class="row col mt-3" i18n>Context Org Unit: {{contextOrg?.shortname()}}</div>
+      <div class="form-check offset-sm-1 mt-1">
         <input type="checkbox" name="includeDescendants" id="includeDescendants"
           class="form-check-input"
           [(ngModel)]="includeDescendants">
         <label for="includeDescendants" class="form-check-label" i18n>Include funds from descendant Org Units</label>
       </div>
-      <div class="form-check">
-        <input type="checkbox" name="propgateFunds" id="propgateFunds"
-          class="form-check-input"
-          [(ngModel)]="propgateFunds">
-        <label for="propgateFunds" class="form-check-label" i18n>Propagate Funds</label>
-        <eg-help-popover helpText="Propagate Funds creates new funds for the next fiscal year. Propagating funds will not affect the money or encumbrances in the funds. Only funds that have the Propagate setting enabled will be affected." i18n-helpText></eg-help-popover>
-      </div>
+      <hr>
+      <h4 i18n>Fund Propagation</h4>
+      <p i18n>
+        Propagation creaets new funds for the next fiscal year. Propagating funds will not affect the money or
+        encumbrances in the funds unless Fiscal Year Close-Out is also done. Only funds that have the Propagate
+        setting enabled will be affected.
+      </p>
+      <p i18n>
+        Funds set to propagate will do so automatically when you click <b>Process</b>.
+      </p>
+      <hr>
+      <h4 i81n>Rollover and Close-Out</h4>
       <div class="form-check">
         <input type="checkbox" name="doCloseout" id="doCloseout"
           class="form-check-input"
@@ -48,6 +53,7 @@
         <label for="limitToEncumbrances" class="form-check-label" i18n>Limit Fiscal Year Close-Out to Encumbrances</label>
         <eg-help-popover helpText="This option will limit the Perform Fiscal Year Close-Out procedure to only move encumbrances to the corresponding fund for the next fiscal year. Any unspent money in the funds will not roll over." i18n-helpText></eg-help-popover>
       </div>
+      <hr>
       <div class="form-check">
         <input type="checkbox" name="dryRun" id="dryRun"
           class="form-check-input"
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts
index ca5778be5d..45fa7c900c 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-rollover-dialog.component.ts
@@ -36,7 +36,6 @@ export class FundRolloverDialogComponent
         private rolloverProgress: ProgressInlineComponent;
 
     includeDescendants = false;
-    propagateFunds = false;
     doCloseout = false;
     showEncumbOnly = false;
     limitToEncumbrances = false;
@@ -72,7 +71,6 @@ export class FundRolloverDialogComponent
     private _initDialog() {
         this.contextOrg = this.org.get(this.contextOrgId);
         this.includeDescendants = false;
-        this.propagateFunds = false;
         this.doCloseout = false;
         this.limitToEncumbrances = false;
         this.showResults = false;
-- 
2.11.0