WEB-457: Tenant aware feature

Author: IOhacker

src/app/home/home.component.html

@@ -10,7 +10,10 @@
 <div class="container">
   <mat-card>
     <mat-card-header>
-      <mat-card-title class="title"> {{ 'labels.text.Welcome' | translate }}, {{ username }}! </mat-card-title>
+      <mat-card-title class="title">
+        {{ 'labels.text.Welcome' | translate }} {{ username }} {{ 'labels.text.To' | translate }}
+        {{ tenant | titlecase }}!
+      </mat-card-title>
     </mat-card-header>
 
     <mat-card-content #searchActivity>
@@ -28,7 +31,7 @@
       </mat-autocomplete>
     </mat-card-content>
 
-    <img mat-card-image src="assets/images/mifos_lg-logo.png" alt="Mifos X" />
+    <img mat-card-image src="assets/images/{{ tenant }}_home.png" alt="Mifos X" />
   </mat-card>
 </div>
 

src/app/home/home.component.ts

@@ -16,6 +16,7 @@ import { WarningDialogComponent } from './warning-dialog/warning-dialog.componen
 import { AuthenticationService } from '../core/authentication/authentication.service';
 import { PopoverService } from '../configuration-wizard/popover/popover.service';
 import { ConfigurationWizardService } from '../configuration-wizard/configuration-wizard.service';
+import { SettingsService } from 'app/settings/settings.service';
 
 /** Custom Components */
 import { NextStepDialogComponent } from '../configuration-wizard/next-step-dialog/next-step-dialog.component';
@@ -46,6 +47,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 export class HomeComponent implements OnInit, AfterViewInit {
   /** Username of authenticated user. */
   username: string;
+  /** Tenant name */
+  tenant: string;
   /** Activity Form. */
   activityForm: any;
   /** Search Text. */
@@ -71,14 +74,16 @@ export class HomeComponent implements OnInit, AfterViewInit {
    * @param {MatDialog} dialog MatDialog.
    * @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
    * @param {PopoverService} popoverService PopoverService.
+   * @param {SettingsService} settingsService SettingsService.
    */
   constructor(
     private authenticationService: AuthenticationService,
     private activatedRoute: ActivatedRoute,
     private router: Router,
     private dialog: MatDialog,
     private configurationWizardService: ConfigurationWizardService,
-    private popoverService: PopoverService
+    private popoverService: PopoverService,
+    private settingsService: SettingsService
   ) {}
 
   /**
@@ -88,6 +93,7 @@ export class HomeComponent implements OnInit, AfterViewInit {
   ngOnInit() {
     const credentials = this.authenticationService.getCredentials();
     this.username = credentials.username;
+    this.tenant = this.tenantIdentifier();
     this.setFilteredActivities();
     if (!this.authenticationService.hasDialogBeenShown()) {
       this.dialog.open(WarningDialogComponent);
@@ -193,4 +199,11 @@ export class HomeComponent implements OnInit, AfterViewInit {
     this.router.onSameUrlNavigation = 'reload';
     this.router.navigate(['/home']);
   }
+
+  tenantIdentifier() {
+    if (!this.settingsService.tenantIdentifier || this.settingsService.tenantIdentifier === '') {
+      return 'default';
+    }
+    return this.settingsService.tenantIdentifier;
+  }
 }

src/app/shared/footer/footer.component.html

@@ -2,6 +2,12 @@
   <mat-divider class="divider align-center"></mat-divider>
   <div class="layout-column m-b-20 content-wrapper footer-center">
     <table class="versions">
+      <tr>
+        <td class="footer-content">Tenant</td>
+        <td class="right footer-content">
+          {{ tenant | titlecase }}
+        </td>
+      </tr>
       <tr>
         <td class="footer-content">Mifos</td>
         <td class="right footer-content">

src/app/shared/footer/footer.component.ts

@@ -45,6 +45,8 @@ export class FooterComponent implements OnInit, OnDestroy {
   server = '';
   /** Business Date */
   businessDate: Date = null;
+  /** Tenant name */
+  tenant: string;
 
   isBusinessDateEnabled = false;
   isBusinessDateDefined = false;
@@ -87,6 +89,7 @@ export class FooterComponent implements OnInit, OnDestroy {
       });
       this.getConfigurations();
       this.server = this.settingsService.server;
+      this.tenant = this.tenantIdentifier();
       this.versionService.getBackendInfo().subscribe((data: any) => {
         if (data.git && data.git.build && data.git.build.version) {
           const buildVersion: string = data.git.build.version.split('-');
@@ -97,6 +100,13 @@ export class FooterComponent implements OnInit, OnDestroy {
     }
   }
 
+  tenantIdentifier() {
+    if (!this.settingsService.tenantIdentifier || this.settingsService.tenantIdentifier === '') {
+      return 'default';
+    }
+    return this.settingsService.tenantIdentifier;
+  }
+
   ngOnDestroy() {
     if (this.displayBackEndInfo) {
       clearTimeout(this.timer);

src/assets/images/mifos_lg-logo.png src/assets/images/default_home.pngsrc/assets/images/mifos_lg-logo.png renamed to src/assets/images/default_home.png

@@ -3338,6 +3338,8 @@
       "Mandatory": "Povinné",
       "Voluntary": "Dobrovolný",
       "Write a note": "Napište poznámku",
+      "Tenant": "Nájemce: ",
+      "TO": "do",
       "“Maker-Checker” principle requires every tasks": "Princip „Maker-Checker“ vyžaduje, aby každý úkol prováděli dva lidé, aby se snížila pravděpodobnost chyb a zneužití. Jedna osoba proces iniciuje a druhá jej dokončí.",
       "Buy Down Fees": "Poplatky za odkup"
     },

src/assets/translations/cs-CS.json

@@ -3337,6 +3337,8 @@
       "Mandatory": "Obligatorisch",
       "Voluntary": "Freiwillig",
       "Write a note": "Schreib eine Notitz",
+      "Tenant": "Mieter",
+      "To": "zu",
       "“Maker-Checker” principle requires every tasks": "Das „Maker-Checker“-Prinzip erfordert, dass jede Aufgabe von zwei Personen erledigt wird, um das Risiko von Fehlern und Missbrauch zu verringern. Eine Person leitet den Prozess ein und die zweite Person schließt ihn ab.",
       "Buy Down Fees": "Kaufgebühren"
     },

src/assets/translations/de-DE.json

@@ -3340,6 +3340,7 @@
       "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.",
+      "To": "to",
       "To add or remove a task from the Maker-Checker list": "To add or remove a task from the Maker-Checker list.",
       "To create a new role": "To create a new role.",
       "To create additional codes.": "To create additional codes.",
@@ -3444,6 +3445,8 @@
       "Mandatory": "Mandatory",
       "Voluntary": "Voluntary",
       "Write a note": "Write a note",
+      "Tenant": "Tenant",
+      "To": "to",
       "“Maker-Checker” principle requires every tasks": "The “Maker-Checker” principle requires every tasks to be completed by two people to reduce the chance of errors and misuse. One person initiates the process and the second completes it.",
       "Buy Down Fees": "Buy Down Fees",
       "Undo Write-off Description": "This action will reverse the write-off transaction and restore the loan to its previous active status. Please provide a note explaining the reason for this action."

src/assets/translations/en-US.json

@@ -3236,6 +3236,7 @@
       "This will navigate the user to the dashboard component.": "Esto llevará al usuario al componente del tablero.",
       "This will navigate the user to the searched activity.": "Esto llevará al usuario a la actividad buscada.",
       "To add or remove a task from the Maker-Checker list": "Para agregar o eliminar una tarea de la lista de Maker-Checker.",
+      "To": "a",
       "To create a new role": "Para crear un nuevo rol.",
       "To create code,create": "Para crear código, haga clic en crear código e ingrese el nombre del código.",
       "To define new mapping.": "Para definir un nuevo mapeo.",
@@ -3338,6 +3339,8 @@
       "Mandatory": "Obligatorio",
       "Voluntary": "Voluntario",
       "Write a note": "Escribe una nota",
+      "Tenant": "Inquilino",
+      "To": "a",
       "“Maker-Checker” principle requires every tasks": "El principio \"Maker-Checker\" requiere que dos personas completen cada tarea para reducir la posibilidad de errores y uso indebido. Una persona inicia el proceso y la segunda lo completa.",
       "Buy Down Fees": "Tarifas de compra"
     },

src/assets/translations/es-CL.json

@@ -3237,6 +3237,7 @@
       "This shows all the notifications.": "Esto muestra todas las notificaciones.",
       "This will navigate the user to the dashboard component.": "Esto llevará al usuario al componente del tablero.",
       "This will navigate the user to the searched activity.": "Esto llevará al usuario a la actividad buscada.",
+      "To": "a",
       "To add or remove a task from the Maker-Checker list": "Para agregar o eliminar una tarea de la lista de Maker-Checker.",
       "To create a new role": "Para crear un nuevo rol.",
       "To create code,create": "Para crear código, haga clic en crear código e ingrese el nombre del código.",
@@ -3340,6 +3341,8 @@
       "Mandatory": "Obligatorio",
       "Voluntary": "Voluntario",
       "Write a note": "Escribe una nota",
+      "Tenant": "Inquilino",
+      "To": "a",
       "“Maker-Checker” principle requires every tasks": "El principio \"Maker-Checker\" requiere que dos personas completen cada tarea para reducir la posibilidad de errores y uso indebido. Una persona inicia el proceso y la segunda lo completa.",
       "Buy Down Fees": "Tarifas de compra"
     },