Set autosize and min two rows in textarea controls (#1604)

Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>

src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.html

@@ -19,8 +19,8 @@
       </mat-card-content>
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
-        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
-        <button mat-raised-button color="accent" [disabled]="!activateSavingsAccountForm.valid">Confirm</button>
+        <button type="button" mat-raised-button [routerLink]="['../../transactions']">Cancel</button>
+        <button mat-raised-button color="primary" [disabled]="!activateSavingsAccountForm.valid">Confirm</button>
       </mat-card-actions>
 
     </form>

src/app/savings/saving-account-actions/activate-savings-account/activate-savings-account.component.ts

@@ -79,7 +79,7 @@ export class ActivateSavingsAccountComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountCommand(this.accountId, 'activate', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.html

@@ -80,7 +80,7 @@
         </div>
 
         <mat-card-actions fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center">
-          <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
+          <button type="button" mat-raised-button [routerLink]="['../../transactions']">Cancel</button>
           <button mat-raised-button color="primary" [disabled]="!savingsChargeForm.valid">Submit</button>
         </mat-card-actions>
 

src/app/savings/saving-account-actions/add-charge-savings-account/add-charge-savings-account.component.ts

@@ -135,7 +135,7 @@ export class AddChargeSavingsAccountComponent implements OnInit {
       }
     }
     this.savingsService.createSavingsCharge(this.savingAccountId, 'charges', savingsCharge).subscribe( () => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.html

@@ -20,7 +20,7 @@
 
           <mat-form-field>
             <mat-label>Note</mat-label>
-            <textarea matInput formControlName="note"></textarea>
+            <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
           </mat-form-field>
 
         </div>
@@ -29,7 +29,7 @@
 
       <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
         <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
-        <button mat-raised-button color="accent" [disabled]="!approveSavingsAccountForm.valid">Confirm</button>
+        <button mat-raised-button color="primary" [disabled]="!approveSavingsAccountForm.valid">Confirm</button>
       </mat-card-actions>
 
     </form>

src/app/savings/saving-account-actions/approve-savings-account/approve-savings-account.component.ts

@@ -80,7 +80,7 @@ export class ApproveSavingsAccountComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountCommand(this.accountId, 'approve', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/close-savings-account/close-savings-account.component.html

@@ -43,11 +43,14 @@
               </mat-select>
             </mat-form-field>
 
-            <div fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column" class="m-t-10">
-              <mat-label fxFlexAlign="center">Show Payment Details</mat-label>
-              <button type="button" mat-mini-fab color="primary" (click)="addPaymentDetails()">
-                <fa-icon [icon]="!addPaymentDetailsFlag ? 'plus-circle' : 'minus-circle'" size="lg"></fa-icon>
-              </button>
+            <div fxFlexFill>
+              <span fxFlex="75%" class="expandcollapsebutton m-l-10 m-t-40" (click)="addPaymentDetails()">
+                <mat-slide-toggle [(ngModel)]="showPaymentDetails">
+                  <div [className]="showPaymentDetails ? 'enabled' : 'disabled'">
+                    <span class="m-l-10">Show Payment Details</span>
+                  </div>
+                </mat-slide-toggle>
+              </span>
             </div>
 
             <mat-form-field *ngIf="closeSavingsAccountForm.controls['accountNumber']">
@@ -79,7 +82,7 @@
 
           <mat-form-field>
             <mat-label>Note</mat-label>
-            <textarea matInput formControlName="note"></textarea>
+            <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
           </mat-form-field>
 
         </div>

src/app/savings/saving-account-actions/post-interest-as-on-savings-account/post-interest-as-on-savings-account.component.ts

@@ -80,7 +80,7 @@ export class PostInterestAsOnSavingsAccountComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountTransactionsCommand(this.accountId, 'postInterestAsOn', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/reject-savings-account/reject-savings-account.component.html

@@ -20,7 +20,7 @@
 
           <mat-form-field>
             <mat-label>Note</mat-label>
-            <textarea matInput formControlName="note"></textarea>
+            <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
           </mat-form-field>
 
         </div>

src/app/savings/saving-account-actions/savings-account-assign-staff/savings-account-assign-staff.component.ts

@@ -89,7 +89,7 @@ export class SavingsAccountAssignStaffComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountCommand(this.accountId, 'assignSavingsOfficer', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.html

@@ -37,11 +37,14 @@
           </mat-select>
         </mat-form-field>
 
-        <div fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column">
-          <mat-label fxFlexAlign="center">Show Payment Details</mat-label>
-          <button type="button" mat-mini-fab color="primary" (click)="addPaymentDetails()">
-            <fa-icon [icon]="!addPaymentDetailsFlag ? 'plus-circle' : 'minus-circle'" size="lg"></fa-icon>
-          </button>
+        <div fxFlexFill>
+          <span fxFlex="75%" class="expandcollapsebutton m-l-10 m-t-40" (click)="addPaymentDetails()">
+            <mat-slide-toggle [(ngModel)]="addPaymentDetailsFlag">
+              <div [className]="addPaymentDetailsFlag ? 'enabled' : 'disabled'">
+                <span class="m-l-10">Show Payment Details</span>
+              </div>
+            </mat-slide-toggle>
+          </span>
         </div>
 
         <mat-form-field *ngIf="savingAccountTransactionForm.controls['accountNumber']">
@@ -75,7 +78,7 @@
         </mat-form-field>
 
         <mat-card-actions fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center">
-          <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
+          <button type="button" mat-raised-button [routerLink]="['../../transactions']">Cancel</button>
           <button mat-raised-button color="primary" [disabled]="!savingAccountTransactionForm.valid">Submit</button>
         </mat-card-actions>
 

src/app/savings/saving-account-actions/savings-account-transactions/savings-account-transactions.component.ts

@@ -121,7 +121,7 @@ export class SavingsAccountTransactionsComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountTransactionsCommand(this.savingAccountId, this.transactionCommand, data).subscribe(res => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 }

src/app/savings/saving-account-actions/savings-account-unassign-staff/savings-account-unassign-staff.component.ts

@@ -79,7 +79,7 @@ export class SavingsAccountUnassignStaffComponent implements OnInit {
       locale
     };
     this.savingsService.executeSavingsAccountCommand(this.accountId, 'unassignSavingsOfficer', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.html

@@ -8,7 +8,7 @@
 
         <mat-form-field fxFlex>
           <mat-label>Note</mat-label>
-          <textarea matInput formControlName="note"></textarea>
+          <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
         </mat-form-field>
 
       </mat-card-content>

src/app/savings/saving-account-actions/undo-approval-savings-account/undo-approval-savings-account.component.ts

@@ -59,7 +59,7 @@ export class UndoApprovalSavingsAccountComponent implements OnInit {
       ...this.undoApprovalSavingsAccountForm.value,
     };
     this.savingsService.executeSavingsAccountCommand(this.accountId, 'undoapproval', data).subscribe(() => {
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });
   }
 

src/app/savings/saving-account-actions/withdraw-by-client-savings-account/withdraw-by-client-savings-account.component.html

@@ -20,7 +20,7 @@
 
           <mat-form-field>
             <mat-label>Note</mat-label>
-            <textarea matInput formControlName="note"></textarea>
+            <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
           </mat-form-field>
 
         </div>