fix: multiple bugs in home/core/institution modules (#1225)

Fixes: #1224

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

@@ -32,14 +32,13 @@
 
     <div class="app-sidenav">
 
-      <!-- TODO: Generate frequently accessed routes dynamically -->
       <div class="mt-1 mb-1 nav-item-sep">
         <mat-divider></mat-divider>
         <span class="text-muted icon-menu-title">Frequently Accessed</span>
       </div>
       <div class="icon-menu">
         <div class="icon-menu-item" *ngFor="let activity of mappedActivities">
-          <button mat-flat-button [matTooltip]="activity.toolTip" [routerLink]="[activity.path]">
+          <button mat-raised-button [matTooltip]="activity.toolTip" [routerLink]="[activity.path]">
             <fa-icon [icon]="activity.icon" size="lg"></fa-icon>
           </button>
         </div>
@@ -99,6 +98,12 @@
           </mat-icon>
           <a matLine>Chart of Accounts</a>
         </mat-list-item>
+        <mat-list-item (click)="showKeyboardShortcuts()">
+          <mat-icon matListIcon>
+            <fa-icon icon="keyboard" size="sm"></fa-icon>
+          </mat-icon>
+          <a matLine>Keyboard Shortcuts</a>
+        </mat-list-item>
         <mat-list-item>
           <mat-icon matListIcon (click)="help()">
             <fa-icon icon="question-circle" size="sm"></fa-icon>

src/app/core/shell/sidenav/sidenav.component.ts

@@ -1,7 +1,11 @@
 /** Angular Imports */
 import { Component, OnInit, Input } from '@angular/core';
+import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
 
+/** Custom Components */
+import { KeyboardShortcutsDialogComponent } from 'app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component';
+
 /** Custom Services */
 import { AuthenticationService } from '../../authentication/authentication.service';
 
@@ -32,9 +36,11 @@ export class SidenavComponent implements OnInit {
 
   /**
    * @param {Router} router Router for navigation.
+   * @param {MatDialog} dialog Mat Dialog
    * @param {AuthenticationService} authenticationService Authentication Service.
    */
   constructor(private router: Router,
+              public dialog: MatDialog,
               private authenticationService: AuthenticationService) {
     this.userActivity = JSON.parse(localStorage.getItem('mifosXLocation'));
   }
@@ -63,6 +69,14 @@ export class SidenavComponent implements OnInit {
     window.open('https://mifosforge.jira.com/wiki/spaces/docs/pages/52035622/User+Manual', '_blank');
   }
 
+  /**
+   * Opens Keyboard shortcuts dialog.
+   */
+  showKeyboardShortcuts() {
+    const dialogRef = this.dialog.open(KeyboardShortcutsDialogComponent);
+    dialogRef.afterClosed().subscribe((response: any) => {});
+  }
+
   /**
    * Returns top three frequent activities.
    */

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

@@ -49,10 +49,6 @@
 
   <mifosx-notifications-tray fxHide.lt-md></mifosx-notifications-tray>
 
-  <button mat-icon-button class="ml-1 img-button" matTooltip="Keyboard Shortcuts" (click)="showKeyboardShortcuts()">
-    <img src="assets/images/keyboard_placeholder.png">
-  </button>
-
   <button mat-icon-button class="ml-1 img-button" [matMenuTriggerFor]="applicationMenu">
     <img src="assets/images/user_placeholder.png">
   </button>

src/app/core/shell/toolbar/toolbar.component.ts

@@ -11,7 +11,6 @@ import { map } from 'rxjs/operators';
 
 /** Custom Services */
 import { AuthenticationService } from '../../authentication/authentication.service';
-import { KeyboardShortcutsDialogComponent } from 'app/shared/keyboard-shortcuts-dialog/keyboard-shortcuts-dialog.component';
 
 /**
  * Toolbar component.
@@ -88,12 +87,4 @@ export class ToolbarComponent implements OnInit {
     window.open('https://mifosforge.jira.com/wiki/spaces/docs/pages/52035622/User+Manual', '_blank');
   }
 
-  /**
-   * Opens Keyboard shortcuts dialog.
-   */
-  showKeyboardShortcuts() {
-    const dialogRef = this.dialog.open(KeyboardShortcutsDialogComponent);
-    dialogRef.afterClosed().subscribe((response: any) => {});
-  }
-
 }