fix: make all the configuration wizards work (#2267)

Correct labels in the context of the wizards, make no wizard terminates
prematurely, make modal windows appear well positioned.

Fixes: WEB-11

src/app/core/shell/breadcrumb/breadcrumb.component.html

@@ -14,7 +14,7 @@
 </nav>
 
 <ng-template #templateBreadcrumb let-popover="popover">
-  <h2>{{ 'labels.popovers.Breadcrumbs' | translate }}</h2>
+  <h2>{{ 'labels.menus.Breadcrumbs' | translate }}</h2>
   <p class="mw300">{{ "labels.text.User's current location" | translate }}</p>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">

src/app/organization/currencies/manage-currencies/manage-currencies.component.html

@@ -67,16 +67,16 @@
   </p>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">
-      {{"labels.buttons.Close' | translate }}
+      {{ 'labels.buttons.Close' | translate }}
     </button>
     <button mat-raised-button color="primary" (click)="popover.close()">
-      {{"labels.buttons.Add Currency' | translate }}
+      {{ 'labels.buttons.Add Currency' | translate }}
     </button>
     <button mat-raised-button color="primary" (click)="popover.close(); previousStep()">
-      {{"labels.buttons.Back' | translate }}
+      {{ 'labels.buttons.Back' | translate }}
     </button>
     <button mat-raised-button color="primary" (click)="popover.close(); nextStep()">
-      {{"labels.buttons.Next' | translate }}
+      {{ 'labels.buttons.Next' | translate }}
     </button>
   </div>
 </ng-template>

src/app/organization/manage-funds/manage-funds.component.html

@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <div #buttonCreateCharge class="in-block">
+  <div #fundFormRef class="in-block">
     <button mat-raised-button color="primary" [routerLink]="['create']" *mifosxHasPermission="'CREATE_FUND'">
       <fa-icon icon="plus" class="m-r-10"></fa-icon>
       {{ 'labels.buttons.Create Fund' | translate }}

src/app/organization/offices/create-office/create-office.component.html

@@ -65,7 +65,7 @@
 <ng-template #templateCreateOfficeForm let-popover="popover">
   <h2>{{ 'labels.heading.Create Office' | translate }}</h2>
   <p class="mw400">
-    {{ 'labels.text.Filling Details' | translate }}:
+    {{ 'labels.text.Filling Details' | translate }}
     <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/67141727/Manage+Offices" target="_blank">{{
       'labels.inputs.Manage Offices' | translate
     }}</a>
@@ -81,7 +81,7 @@
       {{ 'labels.buttons.Back' | translate }}
     </button>
     <button mat-raised-button color="primary" (click)="popover.close(); nextStep()">
-      {{ 'labels.buttons.Next Step' | translate }}
+      {{ 'labels.buttons.Next' | translate }}
     </button>
   </div>
 </ng-template>

src/app/organization/offices/offices.component.html

@@ -1,5 +1,5 @@
 <div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
-  <mat-button-toggle-group [formControl]="viewGroup">
+  <mat-button-toggle-group #buttonTreeView [formControl]="viewGroup">
     <mat-button-toggle value="listView">
       <fa-icon icon="list"></fa-icon>
     </mat-button-toggle>
@@ -29,7 +29,7 @@
 </div>
 
 <div class="container" [hidden]="viewGroup.value !== 'listView'">
-  <div fxLayout="row" fxLayoutGap="20px">
+  <div #filter fxLayout="row" fxLayoutGap="20px">
     <mat-form-field fxFlex>
       <mat-label>{{ 'Filter' | translate }}</mat-label>
       <input matInput (keyup)="applyFilter($event.target.value)" />
@@ -37,7 +37,7 @@
   </div>
 
   <!-- List View -->
-  <div class="mat-elevation-z8">
+  <div #tableOffices class="mat-elevation-z8">
     <table mat-table [dataSource]="dataSource" matSort>
       <ng-container matColumnDef="name">
         <th mat-header-cell *matHeaderCellDef mat-sort-header>{{ ' Office Name ' | translate }}</th>

src/app/organization/working-days/working-days.component.html

@@ -66,7 +66,7 @@
       {{ 'labels.buttons.Back' | translate }}
     </button>
     <button mat-raised-button color="primary" (click)="popover.close(); nextStep()">
-      {{ 'labels.buttons.Next Step' | translate }}
+      {{ 'labels.buttons.Next' | translate }}
     </button>
   </div>
 </ng-template>

src/app/products/loan-products/loan-products.component.html

@@ -59,7 +59,7 @@
 </div>
 
 <ng-template #templateButtonCreateLoanProduct let-popover="popover">
-  <h2>{{ 'labels.heading.Create Loan Product' | translate }}t</h2>
+  <h2>{{ 'labels.heading.Create loan product' | translate }}</h2>
   <p class="mw300">{{ 'labels.text.This option allows you to create new loan product.' | translate }}</p>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">
     <button mat-raised-button color="warn" (click)="popover.close(); configurationWizardService.closeConfigWizard()">

src/app/products/saving-products/saving-products.component.html

@@ -73,7 +73,7 @@
       color="primary"
       (click)="popover.close(); showPopover(templateSavingProductTable, savingProductTable, 'top', true)"
     >
-      {{ 'labels.buttons.Next' | translate }}t
+      {{ 'labels.buttons.Next' | translate }}
     </button>
   </div>
 </ng-template>

src/app/products/share-products/share-products.component.html

@@ -87,7 +87,7 @@
   <h4 class="mw300">
     {{ 'labels.heading.List of share products in the organization' | translate }}:
     <a href="https://mifosforge.jira.com/wiki/spaces/docs/pages/129531946/Share+products" target="_blank">{{
-      'labels.buttons.Share Products' | translate
+      'labels.text.Share Products' | translate
     }}</a>
   </h4>
   <div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column">

src/app/system/roles-and-permissions/roles-and-permissions.component.ts

@@ -140,7 +140,7 @@ export class RolesAndPermissionsComponent implements OnInit, AfterViewInit {
     this.configurationWizardService.showRolesandPermissionPage = false;
     this.configurationWizardService.showRolesandPermissionList = false;
     this.configurationWizardService.showUsers = true;
-    this.router.navigate(['/users']);
+    this.router.navigate(['/appusers']);
   }
 
   /**

src/app/system/system.component.html

@@ -131,17 +131,19 @@
             </p>
           </mat-list-item>
 
-          <mat-list-item>
+          <div #manageReports>
-            <mat-icon matListIcon [routerLink]="['reports']">
+            <mat-list-item>
-              <fa-icon icon="file-word" size="sm"></fa-icon>
+              <mat-icon matListIcon [routerLink]="['reports']">
-            </mat-icon>
+                <fa-icon icon="file-word" size="sm"></fa-icon>
-            <h4 matLine [routerLink]="['reports']">{{ 'labels.heading.Manage Reports' | translate }}</h4>
+              </mat-icon>
-            <fa-icon (click)="arrowBooleansToggle(9)" *ngIf="!arrowBooleans[9]" icon="arrow-down" size="md"></fa-icon>
+              <h4 matLine [routerLink]="['reports']">{{ 'labels.heading.Manage Reports' | translate }}</h4>
-            <fa-icon (click)="arrowBooleansToggle(9)" *ngIf="arrowBooleans[9]" icon="arrow-up" size="md"></fa-icon>
+              <fa-icon (click)="arrowBooleansToggle(9)" *ngIf="!arrowBooleans[9]" icon="arrow-down" size="md"></fa-icon>
-            <p matLine *ngIf="arrowBooleans[9]" [routerLink]="['reports']">
+              <fa-icon (click)="arrowBooleansToggle(9)" *ngIf="arrowBooleans[9]" icon="arrow-up" size="md"></fa-icon>
-              {{ 'labels.text.Add new report and classify reports' | translate }}
+              <p matLine *ngIf="arrowBooleans[9]" [routerLink]="['reports']">
-            </p>
+                {{ 'labels.text.Add new report and classify reports' | translate }}
-          </mat-list-item>
+              </p>
+            </mat-list-item>
+          </div>
 
           <mat-list-item>
             <mat-icon matListIcon [routerLink]="['manage-jobs']">

src/app/users/create-user/create-user.component.ts

@@ -221,7 +221,7 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
   previousStep() {
     this.configurationWizardService.showUsersForm = false;
     this.configurationWizardService.showUsersList = true;
-    this.router.navigate(['/users']);
+    this.router.navigate(['/appusers']);
   }
 
   /**

src/app/users/users.component.ts

@@ -129,7 +129,7 @@ export class UsersComponent implements OnInit, AfterViewInit {
     this.configurationWizardService.showUsers = false;
     this.configurationWizardService.showUsersList = false;
     this.configurationWizardService.showUsersForm = true;
-    this.router.navigate(['/users/create']);
+    this.router.navigate(['/appusers/create']);
   }
 
   /**

src/assets/translations/en-US.json

@@ -2656,7 +2656,7 @@
       "All Recurring Deposits": "All Recurring Deposits",
       "All Savings": "All Savings",
       "Allocate Cash": "Allocate Cash",
-      "Allows you to create new fixed deposit product": "This option allows you to create new fixed deposit product.",
+      "Allows you to create new fixed deposit product": "This option allows you to create a new fixed deposit product.",
       "This option allows you to create new users in your organization": "This option allows you to create new users in your organization",
       "Alternative way-Tree view": "There is an alternative way to view your accounts - using the Tree View.",
       "Amazon S3": "Amazon S3",
@@ -2775,7 +2775,7 @@
       "Create new closure": "This option allows you to create new closure.",
       "Create new employees in your organization": "This option allows you to create new employees in your organization.",
       "Create new offices": "This option allows you to create new offices in your organization.",
-      "Create new report": "This option allows you to create new report.",
+      "Create new report": "This option allows you to create a new report.",
       "Create provisioning entries": "Create provisioning entries",
       "Create standing instructions at disbursement": "Create standing instructions at disbursement",
       "Currencies available across organization": "Currencies available across organization for different products",
@@ -2907,7 +2907,7 @@
       "Fixed Deposit Account Transactions": "Fixed Deposit Account Transactions",
       "Fixed Deposit Account View": "Fixed Deposit Account View",
       "Fixed Deposit Products": "Fixed Deposit Products",
-      "Fixed Deposit Products defines the rules, default settings": "Fixed Deposit Products defines the rules, default settings, and constraints for a financial institution's <br> fixed deposit offerings (also referred to as term deposits). A fixed deposit product provides a template for multiple fixed deposit accounts for the financial institution's clients.",
+      "Fixed Deposit Products defines the rules, default settings": "Fixed Deposit Products defines the rules, default settings, and constraints for a financial institution's fixed deposit offerings (also referred to as term deposits). A fixed deposit product provides a template for multiple fixed deposit accounts for the financial institution's clients.",
       "Fixed Deposits Account Actions": "Fixed Deposits Account Actions",
       "Fixed Deposits Account Transactions": "Fixed Deposits Account Transactions",
       "FixedDepositAccountCreateBusinessEvent": "FixedDepositAccountCreateBusinessEvent",
@@ -3141,10 +3141,10 @@
       "These are predefined postings": "These are predefined postings",
       "this": "this",
       "This allows you to manage funds associated with loans.": "This allows you to manage funds associated with loans.",
-      "This option allows you to create new loan product.": "This option allows you to create new loan product.",
+      "This option allows you to create new loan product.": "This option allows you to create a new loan product.",
-      "This option allows you to create new recurring product.": "This option allows you to create new recurring product.",
+      "This option allows you to create new recurring product.": "This option allows you to create a new recurring product.",
-      "This option allows you to create new savings product.": "This option allows you to create new savings product.",
+      "This option allows you to create new savings product.": "This option allows you to create a new savings product.",
-      "This option allows you to create new share product.": "This option allows you to create new share product.",
+      "This option allows you to create new share product.": "This option allows you to create a new share product.",
       "This shows all the notifications.": "This shows all the notifications.",
       "This will navigate the user to the dashboard component.": "This will navigate the user to the dashboard component.",
       "This will navigate the user to the searched activity.": "This will navigate the user to the searched activity.",
@@ -3164,8 +3164,8 @@
       "Unassigned": "Unassigned",
       "Undo approval of shares account with ID": "Are you sure you want to undo approval of shares account with ID",
       "Used Add Fund": "This form will be used to add fund. If you would like to add fund click on add funds button and fill the fund name then click on + button else click Next or Back. For more details click",
-      "Used to add currency": "This form will be used to add currency. To add currency click on add currency and fill the form and then click add else click back or next. For more details click",
+      "Used to add currency": "This form will be used to add a currency. To add a currency, click on \"add currency\" and fill the form. For more details click",
-      "User Dashboard Component": "This will navigate the user to dashboard component.",
+      "User Dashboard Component": "This will navigate the user to the dashboard component.",
       "User Entity navigation screen": "This will navigate the user to entity navigation screen.",
       "User settings and sign out button": "This will have logged in user settings and sign out button.",
       "User's current location": "This will show the user's current location in the app.",